Make parts of item data component rewriting more generic via an interface

Author: kennytv

api/src/main/java/com/viaversion/viaversion/api/minecraft/Holder.java

@@ -23,6 +23,7 @@
 package com.viaversion.viaversion.api.minecraft;
 
 import it.unimi.dsi.fastutil.ints.Int2IntFunction;
+import java.util.function.Function;
 
 public interface Holder<T> {
 
@@ -89,4 +90,12 @@ static <T> Holder<T> of(final T value) {
      * @return a new holder with the id rewritten, or self
      */
     Holder<T> updateId(final Int2IntFunction rewriteFunction);
+
+    /**
+     * Returns a new holder with the value rewritten using the given function, or self if this is an id holder or the value did not change.
+     *
+     * @param rewriteFunction the function to rewrite the value
+     * @return a new holder with the value rewritten, or self
+     */
+    Holder<T> updateValue(final Function<T, T> rewriteFunction);
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/IdHolder.java

@@ -24,6 +24,7 @@
 
 import com.google.common.base.Preconditions;
 import it.unimi.dsi.fastutil.ints.Int2IntFunction;
+import java.util.function.Function;
 
 record IdHolder<T>(int id) implements Holder<T> {
 
@@ -57,4 +58,9 @@ public Holder<T> updateId(final Int2IntFunction rewriteFunction) {
         }
         return Holder.of(rewrittenId);
     }
+
+    @Override
+    public Holder<T> updateValue(final Function<T, T> rewriteFunction) {
+        return this;
+    }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/ValueHolder.java

@@ -23,6 +23,7 @@
 package com.viaversion.viaversion.api.minecraft;
 
 import it.unimi.dsi.fastutil.ints.Int2IntFunction;
+import java.util.function.Function;
 
 record ValueHolder<T>(T value) implements Holder<T> {
 
@@ -45,4 +46,10 @@ public int id() {
     public Holder<T> updateId(final Int2IntFunction rewriteFunction) {
         return this;
     }
+
+    @Override
+    public Holder<T> updateValue(final Function<T, T> rewriteFunction) {
+        final T rewrittenValue = rewriteFunction.apply(value);
+        return rewrittenValue != value ? Holder.of(rewrittenValue) : this;
+    }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/AdventureModePredicate.java

@@ -22,14 +22,17 @@
  */
 package com.viaversion.viaversion.api.minecraft.item.data;
 
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.data.StructuredData;
+import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.ArrayType;
 import com.viaversion.viaversion.util.Copyable;
+import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
-import it.unimi.dsi.fastutil.ints.Int2IntFunction;
 
-public record AdventureModePredicate(BlockPredicate[] predicates, boolean showInTooltip) implements Copyable {
+public record AdventureModePredicate(BlockPredicate[] predicates,
+                                     boolean showInTooltip) implements Copyable, Rewritable {
 
     public AdventureModePredicate(final BlockPredicate[] predicates) {
         this(predicates, true);
@@ -70,10 +73,11 @@ public void write(final ByteBuf buffer, final AdventureModePredicate value) {
         }
     }
 
-    public AdventureModePredicate rewrite(final Int2IntFunction blockIdRewriter) {
+    @Override
+    public AdventureModePredicate rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
         final BlockPredicate[] predicates = new BlockPredicate[this.predicates.length];
         for (int i = 0; i < predicates.length; i++) {
-            predicates[i] = this.predicates[i].rewrite(blockIdRewriter);
+            predicates[i] = this.predicates[i].rewrite(connection, protocol, clientbound);
         }
         return new AdventureModePredicate(predicates, showInTooltip);
     }

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrim.java

@@ -22,12 +22,15 @@
  */
 package com.viaversion.viaversion.api.minecraft.item.data;
 
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Holder;
+import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
-import it.unimi.dsi.fastutil.ints.Int2IntFunction;
 
-public record ArmorTrim(Holder<ArmorTrimMaterial> material, Holder<ArmorTrimPattern> pattern, boolean showInTooltip) {
+public record ArmorTrim(Holder<ArmorTrimMaterial> material, Holder<ArmorTrimPattern> pattern,
+                        boolean showInTooltip) implements Rewritable {
 
     public ArmorTrim(Holder<ArmorTrimMaterial> material, Holder<ArmorTrimPattern> pattern) {
         this(material, pattern, true);
@@ -96,15 +99,16 @@ public void write(final ByteBuf buffer, final ArmorTrim value) {
         }
     };
 
-    public ArmorTrim rewrite(final Int2IntFunction idRewriteFunction) {
+    @Override
+    public ArmorTrim rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
         Holder<ArmorTrimMaterial> material = this.material;
         if (material.isDirect()) {
-            material = Holder.of(material.value().rewrite(idRewriteFunction));
+            material = Holder.of(material.value().rewrite(connection, protocol, clientbound));
         }
 
         Holder<ArmorTrimPattern> pattern = this.pattern;
         if (pattern.isDirect()) {
-            pattern = Holder.of(pattern.value().rewrite(idRewriteFunction));
+            pattern = Holder.of(pattern.value().rewrite(connection, protocol, clientbound));
         }
         return new ArmorTrim(material, pattern, showInTooltip);
     }

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrimMaterial.java

@@ -23,16 +23,19 @@
 package com.viaversion.viaversion.api.minecraft.item.data;
 
 import com.viaversion.nbt.tag.Tag;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.misc.HolderType;
 import com.viaversion.viaversion.util.Copyable;
+import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
-import it.unimi.dsi.fastutil.ints.Int2IntFunction;
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
 import java.util.Map;
 
 public record ArmorTrimMaterial(String assetName, int itemId, float itemModelIndex,
-                                Map<String, String> overrideArmorMaterials, Tag description) implements Copyable {
+                                Map<String, String> overrideArmorMaterials,
+                                Tag description) implements Copyable, Rewritable {
 
     public ArmorTrimMaterial(final String assetName, final int itemId, final Map<String, String> overrideArmorMaterials, final Tag description) {
         this(assetName, itemId, 0F, overrideArmorMaterials, description);
@@ -175,8 +178,9 @@ public void writeDirect(final ByteBuf buffer, final ArmorTrimMaterial value) {
         }
     };
 
-    public ArmorTrimMaterial rewrite(final Int2IntFunction idRewriteFunction) {
-        return new ArmorTrimMaterial(assetName, idRewriteFunction.applyAsInt(itemId), itemModelIndex, overrideArmorMaterials, description);
+    @Override
+    public ArmorTrimMaterial rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
+        return new ArmorTrimMaterial(assetName, Rewritable.rewriteItem(protocol, clientbound, itemId), itemModelIndex, overrideArmorMaterials, description);
     }
 
     @Override

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrimPattern.java

@@ -23,13 +23,15 @@
 package com.viaversion.viaversion.api.minecraft.item.data;
 
 import com.viaversion.nbt.tag.Tag;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.misc.HolderType;
 import com.viaversion.viaversion.util.Copyable;
+import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
-import it.unimi.dsi.fastutil.ints.Int2IntFunction;
 
-public record ArmorTrimPattern(String assetName, int itemId, Tag description, boolean decal) implements Copyable {
+public record ArmorTrimPattern(String assetName, int itemId, Tag description, boolean decal) implements Copyable, Rewritable {
 
     public ArmorTrimPattern(final String assetName, final Tag description, final boolean decal) {
         this(assetName, 0, description, decal);
@@ -70,8 +72,9 @@ public void writeDirect(final ByteBuf buffer, final ArmorTrimPattern value) {
         }
     };
 
-    public ArmorTrimPattern rewrite(final Int2IntFunction idRewriteFunction) {
-        return new ArmorTrimPattern(assetName, idRewriteFunction.applyAsInt(itemId), description, decal);
+    @Override
+    public ArmorTrimPattern rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
+        return new ArmorTrimPattern(assetName, Rewritable.rewriteItem(protocol, clientbound, itemId), description, decal);
     }
 
     @Override

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/BlockPredicate.java

@@ -23,20 +23,23 @@
 package com.viaversion.viaversion.api.minecraft.item.data;
 
 import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.HolderSet;
 import com.viaversion.viaversion.api.minecraft.data.StructuredData;
 import com.viaversion.viaversion.api.minecraft.data.predicate.DataComponentMatchers;
 import com.viaversion.viaversion.api.minecraft.data.predicate.DataComponentMatchers.DataComponentMatchersType;
+import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.ArrayType;
 import com.viaversion.viaversion.util.Copyable;
+import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
-import it.unimi.dsi.fastutil.ints.Int2IntFunction;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public record BlockPredicate(@Nullable HolderSet holderSet, StatePropertyMatcher @Nullable [] propertyMatchers,
-                             @Nullable CompoundTag tag, DataComponentMatchers dataMatchers) implements Copyable {
+                             @Nullable CompoundTag tag,
+                             DataComponentMatchers dataMatchers) implements Copyable, Rewritable {
 
     public BlockPredicate(@Nullable final HolderSet holderSet, final StatePropertyMatcher @Nullable [] propertyMatchers, @Nullable final CompoundTag tag) {
         this(holderSet, propertyMatchers, tag, null);
@@ -96,12 +99,13 @@ public void write(final ByteBuf buffer, final BlockPredicate value) {
         }
     }
 
-    public BlockPredicate rewrite(final Int2IntFunction blockIdRewriter) {
+    @Override
+    public BlockPredicate rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
         if (holderSet == null || holderSet.hasTagKey()) {
             return this;
         }
 
-        final HolderSet updatedHolders = holderSet.rewrite(blockIdRewriter);
+        final HolderSet updatedHolders = holderSet.rewrite(Rewritable.blockRewriteFunction(protocol, clientbound));
         return new BlockPredicate(updatedHolders, propertyMatchers, tag);
     }
 

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Consumable1_21_2.java

@@ -22,17 +22,20 @@
  */
 package com.viaversion.viaversion.api.minecraft.item.data;
 
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Holder;
 import com.viaversion.viaversion.api.minecraft.SoundEvent;
+import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.ArrayType;
 import com.viaversion.viaversion.util.Copyable;
+import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
-import it.unimi.dsi.fastutil.ints.Int2IntFunction;
 
 public record Consumable1_21_2(float consumeSeconds, int animationType, Holder<SoundEvent> sound,
-                               boolean hasConsumeParticles, ConsumeEffect<?>[] consumeEffects) implements Copyable {
+                               boolean hasConsumeParticles,
+                               ConsumeEffect<?>[] consumeEffects) implements Copyable, Rewritable {
 
     public static final Type<?>[] EFFECT_TYPES = {
         ApplyStatusEffects.TYPE,
@@ -111,8 +114,9 @@ public void write(final ByteBuf buffer, final ApplyStatusEffects value) {
         };
     }
 
-    public Consumable1_21_2 rewrite(final Int2IntFunction soundIdRewriteFunction) {
-        final Holder<SoundEvent> soundHolder = this.sound.updateId(soundIdRewriteFunction);
+    @Override
+    public Consumable1_21_2 rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
+        final Holder<SoundEvent> soundHolder = this.sound.updateId(Rewritable.soundRewriteFunction(protocol, clientbound));
         return soundHolder == this.sound ? this : new Consumable1_21_2(consumeSeconds, animationType, soundHolder, hasConsumeParticles, consumeEffects);
     }
 

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Equippable.java

@@ -22,18 +22,20 @@
  */
 package com.viaversion.viaversion.api.minecraft.item.data;
 
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Holder;
 import com.viaversion.viaversion.api.minecraft.HolderSet;
 import com.viaversion.viaversion.api.minecraft.SoundEvent;
+import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.util.Rewritable;
 import io.netty.buffer.ByteBuf;
-import it.unimi.dsi.fastutil.ints.Int2IntFunction;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public record Equippable(int equipmentSlot, Holder<SoundEvent> soundEvent, @Nullable String model,
                          @Nullable String cameraOverlay, @Nullable HolderSet allowedEntities, boolean dispensable,
-                         boolean swappable, boolean damageOnHurt, boolean equipOnInteract) {
+                         boolean swappable, boolean damageOnHurt, boolean equipOnInteract) implements Rewritable {
 
     public Equippable(final int equipmentSlot, final Holder<SoundEvent> soundEvent, @Nullable final String model, @Nullable final String cameraOverlay,
                       @Nullable final HolderSet allowedEntities, final boolean dispensable, final boolean swappable, final boolean damageOnHurt) {
@@ -95,8 +97,9 @@ public void write(final ByteBuf buffer, final Equippable value) {
         }
     };
 
-    public Equippable rewrite(final Int2IntFunction soundIdRewriter) {
-        final Holder<SoundEvent> soundEvent = this.soundEvent.updateId(soundIdRewriter);
+    @Override
+    public Equippable rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
+        final Holder<SoundEvent> soundEvent = this.soundEvent.updateId(Rewritable.soundRewriteFunction(protocol, clientbound));
         return soundEvent == this.soundEvent ? this : new Equippable(equipmentSlot, soundEvent, model, cameraOverlay, allowedEntities, dispensable, swappable, damageOnHurt, equipOnInteract);
     }
 }