Port to 1.21.6

Author: jaredlll08

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

@@ -1,13 +1,13 @@
 package com.blamejared
 
 object Versions {
-    const val MOD = "23.0.0"
+    const val MOD = "24.0.0"
     const val JAVA = "21"
-    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 MINECRAFT = "1.21.6"
+    const val FABRIC_LOADER = "0.16.14"
+    const val FABRIC = "0.128.1+1.21.6"
+    const val FORGE = "56.0.9"
+    const val FORGE_LOADER = "[56,)"
+    const val NEO_FORGE = "21.6.20-beta"
     const val NEO_FORGE_LOADER= "[4,)"
 }

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

@@ -18,6 +18,8 @@
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.entity.EntityTypeTest;
+import net.minecraft.world.level.storage.ValueInput;
+import net.minecraft.world.level.storage.ValueOutput;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
@@ -138,7 +140,7 @@ public void playerTouch(Player rawPlayer, CallbackInfo ci) {
         cir.setReturnValue(clumps$currentEntry
                 .map(foundItem -> {
                     ItemStack itemstack = foundItem.itemStack();
-                    int xpToRepair = EnchantmentHelper.modifyDurabilityToRepairFromXp(player.serverLevel(), itemstack, (int) (actualValue * Services.PLATFORM.getRepairRatio(itemstack)));
+                    int xpToRepair = EnchantmentHelper.modifyDurabilityToRepairFromXp(player.level(), itemstack, (int) (actualValue * Services.PLATFORM.getRepairRatio(itemstack)));
                     int toRepair = Math.min(xpToRepair, itemstack.getDamageValue());
                     itemstack.setDamageValue(itemstack.getDamageValue() - toRepair);
                     if(toRepair > 0) {
@@ -191,29 +193,26 @@ private static void tryMergeToExisting(ServerLevel serverLevel, Vec3 vec3, int v
 
 
     @Inject(method = "addAdditionalSaveData", at = @At("TAIL"))
-    public void addAdditionalSaveData(CompoundTag compoundTag, CallbackInfo ci) {
+    public void addAdditionalSaveData(ValueOutput valueOutput, CallbackInfo ci) {
 
         if(clumps$clumpedMap != null) {
             CompoundTag map = new CompoundTag();
             clumps$getClumpedMap().forEach((value, count) -> map.putInt(String.valueOf(value), count));
-            compoundTag.put("clumpedMap", map);
+            valueOutput.store("clumpedMap", CompoundTag.CODEC, map);
         }
     }
 
     @Inject(method = "readAdditionalSaveData", at = @At("TAIL"))
-    public void readAdditionalSaveData(CompoundTag compoundTag, CallbackInfo ci) {
+    public void readAdditionalSaveData(ValueInput valueInput, CallbackInfo ci) {
 
         Map<Integer, Integer> map = new HashMap<>();
-        if(compoundTag.contains("clumpedMap")) {
-            CompoundTag clumpedMap = compoundTag.getCompoundOrEmpty("clumpedMap");
+        valueInput.read("clumpedMap", CompoundTag.CODEC).ifPresentOrElse(clumpedMap -> {
             for(String s : clumpedMap.keySet()) {
                 clumpedMap.getInt(s).ifPresent(value -> {
                     map.put(Integer.parseInt(s), value);
                 });
             }
-        } else {
-            map.put(getValue(), count);
-        }
+        }, () -> map.put(getValue(), count));
 
         clumps$setClumpedMap(map);
     }