Update to mc1.21.4

NotRyken · NotRyken · commit 580b69fa2ef0 · 2025-02-10T20:36:51.000+08:00
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/config/TextStyle.java b/common/src/main/java/dev/terminalmc/chatnotify/config/TextStyle.java
@@ -112,7 +112,8 @@ public boolean isEnabled() {
 
     public Style getStyle() {
         return new Style(
-                doColor ? TextColor.fromRgb(color) : null,
+                doColor ? TextColor.fromRgb(color) : null, 
+                null,
                 bold != FormatMode.DISABLED ? bold == FormatMode.ON : null,
                 italic != FormatMode.DISABLED ? italic == FormatMode.ON : null,
                 underlined != FormatMode.DISABLED ? underlined == FormatMode.ON : null,
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/ExpandingList.java b/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/ExpandingList.java
@@ -134,7 +134,7 @@ public int getRowWidth() {
     }
 
     @Override
-    protected int getScrollbarPosition() {
+    protected int scrollBarX() {
         return getX() + width - SCROLLBAR_WIDTH;
     }
 
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/field/FakeTextField.java b/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/field/FakeTextField.java
@@ -31,19 +31,18 @@ public FakeTextField(int x, int y, int width, int height, Runnable onClick) {
         this.setTextColor(TEXT_COLOR_PREVIEW);
     }
 
-    @Override
-    public boolean clicked(double mouseX, double mouseY) {
+    public boolean isMouseOver(double mouseX, double mouseY) {
         // Skip the 'active' requirement
-        return (visible
-                && mouseX >= (double)getX()
-                && mouseY >= (double)getY()
-                && mouseX < (double)(getX() + getWidth())
-                && mouseY < (double)(getY() + getHeight()));
+        return this.visible
+                && mouseX >= (double)this.getX()
+                && mouseY >= (double)this.getY()
+                && mouseX < (double)this.getRight()
+                && mouseY < (double)this.getBottom();
     }
 
     @Override
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        if (clicked(mouseX, mouseY)) {
+        if (isMouseOver(mouseX, mouseY)) {
             onClick(mouseX, mouseY);
             return true;
         }
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/MainOptionList.java b/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/MainOptionList.java
@@ -99,7 +99,7 @@ protected void refreshNotifSubList() {
                 }
             }
         }
-        clampScrollAmount();
+        refreshScrollAmount();
     }
     
     // Sub-screen opening
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/NotifOptionList.java b/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/NotifOptionList.java
@@ -112,7 +112,7 @@ protected void refreshTriggerSubList() {
                 }
             }
         }
-        clampScrollAmount();
+        refreshScrollAmount();
     }
     
     // Sub-screen opening
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/OptionList.java b/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/OptionList.java
@@ -106,7 +106,7 @@ protected void updateElementBounds() {
      * Initializes the {@link OptionList}.
      */
     protected void init() {
-        double scrollAmount = getScrollAmount();
+        double scrollAmount = scrollAmount();
         
         clearEntries();
         setFocused(null);
@@ -157,12 +157,12 @@ public int getRowWidth() {
     }
 
     @Override
-    protected int getScrollbarPosition() {
+    protected int scrollBarX() {
         return width / 2 + rowWidth / 2;
     }
 
     @Override
-    protected boolean isValidMouseClick(int button) {
+    protected boolean isValidClickButton(int button) {
         return button == 0 || button == 1;
     }
 
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/util/FormatUtil.java b/common/src/main/java/dev/terminalmc/chatnotify/util/FormatUtil.java
@@ -265,6 +265,7 @@ private static class FormatCodes {
         Style createStyle() {
             return new Style(
                     color == null ? null : TextColor.fromLegacyFormat(color),
+                    null,
                     bold ? true : null,
                     italic ? true : null,
                     underline ? true : null,
diff --git a/common/src/main/resources/META-INF/accesstransformer.cfg b/common/src/main/resources/META-INF/accesstransformer.cfg
@@ -2,4 +2,4 @@
 public net.minecraft.client.OptionInstance$SliderableValueSet
 public net.minecraft.client.OptionInstance$ValueSet
 public net.minecraft.network.chat.TextColor formatValue()Ljava/lang/String;
-public net.minecraft.network.chat.Style <init>(Lnet/minecraft/network/chat/TextColor;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lnet/minecraft/network/chat/ClickEvent;Lnet/minecraft/network/chat/HoverEvent;Ljava/lang/String;Lnet/minecraft/resources/ResourceLocation;)V
+public net.minecraft.network.chat.Style <init>(Lnet/minecraft/network/chat/TextColor;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lnet/minecraft/network/chat/ClickEvent;Lnet/minecraft/network/chat/HoverEvent;Ljava/lang/String;Lnet/minecraft/resources/ResourceLocation;)V
diff --git a/common/src/main/resources/chatnotify.accesswidener b/common/src/main/resources/chatnotify.accesswidener
@@ -3,4 +3,4 @@ accessWidener v2 named
 accessible class net/minecraft/client/OptionInstance$SliderableValueSet
 accessible class net/minecraft/client/OptionInstance$ValueSet
 accessible method net/minecraft/network/chat/TextColor formatValue ()Ljava/lang/String;
-accessible method net/minecraft/network/chat/Style <init> (Lnet/minecraft/network/chat/TextColor;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lnet/minecraft/network/chat/ClickEvent;Lnet/minecraft/network/chat/HoverEvent;Ljava/lang/String;Lnet/minecraft/resources/ResourceLocation;)V
+accessible method net/minecraft/network/chat/Style <init> (Lnet/minecraft/network/chat/TextColor;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lnet/minecraft/network/chat/ClickEvent;Lnet/minecraft/network/chat/HoverEvent;Ljava/lang/String;Lnet/minecraft/resources/ResourceLocation;)V
diff --git a/gradle.properties b/gradle.properties
@@ -27,36 +27,36 @@ java_versions_fabric=>=21
 java_versions_neoforge=[21,)
 
 # Minecraft
-minecraft_version=1.21.3
-minecraft_versions_fabric=>1.21.1 <1.22
-minecraft_versions_neoforge=(1.21.1, 1.22)
+minecraft_version=1.21.4
+minecraft_versions_fabric=>1.21.3 <1.22
+minecraft_versions_neoforge=(1.21.3, 1.22)
 
 # Parchment https://parchmentmc.org/docs/getting-started#choose-a-version
-parchment_minecraft_version=1.21.3
-parchment_version=2024.12.07
+parchment_minecraft_version=1.21.4
+parchment_version=2025.01.05
 
 # Fabric https://fabricmc.net/develop
 fabric_loader_version=0.16.9
 fabric_loader_versions=>=0.15.0
-fabric_api_version=0.114.0+1.21.3
+fabric_api_version=0.114.3+1.21.4
 fabric_api_versions=*
 
 # NeoForge https://projects.neoforged.net/neoforged/neoforge
 neoforge_loader_versions=[1,)
-neoforge_version=21.3.58
-neoforge_versions=[21.2.0-beta, 22)
+neoforge_version=21.4.58-beta
+neoforge_versions=[21.4.0-beta, 22)
 # NeoForm https://projects.neoforged.net/neoforged/neoform
-neoform_version=1.21.3-20241023.131943
+neoform_version=1.21.4-20241203.161809
 
 # CommandKeys https://modrinth.com/mod/65UyswbY/versions
-commandkeys_version=2.3.4+1.21
+commandkeys_version=2.3.4+1.21.4
 
 # ChatHeads https://modrinth.com/mod/Wb5oqrBJ/versions
-chatheads_version=0.13.7
+chatheads_version=0.13.8
 
 # ModMenu https://modrinth.com/mod/mOgUt4GM/versions
-modmenu_version=12.0.0
-modmenu_versions_fabric=>=12.0.0-beta.1
+modmenu_version=13.0.0
+modmenu_versions_fabric=>=13.0.0-beta.1
 
 # GitHub, Modrinth, CurseForge releases
 # Plural properties expect CSV lists
@@ -68,12 +68,12 @@ curseforge_slug=chatnotify
 release_type=STABLE
 # Fabric
 release_mod_loaders_fabric=fabric
-release_game_versions_fabric=1.21.2,1.21.3
+release_game_versions_fabric=1.21.4
 release_required_dep_ids_fabric_mr=P7dR8mSH,mOgUt4GM
 release_required_dep_ids_fabric_cf=fabric-api,modmenu
 # NeoForge
 release_mod_loaders_neoforge=neoforge
-release_game_versions_neoforge=1.21.2,1.21.3
+release_game_versions_neoforge=1.21.4
 
 # Mixin https://mvnrepository.com/artifact/org.spongepowered/mixin
 mixin_version=0.8.7

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public int getRowWidth() {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`@Override`
`137`		`- protected int getScrollbarPosition() {`
	`137`	`+ protected int scrollBarX() {`
`138`	`138`	`return getX() + width - SCROLLBAR_WIDTH;`
`139`	`139`	`}`
`140`	`140`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ protected void refreshNotifSubList() {`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`	`}`
`102`		`- clampScrollAmount();`
	`102`	`+ refreshScrollAmount();`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`// Sub-screen opening`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ protected void refreshTriggerSubList() {`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`}`
`115`		`- clampScrollAmount();`
	`115`	`+ refreshScrollAmount();`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`// Sub-screen opening`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ protected void updateElementBounds() {`
`106`	`106`	`* Initializes the {@link OptionList}.`
`107`	`107`	`*/`
`108`	`108`	`protected void init() {`
`109`		`- double scrollAmount = getScrollAmount();`
	`109`	`+ double scrollAmount = scrollAmount();`
`110`	`110`
`111`	`111`	`clearEntries();`
`112`	`112`	`setFocused(null);`
`@@ -157,12 +157,12 @@ public int getRowWidth() {`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`@Override`
`160`		`- protected int getScrollbarPosition() {`
	`160`	`+ protected int scrollBarX() {`
`161`	`161`	`return width / 2 + rowWidth / 2;`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`@Override`
`165`		`- protected boolean isValidMouseClick(int button) {`
	`165`	`+ protected boolean isValidClickButton(int button) {`
`166`	`166`	`return button == 0 \|\| button == 1;`
`167`	`167`	`}`
`168`	`168`