Skip to content

Chat rules improvements#1829

Merged
Alex33856 merged 32 commits intoSkyblockerMod:masterfrom
viciscat:chat-rules-improvements
Dec 20, 2025
Merged

Chat rules improvements#1829
Alex33856 merged 32 commits intoSkyblockerMod:masterfrom
viciscat:chat-rules-improvements

Conversation

@viciscat
Copy link
Collaborator

@viciscat viciscat commented Nov 14, 2025 •
edited by Alex33856
Loading

image

@LifeIsAParadox LifeIsAParadox added the wip This PR is a work in progress label Nov 14, 2025
@AC19970
Copy link
Contributor

AC19970 commented Nov 15, 2025

I recommend using vanilla strings and translations for "sound" to avoid the need for retranslation and inaccurate translations. Also, it would be helpful if all sound events were automatically listed like in Sound Controller.

@viciscat
DFU
34403ed 
needed to refactor ConfigDataFixer a bit
@viciscat
rename
3b46bc9
@viciscat viciscat marked this pull request as ready for review November 15, 2025 15:44
@LifeIsAParadox LifeIsAParadox added reviews needed This PR needs reviews and removed wip This PR is a work in progress labels Nov 15, 2025
@viciscat
Copy link
Collaborator Author

viciscat commented Nov 15, 2025

I recommend using vanilla strings and translations for "sound" to avoid the need for retranslation and inaccurate translations. Also, it would be helpful if all sound events were automatically listed like in Sound Controller.

All sounds don't have a unique translation. For example the "amethyst" sound would just show up as "Breaking Block"
And I can't quite be bothered making a menu for all sounds

@AzureAaron AzureAaron added the new feature This issue or PR is a new feature label Nov 17, 2025
@kevinthegreat1
Copy link
Collaborator

kevinthegreat1 commented Nov 20, 2025

Since you're touching config, can we back up config before loading? So that we can save people who accidentally type invalid JSON when manually editing their config files.

@viciscat
Copy link
Collaborator Author

viciscat commented Nov 20, 2025

Since you're touching config, can we back up config before loading? So that we can save people who accidentally type invalid JSON when manually editing their config files.

You mean making a backup in case the DFU is dumb?

Alex33856 and others added 8 commits November 28, 2025 16:40
@Alex33856
Merge master
3755d51
@Alex33856
spotlessApply
3ad2dfc
@viciscat
fix disconnect
2d8f9aa
@viciscat
fix toast options showing if you don't have a toast message
485ed8b
@viciscat
replaceFirst adds the tail, we don't want that
efe5d99
@viciscat
Merge branch 'master' into chat-rules-improvements
88eeb78 
# Conflicts:
#	src/main/java/de/hysky/skyblocker/SkyblockerMod.java
#	src/main/java/de/hysky/skyblocker/config/datafixer/ConfigDataFix.java
#	src/main/java/de/hysky/skyblocker/config/datafixer/ConfigDataFixer.java
#	src/main/java/de/hysky/skyblocker/config/datafixer/ConfigSchema.java
#	src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java
#	src/main/resources/assets/skyblocker/lang/en_us.json
#	src/test/java/de/hysky/skyblocker/config/datafixer/ConfigDataFixerTest.java
@viciscat
fix merge
41effe6
@viciscat
announcement duration
643ec1d
@AzureAaron AzureAaron added merge conflicts This PR has merge conflicts that need solving. and removed reviews needed This PR needs reviews labels Dec 6, 2025
@viciscat
Merge branch 'master' into chat-rules-improvements
58eb75c 
# Conflicts:
#	src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
#	src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java
@LifeIsAParadox LifeIsAParadox added reviews needed This PR needs reviews and removed merge conflicts This PR has merge conflicts that need solving. labels Dec 6, 2025
@viciscat
remove star imports
69cb7ee
@viciscat
some annotations
2cc1da5
@viciscat
replace asserts with Objects.requireNonNull
f2529ca
@viciscat
Merge branch 'master' into chat-rules-improvements
33ea36a 
# Conflicts:
#	src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java
#	src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java
#	src/main/java/de/hysky/skyblocker/utils/render/gui/ItemSelectionPopup.java
@viciscat
1.21.11
4ac38f4
@Alex33856 Alex33856 added the merge conflicts This PR has merge conflicts that need solving. label Dec 13, 2025
@viciscat
prepare mojmap transition
12cecfd
@viciscat
Merge branch 'master' into chat-rules-improvements
a94d26c 
# Conflicts:
#	src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
#	src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java
#	src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java
#	src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java
#	src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java
#	src/main/java/de/hysky/skyblocker/utils/datafixer/ItemStackComponentizationFixer.java
#	src/main/java/de/hysky/skyblocker/utils/render/gui/ItemSelectionPopup.java
#	src/main/java/de/hysky/skyblocker/utils/render/gui/RangedSliderWidget.java
@LifeIsAParadox LifeIsAParadox removed the merge conflicts This PR has merge conflicts that need solving. label Dec 13, 2025
@Alex33856 Alex33856 added this to the 5.11.0 milestone Dec 19, 2025
@LifeIsAParadox LifeIsAParadox added merge me please Pull requests that are ready to merge and removed reviews needed This PR needs reviews labels Dec 20, 2025
@Alex33856 Alex33856 merged commit cfbb09d into SkyblockerMod:master Dec 20, 2025
2 checks passed
@LifeIsAParadox LifeIsAParadox removed the merge me please Pull requests that are ready to merge label Dec 20, 2025
@viciscat viciscat deleted the chat-rules-improvements branch December 20, 2025 19:05
Alex33856 pushed a commit that referenced this pull request Dec 20, 2025
@viciscat @Alex33856
Chat rules improvements (#1829)
e7ea39e
Alex33856 pushed a commit that referenced this pull request Dec 20, 2025
@viciscat @Alex33856
Chat rules improvements (#1829)
d651002
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Alex33856 Alex33856 Alex33856 approved these changes

Assignees

No one assigned

Labels

new feature This issue or PR is a new feature

Projects

None yet

Milestone

5.11.0

Development

Successfully merging this pull request may close these issues.

6 participants

@viciscat @AC19970 @kevinthegreat1 @Alex33856 @LifeIsAParadox @AzureAaron