Update VV usage

Author: kennytv

common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsStructuredItemRewriter.java

@@ -33,12 +33,14 @@
 import com.viaversion.viaversion.api.minecraft.HolderSet;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;
+import com.viaversion.viaversion.api.minecraft.item.HashedItem;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.item.data.CustomModelData1_21_4;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.data.item.ItemHasherBase;
 import com.viaversion.viaversion.rewriter.StructuredItemRewriter;
 import java.util.ArrayList;
 import java.util.List;
@@ -73,6 +75,9 @@ public Item handleItemToClient(final UserConnection connection, final Item item)
             return item;
         }
 
+        final ItemHasherBase itemHasher = itemHasher(connection); // get the original hashed item and store it later if there are any changes that could affect the data hashes
+        final HashedItem originalHashedItem = hashItem(item, itemHasher);
+
         final StructuredDataContainer dataContainer = item.dataContainer();
         updateItemDataComponentTypeIds(dataContainer, true);
 
@@ -84,7 +89,8 @@ public Item handleItemToClient(final UserConnection connection, final Item item)
                 item.setIdentifier(mappingData.getNewItemId(item.identifier()));
             }
 
-            updateItemDataComponents(connection, item, true);
+            handleItemDataComponentsToClient(connection, item, dataContainer);
+            storeOriginalHashedItem(item, itemHasher, originalHashedItem); // has to be called AFTER all modifications - override updateItemDataComponentsToClient instead of this method if needed
             return item;
         }
 
@@ -115,7 +121,8 @@ public Item handleItemToClient(final UserConnection connection, final Item item)
             tag.putBoolean(nbtTagName("added_custom_name"), true);
         }
 
-        updateItemDataComponents(connection, item, true);
+        handleItemDataComponentsToClient(connection, item, dataContainer);
+        storeOriginalHashedItem(item, itemHasher, originalHashedItem); // has to be called AFTER all modifications - override updateItemDataComponentsToClient instead of this method if needed
         return item;
     }
 
@@ -141,8 +148,8 @@ public Item handleItemToServer(final UserConnection connection, final Item item)
             }
         }
 
-        updateItemDataComponents(connection, item, false);
-        restoreBackupData(item);
+        restoreBackupData(item); // Restore first, then update the remaining
+        handleItemDataComponentsToServer(connection, item, dataContainer);
         return item;
     }
 

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java

@@ -360,8 +360,8 @@ private static int colorId(final String color) {
         super.handleItemToClient(connection, item);
 
         // Text components since we skip the usual rewrite method
-        updateComponent(connection, item, StructuredDataKey.ITEM_NAME, "item_name");
-        updateComponent(connection, item, StructuredDataKey.CUSTOM_NAME, "custom_name");
+        updateTextComponent(connection, item, StructuredDataKey.ITEM_NAME, "item_name");
+        updateTextComponent(connection, item, StructuredDataKey.CUSTOM_NAME, "custom_name");
         final Tag[] lore = data.get(StructuredDataKey.LORE);
         if (lore != null) {
             for (final Tag tag : lore) {
@@ -391,9 +391,13 @@ private static int colorId(final String color) {
         return oldItem;
     }
 
+    // Items and data within components are handled in this protocol
     @Override
-    protected void updateItemDataComponents(final UserConnection connection, final Item item, final boolean clientbound) {
-        // Items and data within components are handled in this protocol
+    protected void handleItemDataComponentsToClient(final UserConnection connection, final Item item, final StructuredDataContainer container) {
+    }
+
+    @Override
+    protected void handleItemDataComponentsToServer(final UserConnection connection, final Item item, final StructuredDataContainer container) {
     }
 
     @Override