From fcd91bb855bb1dc3a152c957c2a90281c6b27292 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Tue, 13 Aug 2024 12:45:36 +0200
Subject: [PATCH] Add item cost and particle types to item rewriter

---
 .../template/BlockItemPacketRewriter1_99.java | 16 +++++--
 .../protocols/template/Protocol1_99To_98.java |  2 +-
 .../rewriter/BlockItemPacketRewriter1_21.java | 14 ++++--
 .../viaversion/rewriter/ItemRewriter.java     | 47 +++++++++++++------
 .../rewriter/StructuredItemRewriter.java      | 10 ++++
 5 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/template/BlockItemPacketRewriter1_99.java b/common/src/main/java/com/viaversion/viaversion/protocols/template/BlockItemPacketRewriter1_99.java
index 0be808fe5..655e1db33 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/template/BlockItemPacketRewriter1_99.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/template/BlockItemPacketRewriter1_99.java
@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.protocols.template;
 
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2;
-import com.viaversion.viaversion.api.type.types.version.Types1_20_5;
+import com.viaversion.viaversion.api.type.types.version.Types1_21;
 import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.rewriter.RecipeRewriter1_20_3;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPacket1_20_5;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPackets1_20_5;
@@ -30,10 +30,16 @@ import com.viaversion.viaversion.rewriter.StructuredItemRewriter;
 // To replace if needed:
 //   ChunkType1_20_2
 //   RecipeRewriter1_20_3
