Port to 1.21.5

Author: jaredlll08

buildSrc/src/main/kotlin/com/blamejared/Versions.kt

@@ -1,13 +1,13 @@
 package com.blamejared
 
 object Versions {
-    const val MOD = "22.0.0"
+    const val MOD = "23.0.0"
     const val JAVA = "21"
-    const val MINECRAFT = "1.21.4"
-    const val FABRIC_LOADER = "0.16.9"
-    const val FABRIC = "0.112.2+1.21.4"
-    const val FORGE = "54.0.10"
-    const val FORGE_LOADER = "[54,)"
-    const val NEO_FORGE = "21.4.33-beta"
+    const val MINECRAFT = "1.21.5"
+    const val FABRIC_LOADER = "0.16.10"
+    const val FABRIC = "0.119.5+1.21.5"
+    const val FORGE = "55.0.1"
+    const val FORGE_LOADER = "[55,)"
+    const val NEO_FORGE = "21.5.4-beta"
     const val NEO_FORGE_LOADER= "[4,)"
 }

common/src/main/java/com/blamejared/clumps/mixin/MixinExperienceOrb.java

@@ -49,9 +49,6 @@ public abstract class MixinExperienceOrb extends Entity implements IClumpedOrb {
     @Shadow
     private int age;
 
-    @Shadow
-    private int value;
-    
     @Shadow
     protected abstract int repairPlayerItems(ServerPlayer player, int i);
 
@@ -61,6 +58,12 @@ private static boolean canMerge(ExperienceOrb experienceOrb, int id, int value)
         return false;
     }
 
+    @Shadow
+    public abstract int getValue();
+    
+    @Shadow
+    protected abstract void setValue(int p_396669_);
+    
     @Unique
     public Map<Integer, Integer> clumps$clumpedMap;
 
@@ -96,7 +99,7 @@ public void playerTouch(Player rawPlayer, CallbackInfo ci) {
             player.takeXpDelay = 0;
             player.take(this, 1);
 
-            if(this.value != 0 || clumps$resolve()) {
+            if(this.getValue() != 0 || clumps$resolve()) {
                 AtomicInteger toGive = new AtomicInteger();
                 clumps$getClumpedMap().forEach((value, amount) -> {
                     Either<IValueEvent, Integer> result = Services.EVENT.fireValueEvent(player, value);
@@ -202,12 +205,14 @@ public void readAdditionalSaveData(CompoundTag compoundTag, CallbackInfo ci) {
 
         Map<Integer, Integer> map = new HashMap<>();
         if(compoundTag.contains("clumpedMap")) {
-            CompoundTag clumpedMap = compoundTag.getCompound("clumpedMap");
-            for(String s : clumpedMap.getAllKeys()) {
-                map.put(Integer.parseInt(s), clumpedMap.getInt(s));
+            CompoundTag clumpedMap = compoundTag.getCompoundOrEmpty("clumpedMap");
+            for(String s : clumpedMap.keySet()) {
+                clumpedMap.getInt(s).ifPresent(value -> {
+                    map.put(Integer.parseInt(s), value);
+                });
             }
         } else {
-            map.put(value, count);
+            map.put(getValue(), count);
         }
 
         clumps$setClumpedMap(map);
@@ -219,7 +224,7 @@ public void readAdditionalSaveData(CompoundTag compoundTag, CallbackInfo ci) {
 
         if(clumps$clumpedMap == null) {
             clumps$clumpedMap = new HashMap<>();
-            clumps$clumpedMap.put(this.value, 1);
+            clumps$clumpedMap.put(getValue(), 1);
         }
         return clumps$clumpedMap;
     }
@@ -234,12 +239,12 @@ public void readAdditionalSaveData(CompoundTag compoundTag, CallbackInfo ci) {
     @Override
     public boolean clumps$resolve() {
 
-        value = clumps$getClumpedMap().entrySet()
+        setValue(clumps$getClumpedMap().entrySet()
                 .stream()
                 .map(entry -> entry.getKey() * entry.getValue())
                 .reduce(Integer::sum)
-                .orElse(1);
-        return value > 0;
+                .orElse(1));
+        return getValue() > 0;
     }
 
 }

fabric/build.gradle.kts

@@ -6,7 +6,7 @@ import net.darkhax.curseforgegradle.Constants as CFG_Constants
 
 plugins {
     id("blamejared-modloader-conventions")
-    id("fabric-loom") version "1.7-SNAPSHOT"
+    id("fabric-loom") version "1.10-SNAPSHOT"
     id("com.modrinth.minotaur")
 }
 

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################