Implement PlayerEquipmentData

- Fix client not grouping PlayerInfoPayload component changes due to logical OR short-circuiting

Author: HintSystem

src/main/java/dev/hintsystem/playerrelay/Config.java

@@ -48,7 +48,7 @@ public class Config {
     public boolean showPingsFromOtherServers = false;
 
     public int peerConnectionTimeout = 6000;
-    public int tcpSendIntervalMs = 400;
+    public int tcpSendIntervalMs = 500;
     public int udpSendIntervalMs = 100;
     public int udpPingIntervalMs = 5000;
     public int udpPingTimeoutMs = 2000;

src/main/java/dev/hintsystem/playerrelay/payload/PlayerInfoPayload.java

@@ -27,6 +27,7 @@ public class PlayerInfoPayload implements IPayload {
         registerComponent(PlayerWorldData.class, PlayerWorldData::new);
         registerComponent(PlayerPositionData.class, PlayerPositionData::new);
         registerComponent(PlayerStatsData.class, PlayerStatsData::new);
+        registerComponent(PlayerEquipmentData.class, PlayerEquipmentData::new);
         registerComponent(PlayerStatusEffectsData.class, PlayerStatusEffectsData::new);
     }
 
@@ -99,13 +100,11 @@ public <T extends PlayerDataComponent> T getComponentOrEmpty(Class<T> componentC
     }
 
     public <T extends PlayerDataComponent> PlayerInfoPayload setComponent(T component) {
-        ComponentInfo<?> info = COMPONENT_REGISTRY.get(component.getClass());
-        if (info == null) throw new IllegalArgumentException("Unknown component class: " + component.getClass());
-
-        int index = getComponentIndex(info.flag);
+        byte flag = getComponentInfo(component.getClass()).flag;
+        int index = getComponentIndex(flag);
         components[index] = component;
 
-        this.flags |= info.flag;
+        this.flags |= flag;
         return this;
     }
 

src/main/java/dev/hintsystem/playerrelay/payload/PlayerInventoryPayload.java

@@ -3,6 +3,7 @@
 import dev.hintsystem.playerrelay.networking.message.P2PMessageType;
 
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.RegistryByteBuf;
 
@@ -23,7 +24,7 @@ public PlayerInventoryPayload(PlayerEntity player) {
         this.isRequest = false;
         this.playerId = player.getUuid();
 
-        for (int i = 0; i < 36; i++) {
+        for (int i = 0; i < PlayerInventory.MAIN_SIZE; i++) {
             ItemStack stack = player.getInventory().getStack(i);
 
             this.inventoryItems.add(stack.copy());

src/main/java/dev/hintsystem/playerrelay/payload/player/PlayerEquipmentData.java

@@ -0,0 +1,67 @@
+package dev.hintsystem.playerrelay.payload.player;
+
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.RegistryByteBuf;
+import net.minecraft.util.collection.DefaultedList;
+
+public class PlayerEquipmentData implements PlayerDataComponent {
+    public static final EquipmentSlot[] EQUIPMENT_SLOT_ORDER = new EquipmentSlot[] {
+        EquipmentSlot.MAINHAND,
+        EquipmentSlot.OFFHAND,
+        EquipmentSlot.FEET,
+        EquipmentSlot.LEGS,
+        EquipmentSlot.CHEST,
+        EquipmentSlot.HEAD,
+    };
+
+    public final DefaultedList<ItemStack> equipment = DefaultedList.ofSize(EQUIPMENT_SLOT_ORDER.length, ItemStack.EMPTY);
+
+    public PlayerEquipmentData() {}
+
+    public PlayerEquipmentData(PlayerEntity player) {
+        for (int i = 0; i < EQUIPMENT_SLOT_ORDER.length; i++) {
+            EquipmentSlot slot = EQUIPMENT_SLOT_ORDER[i];
+            ItemStack stack = player.getEquippedStack(slot);
+            this.equipment.set(i, stack.copy());
+        }
+    }
+
+    @Override
+    public void write(RegistryByteBuf buf) {
+        for (int i = 0; i < EQUIPMENT_SLOT_ORDER.length; i++) {
+            ItemStack.OPTIONAL_PACKET_CODEC.encode(buf, equipment.get(i));
+        }
+    }
+
+    @Override
+    public void read(RegistryByteBuf buf) {
+        for (int i = 0; i < EQUIPMENT_SLOT_ORDER.length; i++) {
+            ItemStack stack = ItemStack.OPTIONAL_PACKET_CODEC.decode(buf);
+            this.equipment.set(i, stack);
+        }
+    }
+
+    @Override
+    public boolean hasChanged(PlayerDataComponent other) {
+        if (!(other instanceof PlayerEquipmentData otherEquipment)) return true;
+
+        for (int i = 0; i < EQUIPMENT_SLOT_ORDER.length; i++) {
+            if (!ItemStack.areEqual(this.equipment.get(i), otherEquipment.equipment.get(i))) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public PlayerEquipmentData copy() {
+        PlayerEquipmentData copy = new PlayerEquipmentData();
+        for (int i = 0; i < this.equipment.size(); i++) {
+            copy.equipment.set(i, this.equipment.get(i).copy());
+        }
+        return copy;
+    }
+}