Update to mc1.21.5

Author: NotRyken

common/build.gradle

@@ -32,7 +32,6 @@ dependencies {
 }
 
 neoForge {
-    version = neoforge_version // Shut up
     neoFormVersion = neoform_version
     // Automatically enable AccessTransformers if the file exists
     def at = file("src/main/resources/META-INF/accesstransformer.cfg")

common/src/main/java/dev/terminalmc/clientsort/ClientSort.java

@@ -54,7 +54,8 @@ public static void onConfigSaved(Config config) {
     }
 
     public static void setInteractionManagerTickRate(Config.Options options) {
-        if (Minecraft.getInstance().getSingleplayerServer() == null) {
+        if (Minecraft.getInstance() == null // Workaround for a NeoForge quirk
+                || Minecraft.getInstance().getSingleplayerServer() == null) {
             InteractionManager.setTickRate(options.interactionRateServer);
         } else {
             InteractionManager.setTickRate(options.interactionRateClient);

common/src/main/java/dev/terminalmc/clientsort/mixin/MixinAbstractContainerScreen.java

@@ -142,7 +142,7 @@ private void onKeyPressed(int keyCode, int scanCode, int modifiers,
         Options options = this.minecraft.options;
         // Pick
         if (((inputMatcher.apply(options.keyPickItem) 
-            && this.minecraft.gameMode.hasInfiniteItems()
+            && this.minecraft.player.hasInfiniteMaterials()
             && (this.hoveredSlot.hasItem()
                 || !this.draggingItem.isEmpty()
                 || !this.menu.getCarried().isEmpty())))) {

gradle.properties

@@ -27,38 +27,38 @@ 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.5
+minecraft_versions_fabric=>1.21.4 <1.22
+minecraft_versions_neoforge=(1.21.4, 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.4
+parchment_version=2025.03.23
 
 # Fabric https://fabricmc.net/develop
-fabric_loader_version=0.16.9
+fabric_loader_version=0.16.10
 fabric_loader_versions=>=0.15.0
-fabric_api_version=0.110.0+1.21.3
+fabric_api_version=0.119.5+1.21.5
 fabric_api_versions=*
 
 # NeoForge https://projects.neoforged.net/neoforged/neoforge
 neoforge_loader_versions=[1,)
-neoforge_version=21.3.57
-neoforge_versions=[21.2.0, 22)
+neoforge_version=21.5.1-beta
+neoforge_versions=[21.5.0-beta, 22)
 # NeoForm https://projects.neoforged.net/neoforged/neoform
-neoform_version=1.21.3-20241023.131943
+neoform_version=1.21.5-20250325.162830
 
 # Cloth Config https://modrinth.com/mod/9s6osm5g/versions
-clothconfig_version=16.0.141
-clothconfig_versions_fabric=>=16
-clothconfig_versions_neoforge=[16,)
+clothconfig_version=18.0.145
+clothconfig_versions_fabric=>=18
+clothconfig_versions_neoforge=[18,)
 
 # ModMenu https://modrinth.com/mod/mOgUt4GM/versions
-modmenu_version=12.0.0
-modmenu_versions_fabric=>=12.0.0-beta.1
+modmenu_version=14.0.0-rc.2
+modmenu_versions_fabric=>=14.0.0-rc.2
 
 # ItemLocks https://modrinth.com/mod/tJzrFuyy/versions
-itemlocks_version=1.21.2-1.3.9
+itemlocks_version=1.21.4-1.3.10
 
 # GitHub, Modrinth, CurseForge releases
 # Plural properties expect CSV lists
@@ -67,15 +67,15 @@ modrinth_id=K0AkAin6
 curseforge_id=1049891
 curseforge_slug=clientsort
 # 'STABLE', 'BETA' or 'ALPHA'
-release_type=BETA
+release_type=STABLE
 # Fabric
 release_mod_loaders_fabric=fabric
-release_game_versions_fabric=1.21.2,1.21.3,1.21.4
+release_game_versions_fabric=1.21.5
 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.2,1.21.3,1.21.4
+release_game_versions_neoforge=1.21.5
 release_required_dep_ids_neoforge_mr=9s6osm5g
 release_required_dep_ids_neoforge_cf=cloth-config
 
@@ -88,11 +88,11 @@ asm_version=9.7
 
 # Plugins
 # Fabric Loom https://mvnrepository.com/artifact/net.fabricmc/fabric-loom
-loom_version=1.9.2
+loom_version=1.10.4
 # ModDev https://plugins.gradle.org/plugin/net.neoforged.moddev
-moddev_version=1.0.23
+moddev_version=2.0.80
 # Mod Publish Plugin https://plugins.gradle.org/plugin/me.modmuss50.mod-publish-plugin
-mpp_version=0.8.1
+mpp_version=0.8.4
 # grgit-service https://github.com/ajoberstar/grgit/releases
 grgitservice_version=5.3.0
 # licenser https://plugins.gradle.org/plugin/org.cadixdev.licenser

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME