ClickSlotC2SPacket item NBT implementation

Author: mineLdiver

station-items-v0/build.gradle.kts

@@ -1,5 +1,6 @@
-import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
 import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
+import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
+
 base.archivesName.set("station-items-v0")
 version = getSubprojectVersion(project, "1.0.0")
 
@@ -11,5 +12,6 @@ addModuleDependencies(project,
         "station-blocks-v0",
         "station-player-api-v0",
         "station-nbt-v0",
-        "station-networking-v0"
+        "station-networking-v0",
+        "station-vanilla-checker-v0"
 )

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

@@ -2,6 +2,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.s2c.play.StationEntityEquipmentUpdateS2CPacket;
 import net.modificationstation.stationapi.impl.network.packet.s2c.play.StationInventoryS2CPacket;
 import net.modificationstation.stationapi.impl.network.packet.s2c.play.StationItemEntitySpawnS2CPacket;
@@ -10,6 +11,7 @@
 public class StationItemsNetworkingImpl implements ModInitializer {
     @Override
     public void onInitialize() {
+        IdentifiablePacket.register(StationClickSlotC2SPacket.PACKET_ID, false, true, StationClickSlotC2SPacket::new);
         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);

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

@@ -0,0 +1,58 @@
+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.packet.c2s.play.ClickSlotC2SPacket;
+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 StationClickSlotC2SPacket extends ClickSlotC2SPacket implements IdentifiablePacket {
+    public static final Identifier PACKET_ID = NAMESPACE.id("items/slot");
+
+    @ApiStatus.Internal
+    public StationClickSlotC2SPacket() {}
+
+    public StationClickSlotC2SPacket(int syncId, int slot, int button, boolean holdingShift, ItemStack stack, short actionType) {
+        super(syncId, slot, button, holdingShift, stack, actionType);
+    }
+
+    @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

@@ -0,0 +1,31 @@
+package net.modificationstation.stationapi.mixin.item.client.network.itemnbt;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import net.minecraft.MultiplayerInteractionManager;
+import net.minecraft.client.network.ClientNetworkHandler;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.packet.c2s.play.ClickSlotC2SPacket;
+import net.modificationstation.stationapi.api.network.ModdedPacketHandler;
+import net.modificationstation.stationapi.impl.network.packet.c2s.play.StationClickSlotC2SPacket;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(MultiplayerInteractionManager.class)
+class MultiplayerInteractionManagerMixin {
+    @Shadow private ClientNetworkHandler networkHandler;
+
+    @WrapOperation(
+            method = "clickSlot",
+            at = @At(
+                    value = "NEW",
+                    target = "(IIIZLnet/minecraft/item/ItemStack;S)Lnet/minecraft/network/packet/c2s/play/ClickSlotC2SPacket;"
+            )
+    )
+    private ClickSlotC2SPacket stationapi_redirectClickSlotPacket(int syncId, int slot, int button, boolean holdingShift, ItemStack stack, short actionType, Operation<ClickSlotC2SPacket> original) {
+        return ((ModdedPacketHandler) networkHandler).isModded() ?
+                new StationClickSlotC2SPacket(syncId, slot, button, holdingShift, stack, actionType) :
+                original.call(syncId, slot, button, holdingShift, stack, actionType);
+    }
+}

station-items-v0/src/main/resources/station-items-v0.mixins.json

@@ -31,7 +31,8 @@
     "client.ItemRendererMixin",
     "client.MultiplayerInteractionManagerMixin",
     "client.OtherPlayerEntityMixin",
-    "client.SingleplayerInteractionManagerMixin"
+    "client.SingleplayerInteractionManagerMixin",
+    "client.network.itemnbt.MultiplayerInteractionManagerMixin"
   ],
   "injectors": {
     "defaultRequire": 1