Update to mc1.21.4

Author: NotRyken

common/src/main/java/dev/terminalmc/commandkeys/CommandKeys.java

@@ -102,7 +102,7 @@ public static void afterClientTick(Minecraft mc) {
         // Config reset warning toast
         if (hasResetConfig && mc.screen instanceof TitleScreen) {
             hasResetConfig = false;
-            mc.getToasts().addToast(new SystemToast(
+            mc.getToastManager().addToast(new SystemToast(
                     new SystemToast.SystemToastId(15000L),
                     localized("toast", "reset.title"),
                     localized(

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

@@ -34,19 +34,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/commandkeys/gui/widget/list/MacroOptionList.java

@@ -150,7 +150,7 @@ protected void refreshMessageSubList() {
             children().add(start, new OptionList.Entry.Space(msgEntry));
             children().add(start, msgEntry);
         }
-        clampScrollAmount();
+        refreshScrollAmount();
     }
 
     // Custom entries

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

@@ -111,7 +111,7 @@ protected void updateElementBounds() {
      * Initializes the {@link OptionList}.
      */
     protected void init() {
-        double scrollAmount = getScrollAmount();
+        double scrollAmount = scrollAmount();
 
         clearEntries();
         setFocused(null);
@@ -167,7 +167,7 @@ public int getRowWidth() {
     }
 
     @Override
-    protected int getScrollbarPosition() {
+    protected int scrollBarX() {
         return width / 2 + rowWidth / 2;
     }
 

common/src/main/java/dev/terminalmc/commandkeys/gui/widget/list/ProfileOptionList.java

@@ -139,7 +139,7 @@ protected void refreshMacroSubList() {
                     )
             );
         }
-        clampScrollAmount();
+        refreshScrollAmount();
     }
 
     // Sub-screen opening

gradle.properties

@@ -55,37 +55,37 @@ mod_curseforge_slug=commandkeys
 # Subproject Build Compatibility
 #  -> Comment out or unset to disable publishing of a subproject.
 mod_loaders_fabric=fabric
-mc_versions_fabric=1.21,1.21.1,1.21.2,1.21.3
+mc_versions_fabric=1.21.4,1.21.5
 mod_loaders_neoforge=neoforge
-mc_versions_neoforge=1.21.1,1.21.2,1.21.3
+mc_versions_neoforge=1.21.4,1.21.5
 
 # Java
 java_version=21
 java_versions_fabric=>=21
 java_versions_neoforge=[21,)
 
 # Minecraft
-minecraft_version=1.21.1
-minecraft_versions_fabric=>1.20.6 <1.21.4
-minecraft_versions_neoforge=[1.21.1, 1.21.4)
+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.1
-parchment_version=2024.11.17
+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.16.14
 fabric_loader_versions=>=0.16.1
-fabric_api_version=0.116.4+1.21.1
+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.1.190
-neoforge_versions=[21.1.22,)
+neoforge_version=21.4.154
+neoforge_versions=[21.4.0-beta,)
 # NeoForm https://projects.neoforged.net/neoforged/neoform
-neoform_version=1.21.1-20240808.144430
+neoform_version=1.21.4-20241203.161809
 
 # Dependency Property Identifiers
 #  -> These values point to other properties with full dependency specification.
@@ -110,8 +110,8 @@ neoforge_deps=
 
 # ModMenu https://modrinth.com/project/mOgUt4GM/versions
 d_fabric_modmenu=-:-:imp:maven.modrinth:mOgUt4GM:$v:-,recommends:modmenu,req:mOgUt4GM,req:modmenu
-v_modmenu=11.0.3
-vr_fabric_modmenu=>=11.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.

neoforge/src/main/java/dev/terminalmc/commandkeys/CommandKeysNeoForge.java

@@ -32,7 +32,6 @@
 )
 @EventBusSubscriber(
         modid = CommandKeys.MOD_ID,
-        bus = EventBusSubscriber.Bus.MOD,
         value = Dist.CLIENT
 )
 public class CommandKeysNeoForge {