Update to mc1.21.4

common/build.gradle

@@ -3,7 +3,24 @@ plugins {
     id("net.neoforged.moddev")
 }
 
+// Vanilla depends on ASM 9.3, MDG makes that a 'strict' version constraint,
+// but Mixin and MixinExtras needs newer ASM so we override that here.
+configurations.configureEach {
+    resolutionStrategy.eachDependency { details ->
+        if (details.requested.group == "org.ow2.asm") {
+            details.useVersion(asm_version)
+            details.because("Mixin requires new ASM")
+        }
+    }
+}
+
 dependencies {
+    compileOnly "org.ow2.asm:asm:${asm_version}"
+    compileOnly "org.ow2.asm:asm-analysis:${asm_version}"
+    compileOnly "org.ow2.asm:asm-commons:${asm_version}"
+    compileOnly "org.ow2.asm:asm-tree:${asm_version}"
+    compileOnly "org.ow2.asm:asm-util:${asm_version}"
+
     compileOnly("org.spongepowered:mixin:${mixin_version}")
     compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixinextras_version}"))
 }

common/src/main/java/dev/terminalmc/commandkeys/gui/screen/OptionsScreen.java

@@ -137,7 +137,7 @@ public OptionList reload() {
     public OptionList reload(int width, int height) {
         clearWidgets();
         optionList = optionList.reload(this, width, height - TOP_MARGIN - BOTTOM_MARGIN,
-                optionList.getScrollAmount());
+                optionList.scrollAmount());
         addRenderableWidget(optionList);
 
         // Title text

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

@@ -84,7 +84,7 @@ public int getRowWidth() {
     }
 
     @Override
-    protected int getScrollbarPosition() {
+    protected int scrollBarX() {
         return width / 2 + rowWidth / 2;
     }
 

gradle.properties

@@ -27,9 +27,9 @@ java_versions_fabric=>=21
 java_versions_neoforge=[21,)
 
 # Minecraft
-minecraft_version=1.21
-minecraft_versions_fabric=>1.20.6 <1.22
-minecraft_versions_neoforge=(1.20.6, 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
@@ -38,19 +38,19 @@ parchment_version=2024.11.10
 # Fabric https://fabricmc.net/develop
 fabric_loader_version=0.16.9
 fabric_loader_versions=>=0.15.0
-fabric_api_version=0.102.0+1.21
+fabric_api_version=0.111.0+1.21.4
 fabric_api_versions=*
 
 # NeoForge https://projects.neoforged.net/neoforged/neoforge
 neoforge_loader_versions=[1,)
-neoforge_version=21.0.167
-neoforge_versions=[21.0.143, 22)
+neoforge_version=21.4.9-beta
+neoforge_versions=[21.4.0-beta, 22)
 # NeoForm https://projects.neoforged.net/neoforged/neoform
-neoform_version=1.21-20240613.152323
+neoform_version=1.21.4-20241203.161809
 
 # ModMenu https://modrinth.com/mod/mOgUt4GM/versions
-modmenu_version=11.0.3
-modmenu_versions_fabric=>=11.0.0-beta.1
+modmenu_version=13.0.0-beta.1
+modmenu_versions_fabric=>=13.0.0-beta.1
 
 # GitHub, Modrinth, CurseForge releases
 # Plural properties expect CSV lists
@@ -62,17 +62,19 @@ curseforge_slug=commandkeys
 release_type=STABLE
 # Fabric
 release_mod_loaders_fabric=fabric
-release_game_versions_fabric=1.21,1.21.1,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,1.21.1,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
 # MixinExtras https://github.com/LlamaLad7/MixinExtras/releases
 mixinextras_version=0.4.1
+# ASM https://mvnrepository.com/artifact/org.ow2.asm/asm
+asm_version=9.7
 
 # Plugins
 # Fabric Loom https://mvnrepository.com/artifact/net.fabricmc/fabric-loom