Fix custom data not copying upon player death

Author: eclipseisoffline

CHANGELOG.md

@@ -1 +1 @@
-- Updated to 1.21.10.
+- Fix custom data not copying upon player death.

gradle.properties

@@ -7,7 +7,7 @@ yarn_mappings=1.21.10+build.1
 loader_version=0.17.2
 
 # Mod Properties
-mod_version=0.3.1-1.21.10
+mod_version=0.3.2-1.21.10
 supported_versions=>=1.21.9 <=1.21.10
 maven_group=xyz.eclipseisoffline
 archives_base_name=modifyplayerdata

src/main/java/xyz/eclipseisoffline/modifyplayerdata/mixin/EntityAccessor.java

@@ -0,0 +1,13 @@
+package xyz.eclipseisoffline.modifyplayerdata.mixin;
+
+import net.minecraft.component.type.NbtComponent;
+import net.minecraft.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(Entity.class)
+public interface EntityAccessor {
+
+    @Accessor
+    NbtComponent getCustomData();
+}

src/main/java/xyz/eclipseisoffline/modifyplayerdata/mixin/ServerPlayerEntityMixin.java

@@ -1,16 +1,24 @@
 package xyz.eclipseisoffline.modifyplayerdata.mixin;
 
+import com.mojang.authlib.GameProfile;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.storage.ReadView;
 import net.minecraft.storage.WriteView;
+import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import xyz.eclipseisoffline.modifyplayerdata.PlayerData;
 
 @Mixin(ServerPlayerEntity.class)
-public class ServerPlayerEntityMixin {
+public abstract class ServerPlayerEntityMixin extends PlayerEntity {
+
+    public ServerPlayerEntityMixin(World world, GameProfile profile) {
+        super(world, profile);
+    }
 
     @Inject(method = "readCustomData", at = @At("TAIL"))
     public void readExtraCustomData(ReadView view, CallbackInfo callbackInfo) {
@@ -21,4 +29,9 @@ public void readExtraCustomData(ReadView view, CallbackInfo callbackInfo) {
     public void writeExtraCustomData(WriteView view, CallbackInfo callbackInfo) {
         PlayerData.write((ServerPlayerEntity) (Object) this, view);
     }
+
+    @Inject(method = "copyFrom", at = @At("TAIL"))
+    public void copyCustomData(ServerPlayerEntity oldPlayer, boolean alive, CallbackInfo callbackInfo) {
+        setComponent(DataComponentTypes.CUSTOM_DATA, ((EntityAccessor) oldPlayer).getCustomData());
+    }
 }

src/main/resources/modifyplayerdata.mixins.json

@@ -4,6 +4,7 @@
   "package": "xyz.eclipseisoffline.modifyplayerdata.mixin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
+    "EntityAccessor",
     "EntityDataObjectMixin",
     "EntityMixin",
     "HungerManagerAccessor",