Fix chunk attachment being removed from player when it shouldn't, fix…

… usage of custom items in Trim Material/Patter

gradle.properties

@@ -12,7 +12,7 @@ fabric_version=0.74.2+1.19.4
 
 maven_group = eu.pb4
 
-mod_version = 0.4.3
+mod_version = 0.4.4
 
 minecraft_version_supported = ">=1.19.4-"
 

polymer-core/src/main/java/eu/pb4/polymer/core/mixin/other/RegistryFixedCodecMixin.java

@@ -0,0 +1,40 @@
+package eu.pb4.polymer.core.mixin.other;
+
+import com.mojang.serialization.DynamicOps;
+import eu.pb4.polymer.core.api.utils.PolymerSyncedObject;
+import eu.pb4.polymer.core.api.utils.PolymerUtils;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.entry.RegistryEntry;
+import net.minecraft.registry.entry.RegistryFixedCodec;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
+@Mixin(RegistryFixedCodec.class)
+public class RegistryFixedCodecMixin {
+    @Shadow @Final private RegistryKey<Registry> registry;
+
+    @ModifyVariable(
+            method = "encode(Lnet/minecraft/registry/entry/RegistryEntry;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;",
+            at = @At("HEAD")
+    )
+    private RegistryEntry<?> polymerCore$swapEntry(RegistryEntry<?> entry) {
+        var player = PolymerUtils.getPlayerContext();
+
+        if (player != null) {
+            try {
+                if (entry.value() instanceof PolymerSyncedObject polymerSyncedObject) {
+                    return ((Registry<Registry>) (Object) Registries.REGISTRIES).get(this.registry).getEntry(polymerSyncedObject.getPolymerReplacement(player));
+                }
+            } catch (Throwable e) {
+                e.printStackTrace();
+            }
+        }
+
+        return entry;
+    }
+}

polymer-core/src/main/resources/polymer-core.mixins.json

@@ -61,6 +61,7 @@
     "other.IndexedNetworkMixin",
     "other.ItemGroupsAccessor",
     "other.PacketByteBufMixin",
+    "other.RegistryFixedCodecMixin",
     "other.RemoveEntityStatusEffectS2CPacketMixin",
     "other.ServerPlayerEntityMixin",
     "other.ServerPlayNetworkHandlerMixin",

polymer-core/src/testmod/java/eu/pb4/polymertest/TestMod.java

@@ -229,6 +229,7 @@ public void onInitialize() {
         //PolymerResourcePackUtils.addModAsAssetsSource("promenade");
         register(Registries.ITEM, new Identifier("bugged", "wooden_sword"), new BuggedItem(new Item.Settings()));
 
+        register(Registries.ITEM, new Identifier("test", "emerald"), new SimplePolymerItem(new Item.Settings(), Items.EMERALD));
         register(Registries.ITEM, new Identifier("test", "item"), ITEM);
         register(Registries.ITEM, new Identifier("test", "item2"), ITEM_2);
         register(Registries.ITEM, new Identifier("test", "item3"), ITEM_3);

polymer-core/src/testmod/resources/data/minecraft/tags/items/trim_materials.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "test:item"
+  ]
+}

polymer-core/src/testmod/resources/data/polymertest/trim_material/test.json

@@ -0,0 +1,9 @@
+{
+  "asset_name": "test",
+  "description": {
+    "color": "#6006ab",
+    "translate": "TEST"
+  },
+  "ingredient": "test:item",
+  "item_model_index": 0.193702
+}

polymer-core/src/testmod/resources/data/polymertest/trim_pattern/test.json

@@ -0,0 +1,8 @@
+{
+  "asset_id": "test",
+  "description": {
+    "color": "#6006ab",
+    "translate": "TEST"
+  },
+  "template_item": "test:item"
+}

polymer-virtual-entity/src/main/java/eu/pb4/polymer/virtualentity/api/attachment/ChunkAttachment.java

@@ -112,9 +112,14 @@ public void updateCurrentlyTracking(Collection<ServerPlayNetworkHandler> current
 
     @Override
     public void updateTracking(ServerPlayNetworkHandler tracking) {
+        if (tracking.player.world != this.chunk.getWorld() || tracking.player.isDead()) {
+            this.stopWatching(tracking);
+            return;
+        }
+
         var tacs = tracking.player.getWorld().getChunkManager().threadedAnvilChunkStorage;
         var section = tracking.getPlayer().getWatchedSection();
-        if (!tacs.isWithinDistance(this.chunk.getPos().x, this.chunk.getPos().z, section.getX(), section.getMaxZ(), ((ThreadedAnvilChunkStorageAccessor) tacs).getWatchDistance())) {
+        if (!tacs.isWithinDistance(this.chunk.getPos().x, this.chunk.getPos().z, section.getX(), section.getZ(), ((ThreadedAnvilChunkStorageAccessor) tacs).getWatchDistance())) {
             this.stopWatching(tracking);
         }
     }

polymer-virtual-entity/src/main/java/eu/pb4/polymer/virtualentity/mixin/ServerPlayerEntityMixin.java

@@ -45,7 +45,7 @@ public class ServerPlayerEntityMixin {
         }
     }
 
-    @Inject(method = "onDeath", at = @At("HEAD"))
+    @Inject(method = "onDeath", at = @At("TAIL"))
     private void polymerVE$removeOnDeath(DamageSource source, CallbackInfo ci) {
         for (var holder : new ArrayList<>(((HolderHolder) this.networkHandler).polymer$getHolders())) {
             if (holder.getAttachment() != null) {
@@ -54,7 +54,7 @@ public class ServerPlayerEntityMixin {
         }
     }
 
-    @Inject(method = "moveToWorld", at = @At("HEAD"))
+    @Inject(method = "moveToWorld", at = @At(value = "RETURN"))
     private void polymerVE$removeOnWorldChange(ServerWorld destination, CallbackInfoReturnable<Entity> cir) {
         for (var holder : new ArrayList<>(((HolderHolder) this.networkHandler).polymer$getHolders())) {
             if (holder.getAttachment() != null) {