PlayerInteractBlockC2SPacket item NBT implementation

Author: mineLdiver

station-items-v0/src/main/java/net/modificationstation/stationapi/impl/network/packet/StationItemsNetworkingImpl.java

@@ -3,6 +3,7 @@
 import net.fabricmc.api.ModInitializer;
 import net.modificationstation.stationapi.api.network.packet.IdentifiablePacket;
 import net.modificationstation.stationapi.impl.network.packet.c2s.play.StationClickSlotC2SPacket;
+import net.modificationstation.stationapi.impl.network.packet.c2s.play.StationPlayerInteractBlockC2SPacket;
 import net.modificationstation.stationapi.impl.network.packet.s2c.play.StationEntityEquipmentUpdateS2CPacket;
 import net.modificationstation.stationapi.impl.network.packet.s2c.play.StationInventoryS2CPacket;
 import net.modificationstation.stationapi.impl.network.packet.s2c.play.StationItemEntitySpawnS2CPacket;
@@ -15,6 +16,7 @@ public void onInitialize() {
         IdentifiablePacket.register(StationEntityEquipmentUpdateS2CPacket.PACKET_ID, true, false, StationEntityEquipmentUpdateS2CPacket::new);
         IdentifiablePacket.register(StationInventoryS2CPacket.PACKET_ID, true, false, StationInventoryS2CPacket::new);
         IdentifiablePacket.register(StationItemEntitySpawnS2CPacket.PACKET_ID, true, false, StationItemEntitySpawnS2CPacket::new);
+        IdentifiablePacket.register(StationPlayerInteractBlockC2SPacket.PACKET_ID, false, true, StationPlayerInteractBlockC2SPacket::new);
         IdentifiablePacket.register(StationScreenHandlerSlotUpdateS2CPacket.PACKET_ID, true, false, StationScreenHandlerSlotUpdateS2CPacket::new);
     }
 }

station-items-v0/src/main/java/net/modificationstation/stationapi/impl/network/packet/c2s/play/StationPlayerInteractBlockC2SPacket.java

@@ -0,0 +1,59 @@
+package net.modificationstation.stationapi.impl.network.packet.c2s.play;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtElement;
+import net.minecraft.network.NetworkHandler;
+import net.minecraft.network.packet.c2s.play.PlayerInteractBlockC2SPacket;
+import net.modificationstation.stationapi.api.network.packet.IdentifiablePacket;
+import net.modificationstation.stationapi.api.util.Identifier;
+import net.modificationstation.stationapi.impl.item.StationNBTSetter;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import static net.modificationstation.stationapi.api.StationAPI.NAMESPACE;
+
+public class StationPlayerInteractBlockC2SPacket extends PlayerInteractBlockC2SPacket implements IdentifiablePacket {
+    public static final Identifier PACKET_ID = NAMESPACE.id("items/interact");
+
+    @ApiStatus.Internal
+    public StationPlayerInteractBlockC2SPacket() {}
+
+    public StationPlayerInteractBlockC2SPacket(int x, int y, int z, int side, ItemStack stack) {
+        super(x, y, z, side, stack);
+    }
+
+    @Override
+    public void read(DataInputStream stream) {
+        super.read(stream);
+        if (stack == null) return;
+        try {
+            if (stream.readBoolean()) return;
+            StationNBTSetter.cast(stack).setStationNbt((NbtCompound) NbtElement.readTag(stream));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void write(DataOutputStream stream) {
+        super.write(stream);
+        if (stack == null) return;
+        boolean empty = stack.getStationNbt().values().isEmpty();
+        try {
+            stream.writeBoolean(empty);
+            if (empty) return;
+            NbtElement.writeTag(stack.getStationNbt(), stream);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public Identifier getId() {
+        return PACKET_ID;
+    }
+}

station-items-v0/src/main/java/net/modificationstation/stationapi/mixin/item/client/network/itemnbt/MultiplayerInteractionManagerMixin.java

@@ -6,8 +6,10 @@
 import net.minecraft.client.network.ClientNetworkHandler;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.packet.c2s.play.ClickSlotC2SPacket;
+import net.minecraft.network.packet.c2s.play.PlayerInteractBlockC2SPacket;
 import net.modificationstation.stationapi.api.network.ModdedPacketHandler;
 import net.modificationstation.stationapi.impl.network.packet.c2s.play.StationClickSlotC2SPacket;
+import net.modificationstation.stationapi.impl.network.packet.c2s.play.StationPlayerInteractBlockC2SPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -16,6 +18,22 @@
 class MultiplayerInteractionManagerMixin {
     @Shadow private ClientNetworkHandler networkHandler;
 
+    @WrapOperation(
+            method = {
+                    "method_1713",
+                    "method_1712"
+            },
+            at = @At(
+                    value = "NEW",
+                    target = "(IIIILnet/minecraft/item/ItemStack;)Lnet/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket;"
+            )
+    )
+    private PlayerInteractBlockC2SPacket stationapi_redirectPlayerInteractBlockPacket(int x, int y, int z, int side, ItemStack stack, Operation<PlayerInteractBlockC2SPacket> original) {
+        return ((ModdedPacketHandler) networkHandler).isModded() ?
+                new StationPlayerInteractBlockC2SPacket(x, y, z, side, stack) :
+                original.call(x, y, z, side, stack);
+    }
+
     @WrapOperation(
             method = "clickSlot",
             at = @At(