Update to mc1.21.4

Author: NotRyken

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

@@ -114,6 +114,7 @@ public boolean isEnabled() {
     public Style getStyle() {
         return StyleAccessor.chatnotify$new(
                 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

@@ -154,7 +154,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

@@ -218,7 +218,7 @@ public void setHeight(int height) {
     @Override
     public void setSize(int width, int height) {
         super.setSize(Math.max(width, MIN_WIDTH), Math.max(height, MIN_HEIGHT));
-        clampScrollAmount();
+        refreshScrollAmount();
     }
 
     public void setBounds(int width, int height, int x, int y) {
@@ -294,9 +294,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());
@@ -475,11 +475,11 @@ 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()
+                button == 0 && mouseY >= scrollBarX() && mouseY < (scrollBarX()
                         + SCROLLBAR_HEIGHT) && mouseX >= getX() && mouseX < getRight();
     }
 
-    protected int getScrollbarPosition() {
+    protected int scrollBarX() {
         return topScrollbar ? getY() : getY() + getHeight() - SCROLLBAR_HEIGHT;
     }
 
@@ -500,7 +500,7 @@ public void setScrollAmount(double scroll) {
         setClampedScrollAmount(scroll);
     }
 
-    public void clampScrollAmount() {
+    public void refreshScrollAmount() {
         setClampedScrollAmount(scrollAmount);
     }
 
@@ -512,6 +512,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

@@ -34,7 +34,7 @@ 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()
@@ -46,7 +46,7 @@ public boolean clicked(double mouseX, double mouseY) {
 
     @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

@@ -180,7 +180,7 @@ protected void refreshSubList() {
             }
         }
         tabNameUpdate.run();
-        clampScrollAmount();
+        refreshScrollAmount();
     }
 
     @FunctionalInterface

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

@@ -122,7 +122,7 @@ protected void updateElementBounds() {
      * Initializes the {@link OptionList}.
      */
     protected void init() {
-        double scrollAmount = getScrollAmount();
+        double scrollAmount = scrollAmount();
 
         clearEntries();
         setFocused(null);
@@ -178,12 +178,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/mixin/accessor/StyleAccessor.java

@@ -31,6 +31,7 @@ public interface StyleAccessor {
     @Invoker("<init>")
     static Style chatnotify$new(
             @Nullable TextColor color,
+            @Nullable Integer shadowColor,
             @Nullable Boolean bold,
             @Nullable Boolean italic,
             @Nullable Boolean underlined,

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

@@ -323,6 +323,7 @@ private static class FormatCodes {
         Style createStyle() {
             return StyleAccessor.chatnotify$new(
                     color == null ? null : TextColor.fromLegacyFormat(color),
+                    null,
                     bold ? true : null,
                     italic ? true : null,
                     underline ? true : null,

gradle.properties

@@ -55,37 +55,37 @@ mod_curseforge_slug=chatnotify
 # Subproject Build Compatibility
 #  -> Comment out or unset to disable publishing of a subproject.
 mod_loaders_fabric=fabric
-mc_versions_fabric=1.21.2,1.21.3
+mc_versions_fabric=1.21.4
 mod_loaders_neoforge=neoforge
-mc_versions_neoforge=1.21.3
+mc_versions_neoforge=1.21.4
 
 # Java
 java_version=21
 java_versions_fabric=>=21
 java_versions_neoforge=[21,)
 
 # Minecraft
-minecraft_version=1.21.3
-minecraft_versions_fabric=>1.21.1
-minecraft_versions_neoforge=[1.21.3,)
+minecraft_version=1.21.4
+minecraft_versions_fabric=>1.21.3
+minecraft_versions_neoforge=[1.21.4,)
 
 # 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.03.23
 
 # Fabric https://fabricmc.net/develop
 #  -> See also 'mixinextras_jij_fabric'
 fabric_loader_version=0.17.2
 fabric_loader_versions=>=0.17.0
-fabric_api_version=0.114.1+1.21.3
+fabric_api_version=0.119.4+1.21.4
 fabric_api_versions=*
 
 # NeoForge https://projects.neoforged.net/neoforged/neoforge
 #  -> See also 'mixinextras_jij_neoforge'
-neoforge_version=21.3.93
-neoforge_versions=[21.3.88,)
+neoforge_version=21.4.154
+neoforge_versions=[21.4.149,)
 # NeoForm https://projects.neoforged.net/neoforged/neoform
-neoform_version=1.21.3-20241023.131943
+neoform_version=1.21.4-20241203.161809
 
 # Dependency Property Identifiers
 #  -> These values point to other properties with full dependency specification.
@@ -112,20 +112,20 @@ neoforge_deps=commandkeys,chatheads
 d_common_commandkeys=-:-:imp:maven.modrinth:65UyswbY:$v:v_commandkeys_neoforge
 d_fabric_commandkeys=-:-:imp:maven.modrinth:65UyswbY:$v:v_commandkeys_fabric
 d_neoforge_commandkeys=-:-:imp:maven.modrinth:65UyswbY:$v:v_commandkeys_neoforge
-v_commandkeys_fabric=HeQB0SL8
-v_commandkeys_neoforge=RUyG3m7n
+v_commandkeys_fabric=s4SwORnD
+v_commandkeys_neoforge=qDk3Xi0K
 
 # Chat Heads https://modrinth.com/project/Wb5oqrBJ/versions
 d_common_chatheads=-:-:imp:maven.modrinth:Wb5oqrBJ:$v:v_chatheads_neoforge
 d_fabric_chatheads=-:-:imp:maven.modrinth:Wb5oqrBJ:$v:v_chatheads_fabric
 d_neoforge_chatheads=-:-:imp:maven.modrinth:Wb5oqrBJ:$v:v_chatheads_neoforge
-v_chatheads_fabric=m09yVDf6
-v_chatheads_neoforge=aRECu0yn
+v_chatheads_fabric=p5FIP10y
+v_chatheads_neoforge=coszZ1AH
 
 # ModMenu https://modrinth.com/project/mOgUt4GM/versions
 d_fabric_modmenu=-:-:imp:maven.modrinth:mOgUt4GM:$v:-,recommends:modmenu,req:mOgUt4GM,req:modmenu
-v_modmenu=12.0.0
-vr_fabric_modmenu=>=12.0.0-beta.1
+v_modmenu=13.0.3
+vr_fabric_modmenu=>=13.0.0-beta.1
 
 # Dependency Version Extensions
 #  -> Intended for addon mods to show which version they were compiled against.