Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport to 1.20.1 #8

Merged
merged 38 commits into from
Jan 5, 2024
Merged

Backport to 1.20.1 #8

merged 38 commits into from
Jan 5, 2024

Conversation

SettingDust
Copy link
Contributor

No description provided.

@Pyrofab
Fix licensing check in actions
9222899
@Pyrofab
Fix licensing check in actions, take 2
5f80f8a
@Pyrofab
Fix licensing check in actions, take 3
34db2b8
@Pyrofab
Update loom version
eec1173
@Pyrofab
Add alternative RPG screen for dialogues
3adb51f
@Pyrofab
Fix choices being selected from out-of-window cursor
29dac3d
@Pyrofab
Add per-dialogue custom screen layout
6091e76
@Pyrofab
Update tests
585b437
@Pyrofab
Remove dialogue.schema.json from this repository
4e18bc6 
It is already on the website
@Pyrofab
Merge pull request Ladysnake#6 from Ladysnake/alt-layout
671b40c 
Add an alt layout for dialogues
@Pyrofab
Update French localization
739e233
@Pyrofab
Fix scrolling in dialogue screen
50ba619
@Pyrofab
Update changelog
c3c45cb
@Pyrofab
Add an optional interlocutor to dialogues
f8c0323
@Pyrofab
Add new command selector for current interlocutor
6f54f65
@Pyrofab
Implement support for dynamic text contents in dialogues
5e2c485
@Pyrofab
Stop sending every dialogue to every connecting player
3540294
@Pyrofab
Replace dynamic registry use with good old data reloaders
6b04ecf
@Pyrofab
Move dialogue validation to the loader
8968ade
@Pyrofab
Optimize dialogue network serialization
a28ee4b
@Pyrofab
Make interlocutor available clientside
7608e0f
@Pyrofab
Add the interlocutor_properties loot condition
deefd73
@Pyrofab
Unit test dialogue validation
9b8dcbf
@Pyrofab
Add warning when vanilla player connects to blabber server
580eaf0
@Pyrofab
Update unavailable choice test
10b2364
@Pyrofab
Fix tests failing due to missing working directory
940dc94
@Pyrofab
Merge pull request Ladysnake#7 from Ladysnake/interlocutor
1456f87 
Add the notion of interlocutor to Blabber
@Pyrofab
Update changelog
8f5f78e
@Pyrofab
Make dialogue actions take the interlocutor as argument
1649d4a
@Pyrofab
Fix dialogue ids not being re-synced on datapack reload
1acfaae
Pyrofab and others added 8 commits December 31, 2023 18:25
@Pyrofab
Fix REI appearing on RPG screen variant
ecd0236
@Pyrofab
Update to 1.20.4
75d22df
@SettingDust
Merge remote-tracking branch 'origin/alt-layout' into 1.20.1
85c7dbc 
# Conflicts:
#	src/main/java/org/ladysnake/blabber/api/client/BlabberDialogueScreen.java
@SettingDust
chore: remove loom quiltflower since loom builtin vineflower(new name…
4ef96cf 
… of quilt flower)
@SettingDust
Merge remote-tracking branch 'origin/interlocutor' into 1.20.1
48330ef 
# Conflicts:
#	changelog.md
#	gradle.properties
#	src/main/java/org/ladysnake/blabber/api/client/BlabberDialogueScreen.java
#	src/main/java/org/ladysnake/blabber/impl/common/model/DialogueState.java
#	src/main/java/org/ladysnake/blabber/impl/common/model/UnavailableAction.java
#	src/testmod/java/org/ladysnake/babblings/tests/BlabberTestSuite.java
@SettingDust
fix: compat origin/interlocutor with 1.20.1
b8d15be
@SettingDust
Merge tag '1.4.0' into 1.20.1
af4546d 
# Conflicts:
#	changelog.md
#	gradle.properties
#	gradle/libs.versions.toml
#	src/main/java/org/ladysnake/blabber/impl/client/BlabberClient.java
#	src/main/java/org/ladysnake/blabber/impl/common/model/DialogueState.java
#	src/main/java/org/ladysnake/blabber/impl/common/model/UnavailableAction.java
@SettingDust
chore: update licenses
88540b4
Pyrofab
Pyrofab reviewed Jan 5, 2024
View reviewed changes
Copy link
Member

@Pyrofab Pyrofab left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From a cursory look, seems good, just need to run the updateLicenses task to fix the workflow

@SettingDust
Copy link
Contributor Author

From a cursory look, seems good, just need to run the updateLicenses task to fix the workflow

Ran XD. Tested with game test and in-game dialog with test mod

Pyrofab
Pyrofab approved these changes Jan 5, 2024
View reviewed changes
Copy link
Member

@Pyrofab Pyrofab left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very cool, thank you !

@Pyrofab Pyrofab merged commit 4ec5ea9 into Ladysnake:1.20.1 Jan 5, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Pyrofab Pyrofab Pyrofab approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@SettingDust @Pyrofab