+//   Types1_21, Types1_OLD
 final class BlockItemPacketRewriter1_99 extends StructuredItemRewriter<ClientboundPacket1_21, ServerboundPacket1_20_5, Protocol1_99To_98> {
 
     public BlockItemPacketRewriter1_99(final Protocol1_99To_98 protocol) {
-        super(protocol, /*TypesOLD.ITEM, TypesOLD.ITEM_ARRAY, */Types1_20_5.ITEM, Types1_20_5.ITEM_ARRAY);
+        super(protocol, Types1_21.ITEM, Types1_21.ITEM_ARRAY);
+        /*super(protocol,
+            Types1_OLD.ITEM, Types1_OLD.ITEM_ARRAY, Types1_21.ITEM, Types1_21.ITEM_ARRAY,
+            Types1_OLD.ITEM_COST, Types1_OLD.OPTIONAL_ITEM_COST, Types1_21.ITEM_COST, Types1_21.OPTIONAL_ITEM_COST,
+            Types1_OLD.PARTICLE, Types1_21.PARTICLE
+        );*/
     }
 
     @Override
@@ -58,10 +64,10 @@ final class BlockItemPacketRewriter1_99 extends StructuredItemRewriter<Clientbou
         registerAdvancements1_20_3(ClientboundPackets1_21.UPDATE_ADVANCEMENTS);
         registerSetEquipment(ClientboundPackets1_21.SET_EQUIPMENT);
         registerContainerClick1_17_1(ServerboundPackets1_20_5.CONTAINER_CLICK);
-        registerMerchantOffers1_20_5(ClientboundPackets1_21.MERCHANT_OFFERS, Types1_20_5.ITEM_COST, Types1_20_5.ITEM_COST, Types1_20_5.OPTIONAL_ITEM_COST, Types1_20_5.OPTIONAL_ITEM_COST);
+        registerMerchantOffers1_20_5(ClientboundPackets1_21.MERCHANT_OFFERS);
         registerSetCreativeModeSlot(ServerboundPackets1_20_5.SET_CREATIVE_MODE_SLOT);
-        registerLevelParticles1_20_5(ClientboundPackets1_21.LEVEL_PARTICLES, Types1_20_5.PARTICLE, Types1_20_5.PARTICLE);
-        registerExplosion(ClientboundPackets1_21.EXPLODE, Types1_20_5.PARTICLE, Types1_20_5.PARTICLE); // Rewrites the included sound and particles
+        registerLevelParticles1_20_5(ClientboundPackets1_21.LEVEL_PARTICLES);
+        registerExplosion(ClientboundPackets1_21.EXPLODE); // Rewrites the included sound and particles
 
         new RecipeRewriter1_20_3<>(protocol).register1_20_5(ClientboundPackets1_21.UPDATE_RECIPES);
         // OR do this if serialization of recipes changed and override the relevant method
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/template/Protocol1_99To_98.java b/common/src/main/java/com/viaversion/viaversion/protocols/template/Protocol1_99To_98.java
index 4a021e313..068bb2287 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/template/Protocol1_99To_98.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/template/Protocol1_99To_98.java
@@ -90,7 +90,7 @@ final class Protocol1_99To_98 extends AbstractProtocol<ClientboundPacket1_21, Cl
         // EntityTypes1_20_5.initialize(this);
 
         // Uncomment if a new particle was added = ids shifted; requires a new Types_ class copied from the last
-        /*Types1_20_5.PARTICLE.filler(this)
+        /*Types1_21.PARTICLE.filler(this)
                 .reader("block", ParticleType.Readers.BLOCK)
                 .reader("block_marker", ParticleType.Readers.BLOCK)
                 .reader("dust", ParticleType.Readers.DUST)
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/BlockItemPacketRewriter1_21.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/BlockItemPacketRewriter1_21.java
index 9b8113092..803add1c2 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/BlockItemPacketRewriter1_21.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/BlockItemPacketRewriter1_21.java
@@ -48,7 +48,11 @@ public final class BlockItemPacketRewriter1_21 extends StructuredItemRewriter<Cl
     private static final List<String> DISCS = List.of("11", "13", "5", "blocks", "cat", "chirp", "far", "mall", "mellohi", "otherside", "pigstep", "relic", "stal", "strad", "wait", "ward");
 
     public BlockItemPacketRewriter1_21(final Protocol1_20_5To1_21 protocol) {
-        super(protocol, Types1_20_5.ITEM, Types1_20_5.ITEM_ARRAY, Types1_21.ITEM, Types1_21.ITEM_ARRAY);
+        super(protocol,
+            Types1_20_5.ITEM, Types1_20_5.ITEM_ARRAY, Types1_21.ITEM, Types1_21.ITEM_ARRAY,
+            Types1_20_5.ITEM_COST, Types1_20_5.OPTIONAL_ITEM_COST, Types1_21.ITEM_COST, Types1_21.OPTIONAL_ITEM_COST,
+            Types1_20_5.PARTICLE, Types1_21.PARTICLE
+        );
     }
 
     @Override
@@ -66,10 +70,10 @@ public final class BlockItemPacketRewriter1_21 extends StructuredItemRewriter<Cl
         registerAdvancements1_20_3(ClientboundPackets1_20_5.UPDATE_ADVANCEMENTS);
         registerSetEquipment(ClientboundPackets1_20_5.SET_EQUIPMENT);
         registerContainerClick1_17_1(ServerboundPackets1_20_5.CONTAINER_CLICK);
-        registerMerchantOffers1_20_5(ClientboundPackets1_20_5.MERCHANT_OFFERS, Types1_20_5.ITEM_COST, Types1_21.ITEM_COST, Types1_20_5.OPTIONAL_ITEM_COST, Types1_21.OPTIONAL_ITEM_COST);
+        registerMerchantOffers1_20_5(ClientboundPackets1_20_5.MERCHANT_OFFERS);
         registerSetCreativeModeSlot(ServerboundPackets1_20_5.SET_CREATIVE_MODE_SLOT);
-        registerLevelParticles1_20_5(ClientboundPackets1_20_5.LEVEL_PARTICLES, Types1_20_5.PARTICLE, Types1_21.PARTICLE);
-        registerExplosion(ClientboundPackets1_20_5.EXPLODE, Types1_20_5.PARTICLE, Types1_21.PARTICLE); // Rewrites the included sound and particles
+        registerLevelParticles1_20_5(ClientboundPackets1_20_5.LEVEL_PARTICLES);
+        registerExplosion(ClientboundPackets1_20_5.EXPLODE); // Rewrites the included sound and particles
 
         protocol.registerClientbound(ClientboundPackets1_20_5.HORSE_SCREEN_OPEN, wrapper -> {
             wrapper.passthrough(Types.UNSIGNED_BYTE); // Container id
@@ -212,4 +216,4 @@ public final class BlockItemPacketRewriter1_21 extends StructuredItemRewriter<Cl
         identifier = identifier.substring("minecraft:music_disc_".length());
         return DISCS.indexOf(identifier);
     }
-}
\ No newline at end of file
+}
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java
index a14aceb9c..f0ff678f5 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java
@@ -42,13 +42,34 @@ public class ItemRewriter<C extends ClientboundPacketType, S extends Serverbound
     private final Type<Item> mappedItemType;
     private final Type<Item[]> itemArrayType;
     private final Type<Item[]> mappedItemArrayType;
+    private final Type<Item> itemCostType;
+    private final Type<Item> mappedItemCostType;
+    private final Type<Item> optionalItemCostType;
+    private final Type<Item> mappedOptionalItemCostType;
+    private final Type<Particle> particleType;
+    private final Type<Particle> mappedParticleType;
 
-    public ItemRewriter(T protocol, Type<Item> itemType, Type<Item[]> itemArrayType, Type<Item> mappedItemType, Type<Item[]> mappedItemArrayType) {
+    public ItemRewriter(
+        T protocol,
+        Type<Item> itemType, Type<Item[]> itemArrayType, Type<Item> mappedItemType, Type<Item[]> mappedItemArrayType,
+        Type<Item> itemCostType, Type<Item> optionalItemCostType, Type<Item> mappedItemCostType, Type<Item> mappedOptionalItemCostType,
+        Type<Particle> particleType, Type<Particle> mappedParticleType
+    ) {
         super(protocol);
         this.itemType = itemType;
         this.itemArrayType = itemArrayType;
         this.mappedItemType = mappedItemType;
         this.mappedItemArrayType = mappedItemArrayType;
+        this.itemCostType = itemCostType;
+        this.mappedItemCostType = mappedItemCostType;
+        this.optionalItemCostType = optionalItemCostType;
+        this.mappedOptionalItemCostType = mappedOptionalItemCostType;
+        this.particleType = particleType;
+        this.mappedParticleType = mappedParticleType;
+    }
+
+    public ItemRewriter(T protocol, Type<Item> itemType, Type<Item[]> itemArrayType, Type<Item> mappedItemType, Type<Item[]> mappedItemArrayType) {
+        this(protocol, itemType, itemArrayType, mappedItemType, mappedItemArrayType, null, null, null, null, null, null);
     }
 
     public ItemRewriter(T protocol, Type<Item> itemType, Type<Item[]> itemArrayType) {
@@ -322,25 +343,21 @@ public class ItemRewriter<C extends ClientboundPacketType, S extends Serverbound
     }
 
     // Hopefully the item cost weirdness is temporary
-    public void registerMerchantOffers1_20_5(
-        final C packetType,
-        final Type<Item> costType, final Type<Item> mappedCostType,
-        final Type<Item> optionalCostType, final Type<Item> mappedOptionalCostType
-    ) {
+    public void registerMerchantOffers1_20_5(final C packetType) {
         protocol.registerClientbound(packetType, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // Container id
             int size = wrapper.passthrough(Types.VAR_INT);
             for (int i = 0; i < size; i++) {
-                final Item input = wrapper.read(costType);
-                wrapper.write(mappedCostType, handleItemToClient(wrapper.user(), input));
+                final Item input = wrapper.read(itemCostType);
+                wrapper.write(mappedItemCostType, handleItemToClient(wrapper.user(), input));
 
                 handleClientboundItem(wrapper); // Result
 
-                Item secondInput = wrapper.read(optionalCostType);
+                Item secondInput = wrapper.read(optionalItemCostType);
                 if (secondInput != null) {
                     handleItemToClient(wrapper.user(), secondInput);
                 }
-                wrapper.write(mappedOptionalCostType, secondInput);
+                wrapper.write(mappedOptionalItemCostType, secondInput);
 
                 wrapper.passthrough(Types.BOOLEAN); // Out of stock
                 wrapper.passthrough(Types.INT); // Number of trade uses
@@ -491,7 +508,7 @@ public class ItemRewriter<C extends ClientboundPacketType, S extends Serverbound
         });
     }
 
-    public void registerLevelParticles1_20_5(C packetType, Type<Particle> unmappedParticleType, Type<Particle> mappedParticleType) {
+    public void registerLevelParticles1_20_5(C packetType) {
         protocol.registerClientbound(packetType, new PacketHandlers() {
             @Override
             public void register() {
@@ -505,7 +522,7 @@ public class ItemRewriter<C extends ClientboundPacketType, S extends Serverbound
                 map(Types.FLOAT); // Particle Data
                 map(Types.INT); // Particle Count
                 handler(wrapper -> {
-                    final Particle particle = wrapper.read(unmappedParticleType);
+                    final Particle particle = wrapper.read(particleType);
                     rewriteParticle(wrapper.user(), particle);
                     wrapper.write(mappedParticleType, particle);
                 });
@@ -513,7 +530,7 @@ public class ItemRewriter<C extends ClientboundPacketType, S extends Serverbound
         });
     }
 
-    public void registerExplosion(C packetType, Type<Particle> unmappedParticleType, Type<Particle> mappedParticleType) {
+    public void registerExplosion(C packetType) {
         final SoundRewriter<C> soundRewriter = new SoundRewriter<>(protocol);
         protocol.registerClientbound(packetType, wrapper -> {
             wrapper.passthrough(Types.DOUBLE); // X
@@ -531,8 +548,8 @@ public class ItemRewriter<C extends ClientboundPacketType, S extends Serverbound
             wrapper.passthrough(Types.FLOAT); // Knockback Z
             wrapper.passthrough(Types.VAR_INT); // Block interaction type
 
-            final Particle smallExplosionParticle = wrapper.read(unmappedParticleType);
-            final Particle largeExplosionParticle = wrapper.read(unmappedParticleType);
+            final Particle smallExplosionParticle = wrapper.read(particleType);
+            final Particle largeExplosionParticle = wrapper.read(particleType);
             wrapper.write(mappedParticleType, smallExplosionParticle);
             wrapper.write(mappedParticleType, largeExplosionParticle);
             rewriteParticle(wrapper.user(), smallExplosionParticle);
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/StructuredItemRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/StructuredItemRewriter.java
index 403a2fb14..65952fcd1 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/StructuredItemRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/StructuredItemRewriter.java
@@ -22,6 +22,7 @@ import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.data.FullMappings;
 import com.viaversion.viaversion.api.data.MappingData;
+import com.viaversion.viaversion.api.minecraft.Particle;
 import com.viaversion.viaversion.api.minecraft.data.StructuredData;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;
@@ -38,6 +39,15 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 public class StructuredItemRewriter<C extends ClientboundPacketType, S extends ServerboundPacketType,
     T extends Protocol<C, ?, ?, S>> extends ItemRewriter<C, S, T> {
 
+    public StructuredItemRewriter(
+        T protocol,
+        Type<Item> itemType, Type<Item[]> itemArrayType, Type<Item> mappedItemType, Type<Item[]> mappedItemArrayType,
+        Type<Item> itemCostType, Type<Item> optionalItemCostType, Type<Item> mappedItemCostType, Type<Item> mappedOptionalItemCostType,
+        Type<Particle> particleType, Type<Particle> mappedParticleType
+    ) {
+        super(protocol, itemType, itemArrayType, mappedItemType, mappedItemArrayType, itemCostType, optionalItemCostType, mappedItemCostType, mappedOptionalItemCostType, particleType, mappedParticleType);
+    }
+
     public StructuredItemRewriter(T protocol, Type<Item> itemType, Type<Item[]> itemArrayType, Type<Item> mappedItemType, Type<Item[]> mappedItemArrayType) {
         super(protocol, itemType, itemArrayType, mappedItemType, mappedItemArrayType);
     }