Update to mc1.21.4

Author: NotRyken

common/src/main/java/dev/terminalmc/chatnotify/config/TextStyle.java

@@ -112,6 +112,7 @@ public boolean isEnabled() {
     public Style getStyle() {
         return new Style(
                 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,

common/src/main/java/dev/terminalmc/chatnotify/gui/widget/ExpandingList.java

@@ -136,7 +136,7 @@ public int getRowWidth() {
     }
 
     @Override
-    protected int getScrollbarPosition() {
+    protected int scrollBarX() {
         return getX() + width - SCROLLBAR_WIDTH;
     }
 

common/src/main/java/dev/terminalmc/chatnotify/gui/widget/HorizontalList.java

@@ -261,9 +261,9 @@ protected void renderChildren(GuiGraphics graphics, int mouseX, int mouseY, floa
     /**
      * Renders the scrollbar, if required.
      */
-    protected void renderScrollbar(GuiGraphics graphics) {
+    protected void renderScrollbar(@NotNull GuiGraphics graphics) {
         if (scrollbarVisible()) {
-            int y = getScrollbarPosition();
+            int y = scrollBarX();
 
             int scrollerWidth = (int)((float)(getWidth() * getWidth()) / (float)getMaxPosition());
             scrollerWidth = Mth.clamp(scrollerWidth, SCROLLBAR_WIDTH, getWidth());
@@ -384,13 +384,13 @@ public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, doubl
 
     protected void updateScrollingState(double mouseX, double mouseY, int button) {
         scrolling = button == 0
-                && mouseY >= getScrollbarPosition()
-                && mouseY < (getScrollbarPosition() + SCROLLBAR_HEIGHT)
+                && mouseY >= scrollBarX()
+                && mouseY < (scrollBarX() + SCROLLBAR_HEIGHT)
                 && mouseX >= getX()
                 && mouseX < getRight();
     }
 
-    protected int getScrollbarPosition() {
+    protected int scrollBarX() {
         return topScrollbar ? getY() : getY() + getHeight() - SCROLLBAR_HEIGHT;
     }
 
@@ -423,6 +423,18 @@ public int getMaxScroll() {
         return Math.max(0, getMaxPosition() - getWidth());
     }
 
+    @Override
+    protected int contentHeight() {
+        // Not currently used
+        return 0;
+    }
+
+    @Override
+    protected double scrollRate() {
+        // Not currently used
+        return 0;
+    }
+    
     // Narration
 
     public NarratableEntry.@NotNull NarrationPriority narrationPriority() {

common/src/main/java/dev/terminalmc/chatnotify/gui/widget/field/FakeTextField.java

@@ -32,18 +32,18 @@ public FakeTextField(int x, int y, int width, int height, Runnable onClick) {
     }
 
     @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()));
+                && mouseX < (double)getRight()
+                && mouseY < (double)getBottom());
     }
 
     @Override
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        if (clicked(mouseX, mouseY)) {
+        if (isMouseOver(mouseX, mouseY)) {
             onClick(mouseX, mouseY);
             return true;
         }

common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/FilterList.java

@@ -142,7 +142,7 @@ protected void refreshSubList() {
                 addEntry(start, entry);
             }
         }
-        clampScrollAmount();
+        refreshScrollAmount();
     }
 
     @FunctionalInterface

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);
@@ -167,12 +167,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;
     }
 

common/src/main/java/dev/terminalmc/chatnotify/util/FormatUtil.java

@@ -266,6 +266,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,

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

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

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