Update to mc1.21.3

Author: NotRyken

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}"))
 

gradle.properties

@@ -26,39 +26,39 @@ 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.3
+minecraft_versions_fabric=>1.21.1 <1.22
+minecraft_versions_neoforge=(1.21.1, 1.22)
 
 # Parchment https://parchmentmc.org/docs/getting-started#choose-a-version
-parchment_minecraft_version=1.21
-parchment_version=2024.11.10
+parchment_minecraft_version=1.21.3
+parchment_version=2024.12.07
 
 # 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.110.0+1.21.3
 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.3.57
+neoforge_versions=[21.2.0, 22)
 # NeoForm https://projects.neoforged.net/neoforged/neoform
-neoform_version=1.21-20240613.152323
+neoform_version=1.21.3-20241023.131943
 
 # Cloth Config https://modrinth.com/mod/9s6osm5g/versions
-clothconfig_version=15.0.140
-clothconfig_versions_fabric=>=15
-clothconfig_versions_neoforge=[15,)
+clothconfig_version=16.0.141
+clothconfig_versions_fabric=>=16
+clothconfig_versions_neoforge=[16,)
 
 # ModMenu https://modrinth.com/mod/mOgUt4GM/versions
-modmenu_version=11.0.3
-modmenu_versions_fabric=>=11.0.0-beta.1
+modmenu_version=12.0.0
+modmenu_versions_fabric=>=12.0.0
 
 # Better Modlist https://modrinth.com/mod/sbpqhzIG/versions
-bettermodlist_version=1.1.12
-bettermodlist_versions_neoforge=>=1.1.10
+bettermodlist_version=2.0.0-beta.2
+bettermodlist_versions_neoforge=[2.0.0-beta.1,)
 
 # GitHub, Modrinth, CurseForge releases
 # Plural properties expect CSV lists
@@ -70,19 +70,21 @@ curseforge_slug=modlistmemory
 release_type=BETA
 # Fabric
 release_mod_loaders_fabric=fabric
-release_game_versions_fabric=1.21,1.21.1
+release_game_versions_fabric=1.21.2,1.21.3
 release_required_dep_ids_fabric_mr=P7dR8mSH,mOgUt4GM,9s6osm5g
 release_required_dep_ids_fabric_cf=fabric-api,modmenu,cloth-config
 # NeoForge
 release_mod_loaders_neoforge=neoforge
-release_game_versions_neoforge=1.21,1.21.1
+release_game_versions_neoforge=1.21.2,1.21.3
 release_required_dep_ids_neoforge_mr=sbpqhzIG,9s6osm5g
 release_required_dep_ids_neoforge_cf=better-modlist-neoforge,cloth-config
 
 # 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

neoforge/src/main/java/dev/terminalmc/modlistmemory/mixin/MixinModListEntry.java

@@ -16,8 +16,8 @@
 
 package dev.terminalmc.modlistmemory.mixin;
 
-import com.terraformersmc.mod_menu.gui.widget.entries.ModListEntry;
-import com.terraformersmc.mod_menu.util.mod.Mod;
+import com.terraformersmc.modmenu.gui.widget.entries.ModListEntry;
+import com.terraformersmc.modmenu.util.mod.Mod;
 import dev.terminalmc.modlistmemory.ModListMemory;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;

neoforge/src/main/java/dev/terminalmc/modlistmemory/mixin/MixinModListWidget.java

@@ -18,8 +18,8 @@
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.terraformersmc.mod_menu.gui.widget.ModListWidget;
-import com.terraformersmc.mod_menu.util.mod.Mod;
+import com.terraformersmc.modmenu.gui.widget.ModListWidget;
+import com.terraformersmc.modmenu.util.mod.Mod;
 import dev.terminalmc.modlistmemory.ModListMemory;
 import dev.terminalmc.modlistmemory.config.Config;
 import org.spongepowered.asm.mixin.Mixin;

neoforge/src/main/java/dev/terminalmc/modlistmemory/mixin/MixinModListWidgetAlt.java

@@ -16,7 +16,7 @@
 
 package dev.terminalmc.modlistmemory.mixin;
 
-import com.terraformersmc.mod_menu.gui.widget.ModListWidget;
+import com.terraformersmc.modmenu.gui.widget.ModListWidget;
 import dev.terminalmc.modlistmemory.ModListMemory;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

neoforge/src/main/java/dev/terminalmc/modlistmemory/mixin/MixinModsScreen.java

@@ -16,8 +16,8 @@
 
 package dev.terminalmc.modlistmemory.mixin;
 
-import com.terraformersmc.mod_menu.gui.ModsScreen;
-import com.terraformersmc.mod_menu.gui.widget.ModListWidget;
+import com.terraformersmc.modmenu.gui.ModsScreen;
+import com.terraformersmc.modmenu.gui.widget.ModListWidget;
 import dev.terminalmc.modlistmemory.ModListMemory;
 import dev.terminalmc.modlistmemory.config.Config;
 import org.spongepowered.asm.mixin.Mixin;

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -41,7 +41,7 @@ issueTrackerURL="${issues_url}" #optional:none
   side="CLIENT"
 
 [[dependencies."${mod_id}"]]
-  modId="mod_menu"
+  modId="better_modlist"
   type="required"
   versionRange="${bettermodlist_versions_neoforge}"
   side="CLIENT"