✨ Updated to Minecraft 1.21.6

Author: MrCrayfish

common/src/main/java/com/mrcrayfish/goblintraders/entity/AbstractGoblinEntity.java

@@ -8,6 +8,7 @@
 import com.mrcrayfish.goblintraders.trades.GoblinOffers;
 import com.mrcrayfish.goblintraders.trades.type.BaseTrade;
 import com.mrcrayfish.goblintraders.util.Utils;
+import net.minecraft.core.UUIDUtil;
 import net.minecraft.core.particles.ItemParticleOption;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.nbt.*;
@@ -39,6 +40,8 @@
 import net.minecraft.world.item.trading.MerchantOffers;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.portal.TeleportTransition;
+import net.minecraft.world.level.storage.ValueInput;
+import net.minecraft.world.level.storage.ValueOutput;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
 
@@ -330,7 +333,7 @@ protected InteractionResult mobInteract(Player player, InteractionHand hand)
             if(result.consumesAction())
             {
                 // Remove the wandering restriction once named
-                this.clearRestriction();
+                this.clearHome();
             }
             return result;
         }
@@ -410,59 +413,28 @@ public void setDespawnDelay(int despawnDelay)
     }
 
     @Override
-    public void readAdditionalSaveData(CompoundTag compound)
+    public void readAdditionalSaveData(ValueInput input)
     {
-        super.readAdditionalSaveData(compound);
-        if(compound.contains("Offers"))
-        {
-            this.offers = new GoblinOffers(compound.getCompoundOrEmpty("Offers"));
-        }
-        if(compound.contains("DespawnDelay"))
-        {
-            this.despawnDelay = compound.getIntOr("DespawnDelay", 0);
-        }
-        if(compound.contains("RestockDelay"))
-        {
-            this.restockDelay = compound.getIntOr("RestockDelay", 0);
-        }
-        if(compound.contains("TradedCustomers"))
-        {
+        super.readAdditionalSaveData(input);
+        input.read("Offers", GoblinOffers.CODEC).ifPresent(offers -> this.offers = new GoblinOffers(offers));
+        input.getInt("DespawnDelay").ifPresent(delay -> this.despawnDelay = delay);
+        input.getInt("RestockDelay").ifPresent(delay -> this.restockDelay = delay);
+        input.list("TradedCustomers", UUIDUtil.CODEC).ifPresent(uuids -> {
             this.tradedCustomers.clear();
-            ListTag list = compound.getListOrEmpty("TradedCustomers");
-            list.forEach(tag -> {
-                if(tag instanceof StringTag(String value)) {
-                    UUID id = Utils.parseUuid(value);
-                    if(id != null) {
-                        this.tradedCustomers.add(id);
-                    }
-                }
-            });
-        }
+            uuids.forEach(this.tradedCustomers::add);
+        });
     }
 
     @Override
-    public void addAdditionalSaveData(CompoundTag compound)
+    public void addAdditionalSaveData(ValueOutput output)
     {
-        super.addAdditionalSaveData(compound);
+        super.addAdditionalSaveData(output);
         MerchantOffers offers = this.getOffers();
-        if(!offers.isEmpty())
-        {
-            MerchantOffers.CODEC.encodeStart(NbtOps.INSTANCE, offers).result()
-                .ifPresent(tag -> {
-                    compound.put("Offers", tag);
-                });
-        }
-        compound.putInt("DespawnDelay", this.despawnDelay);
-        compound.putInt("RestockDelay", this.restockDelay);
-
-        if(!this.tradedCustomers.isEmpty())
-        {
-            ListTag list = new ListTag();
-            this.tradedCustomers.forEach(id -> {
-                list.add(StringTag.valueOf(id.toString()));
-            });
-            compound.put("TradedCustomers", list);
-        }
+        output.store("Offers", GoblinOffers.CODEC, offers);
+        output.putInt("DespawnDelay", this.despawnDelay);
+        output.putInt("RestockDelay", this.restockDelay);
+        ValueOutput.TypedOutputList<UUID> uuids = output.list("TradedCustomers", UUIDUtil.CODEC);
+        this.tradedCustomers.forEach(uuids::add);
     }
 
     @Nullable
@@ -591,7 +563,7 @@ public void die(DamageSource source)
     }
 
     @Override
-    protected Vec3 getLeashOffset()
+    public Vec3 getLeashOffset()
     {
         return new Vec3(0, this.getEyeHeight() - 0.25, 0);
     }
@@ -601,7 +573,7 @@ public void setLeashedTo(Entity entity, boolean broadcast)
     {
         // When goblin becomes leashed, remove restriction
         super.setLeashedTo(entity, broadcast);
-        this.clearRestriction();
+        this.clearHome();
     }
 
     @Override

common/src/main/java/com/mrcrayfish/goblintraders/spawner/GoblinTraderSpawner.java

@@ -134,7 +134,7 @@ private boolean spawnGoblin()
 
         this.runDelay = this.data.getSpawnDelay();
         goblin.setDespawnDelay(this.data.getDespawnDelay());
-        goblin.restrictTo(pos, 16);
+        goblin.setHomeTo(pos, 16);
         this.setDirty();
         return true;
     }

common/src/main/java/com/mrcrayfish/goblintraders/trades/GoblinOffers.java

@@ -1,7 +1,5 @@
 package com.mrcrayfish.goblintraders.trades;
 
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtOps;
 import net.minecraft.world.item.trading.MerchantOffers;
 
 /**
@@ -11,12 +9,8 @@ public class GoblinOffers extends MerchantOffers
 {
     public GoblinOffers() {}
 
-    public GoblinOffers(CompoundTag tag)
+    public GoblinOffers(MerchantOffers offers)
     {
-        CODEC.parse(NbtOps.INSTANCE, tag).result().ifPresent(offers -> {
-            offers.forEach(offer -> {
-                this.add(new GoblinMerchantOffer(offer));
-            });
-        });
+        offers.forEach(offer -> this.add(new GoblinMerchantOffer(offer)));
     }
 }

gradle.properties

@@ -5,16 +5,16 @@ group=com.mrcrayfish
 java_version=21
 
 # Common
-minecraft_version=1.21.5
-neo_form_version=1.21.5-20250325.162830
+minecraft_version=1.21.6
+neo_form_version=1.21.6-20250617.151856
 
 # Fabric
-fabric_version=0.119.9+1.21.5
-fabric_loader_version=0.16.13
+fabric_version=0.127.0+1.21.6
+fabric_loader_version=0.16.14
 
 # NeoForge
-neoforge_version=21.5.38-beta
-neoforge_version_range=[21.5,)
+neoforge_version=21.6.11-beta
+neoforge_version_range=[21.6,)
 neoforge_loader_version_range=[2,)
 
 # Mod options
@@ -29,7 +29,7 @@ mod_issues=https://github.com/MrCrayfish/GoblinTraders/issues
 mod_license=MIT
 
 # Dependency options
-framework_version=0.11.1
+framework_version=0.12.1
 catalogue_version=1.12.1
 
 # Gradle

neoforge/src/main/java/com/mrcrayfish/goblintraders/client/ClientHandler.java

@@ -27,7 +27,7 @@
 /**
  * Author: MrCrayfish
  */
-@EventBusSubscriber(modid = Constants.MOD_ID, value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD)
+@EventBusSubscriber(modid = Constants.MOD_ID, value = Dist.CLIENT)
 public class ClientHandler
 {
     @SubscribeEvent