From 7a7d2f1fa1ccba7da6e92b91702231ef904d221c Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Tue, 19 Mar 2024 13:19:55 +0100 Subject: [PATCH] Handle lore and name in StructuredItemRewriter --- .../viabackwards/api/data/MappedItem.java | 11 +++- ...writer.java => BackwardsItemRewriter.java} | 12 ++-- ...se.java => BackwardsItemRewriterBase.java} | 6 +- .../BackwardsStructuredItemRewriter.java | 56 +++++++++++++++++-- .../api/rewriters/EnchantmentRewriter.java | 7 +-- .../rewriters/LegacyBlockItemRewriter.java | 2 +- .../packets/BlockItemPackets1_13.java | 3 +- .../packets/BlockItemPackets1_14.java | 4 +- .../packets/BlockItemPackets1_15.java | 3 +- .../packets/BlockItemPackets1_16.java | 3 +- .../packets/BlockItemPackets1_16_2.java | 3 +- .../packets/BlockItemPackets1_17.java | 4 +- .../packets/BlockItemPackets1_18.java | 4 +- .../packets/BlockItemPackets1_19.java | 4 +- .../packets/BlockItemPackets1_19_3.java | 4 +- .../packets/BlockItemPackets1_19_4.java | 4 +- .../packets/BlockItemPackets1_20.java | 4 +- .../BlockItemPacketRewriter1_20_3.java | 4 +- .../Protocol1_20_3To1_20_5.java | 1 + .../BlockItemPacketRewriter1_20_2.java | 4 +- 20 files changed, 100 insertions(+), 43 deletions(-) rename common/src/main/java/com/viaversion/viabackwards/api/rewriters/{ItemRewriter.java => BackwardsItemRewriter.java} (94%) rename common/src/main/java/com/viaversion/viabackwards/api/rewriters/{ItemRewriterBase.java => BackwardsItemRewriterBase.java} (90%) diff --git a/common/src/main/java/com/viaversion/viabackwards/api/data/MappedItem.java b/common/src/main/java/com/viaversion/viabackwards/api/data/MappedItem.java index b4ba59cc..7497a20e 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/data/MappedItem.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/data/MappedItem.java @@ -17,6 +17,7 @@ */ package com.viaversion.viabackwards.api.data; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import com.viaversion.viaversion.util.ComponentUtil; import org.checkerframework.checker.nullness.qual.Nullable; @@ -24,6 +25,7 @@ public class MappedItem { private final int id; private final String jsonName; + private final Tag tagName; private final Integer customModelData; public MappedItem(final int id, final String name) { @@ -33,17 +35,22 @@ public class MappedItem { public MappedItem(final int id, final String name, @Nullable final Integer customModelData) { this.id = id; this.jsonName = ComponentUtil.legacyToJsonString("§f" + name, true); + this.tagName = ComponentUtil.jsonStringToTag(jsonName); this.customModelData = customModelData; } - public int getId() { + public int id() { return id; } - public String getJsonName() { + public String jsonName() { return jsonName; } + public Tag tagName() { + return tagName; + } + public @Nullable Integer customModelData() { return customModelData; } diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/ItemRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsItemRewriter.java similarity index 94% rename from common/src/main/java/com/viaversion/viabackwards/api/rewriters/ItemRewriter.java rename to common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsItemRewriter.java index fd80f6f5..f74f2637 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/ItemRewriter.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsItemRewriter.java @@ -34,14 +34,14 @@ import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import org.checkerframework.checker.nullness.qual.Nullable; -public class ItemRewriter> extends ItemRewriterBase { +public class BackwardsItemRewriter> extends BackwardsItemRewriterBase { - public ItemRewriter(T protocol, Type itemType, Type itemArrayType) { + public BackwardsItemRewriter(T protocol, Type itemType, Type itemArrayType) { super(protocol, itemType, itemArrayType, true); } - public ItemRewriter(T protocol, Type itemType, Type itemArrayType, Type mappedItemType, Type mappedItemArrayType) { + public BackwardsItemRewriter(T protocol, Type itemType, Type itemArrayType, Type mappedItemType, Type mappedItemArrayType) { super(protocol, itemType, itemArrayType, mappedItemType, mappedItemArrayType, true); } @@ -92,7 +92,7 @@ public class ItemRewriter> extends ItemRewriter { protected final boolean jsonNameFormat; - protected ItemRewriterBase(T protocol, Type itemType, Type itemArrayType, Type mappedItemType, Type mappedItemArrayType, boolean jsonFormat) { + protected BackwardsItemRewriterBase(T protocol, Type itemType, Type itemArrayType, Type mappedItemType, Type mappedItemArrayType, boolean jsonFormat) { super(protocol, itemType, itemArrayType, mappedItemType, mappedItemArrayType); this.jsonNameFormat = jsonFormat; } - protected ItemRewriterBase(T protocol, Type itemType, Type itemArrayType, boolean jsonNameFormat) { + protected BackwardsItemRewriterBase(T protocol, Type itemType, Type itemArrayType, boolean jsonNameFormat) { this(protocol, itemType, itemArrayType, itemType, itemArrayType, jsonNameFormat); } diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsStructuredItemRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsStructuredItemRewriter.java index af69372b..80eac348 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsStructuredItemRewriter.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsStructuredItemRewriter.java @@ -34,7 +34,7 @@ import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import org.checkerframework.checker.nullness.qual.Nullable; public class BackwardsStructuredItemRewriter> extends ItemRewriter { + T extends BackwardsProtocol> extends BackwardsItemRewriter { public BackwardsStructuredItemRewriter(final T protocol, final Type itemType, final Type itemArrayType) { super(protocol, itemType, itemArrayType); @@ -53,7 +53,24 @@ public class BackwardsStructuredItemRewriter customNameData = data.getNonEmpty(StructuredDataKey.CUSTOM_NAME); + if (customNameData != null) { + final Tag originalName = customNameData.value().copy(); + protocol.getTranslatableRewriter().processTag(customNameData.value()); + if (!customNameData.value().equals(originalName)) { + saveTag(createCustomTag(item), originalName, "Name"); + } + } + + final StructuredData loreData = data.getNonEmpty(StructuredDataKey.LORE); + if (loreData != null) { + for (final Tag tag : loreData.value()) { + protocol.getTranslatableRewriter().processTag(tag); + } + } + } final BackwardsMappings mappingData = protocol.getMappingData(); final MappedItem mappedItem = mappingData != null ? mappingData.getMappedItem(item.identifier()) : null; @@ -68,14 +85,18 @@ public class BackwardsStructuredItemRewriter customData = data.getNonEmpty(StructuredDataKey.CUSTOM_DATA); + if (customData == null) { + return; + } + + // Remove custom name + if (customData.value().remove(nbtTagName + "|customName") != null) { + data.remove(StructuredDataKey.CUSTOM_NAME); + } else { + final Tag name = removeBackupTag(customData.value(), "Name"); + if (name != null) { + data.set(StructuredDataKey.CUSTOM_NAME, name); + } + } + } + + protected void saveTag(CompoundTag customData, Tag tag, String name) { + String backupName = nbtTagName + "|o" + name; + if (!customData.contains(backupName)) { + customData.put(backupName, tag); + } + } + + protected @Nullable Tag removeBackupTag(CompoundTag customData, String tagName) { + return customData.remove(nbtTagName + "|o" + tagName); } } diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EnchantmentRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EnchantmentRewriter.java index 7d0c0ec0..4d073721 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EnchantmentRewriter.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EnchantmentRewriter.java @@ -22,7 +22,6 @@ import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag; import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; -import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import com.viaversion.viaversion.util.ComponentUtil; import java.util.ArrayList; import java.util.HashMap; @@ -36,15 +35,15 @@ import java.util.Map; public class EnchantmentRewriter { private final Map enchantmentMappings = new HashMap<>(); - private final ItemRewriter itemRewriter; + private final BackwardsItemRewriter itemRewriter; private final boolean jsonFormat; - public EnchantmentRewriter(ItemRewriter itemRewriter, boolean jsonFormat) { + public EnchantmentRewriter(BackwardsItemRewriter itemRewriter, boolean jsonFormat) { this.itemRewriter = itemRewriter; this.jsonFormat = jsonFormat; } - public EnchantmentRewriter(ItemRewriter itemRewriter) { + public EnchantmentRewriter(BackwardsItemRewriter itemRewriter) { this(itemRewriter, true); } diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyBlockItemRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyBlockItemRewriter.java index a43fb212..f63b0aaa 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyBlockItemRewriter.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyBlockItemRewriter.java @@ -54,7 +54,7 @@ import java.util.Optional; import org.checkerframework.checker.nullness.qual.Nullable; public abstract class LegacyBlockItemRewriter> extends ItemRewriterBase { + T extends BackwardsProtocol> extends BackwardsItemRewriterBase { protected final Int2ObjectMap replacementData = new Int2ObjectOpenHashMap<>(8); // Raw id -> mapped data diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java index 3427f269..1a0f656b 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java @@ -20,6 +20,7 @@ package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.packets; import com.google.common.primitives.Ints; import com.viaversion.viabackwards.ViaBackwards; +import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter; import com.viaversion.viabackwards.api.rewriters.EnchantmentRewriter; import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.Protocol1_12_2To1_13; import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers.FlowerPotHandler; @@ -65,7 +66,7 @@ import java.util.Locale; import java.util.Map; import java.util.Optional; -public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewriters.ItemRewriter { +public class BlockItemPackets1_13 extends BackwardsItemRewriter { private final Map enchantmentMappings = new HashMap<>(); private final String extraNbtTag; diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java index f234df8c..89189fa8 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java @@ -19,6 +19,7 @@ package com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.packets; import com.google.common.collect.ImmutableSet; import com.viaversion.viabackwards.ViaBackwards; +import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter; import com.viaversion.viabackwards.api.rewriters.EnchantmentRewriter; import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.Protocol1_13_2To1_14; import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage.ChunkLightStorage; @@ -46,7 +47,6 @@ import com.viaversion.viaversion.libs.gson.JsonObject; import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; -import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13; import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; @@ -59,7 +59,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewriters.ItemRewriter { +public class BlockItemPackets1_14 extends BackwardsItemRewriter { private EnchantmentRewriter enchantmentRewriter; diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java index 5bbcc761..8646d67b 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java @@ -17,6 +17,7 @@ */ package com.viaversion.viabackwards.protocol.protocol1_14_4to1_15.packets; +import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter; import com.viaversion.viabackwards.protocol.protocol1_14_4to1_15.Protocol1_14_4To1_15; import com.viaversion.viaversion.api.minecraft.chunks.Chunk; import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection; @@ -32,7 +33,7 @@ import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPacke import com.viaversion.viaversion.rewriter.BlockRewriter; import com.viaversion.viaversion.rewriter.RecipeRewriter; -public class BlockItemPackets1_15 extends com.viaversion.viabackwards.api.rewriters.ItemRewriter { +public class BlockItemPackets1_15 extends BackwardsItemRewriter { public BlockItemPackets1_15(Protocol1_14_4To1_15 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_SHORT_ARRAY); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java index fc6831d9..3604f634 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java @@ -18,6 +18,7 @@ package com.viaversion.viabackwards.protocol.protocol1_15_2to1_16.packets; import com.viaversion.viabackwards.ViaBackwards; +import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter; import com.viaversion.viabackwards.api.rewriters.EnchantmentRewriter; import com.viaversion.viabackwards.api.rewriters.MapColorRewriter; import com.viaversion.viabackwards.protocol.protocol1_15_2to1_16.Protocol1_15_2To1_16; @@ -55,7 +56,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewriters.ItemRewriter { +public class BlockItemPackets1_16 extends BackwardsItemRewriter { private EnchantmentRewriter enchantmentRewriter; diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java index a4812623..d6df97b3 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java @@ -17,6 +17,7 @@ */ package com.viaversion.viabackwards.protocol.protocol1_16_1to1_16_2.packets; +import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter; import com.viaversion.viabackwards.protocol.protocol1_16_1to1_16_2.Protocol1_16_1To1_16_2; import com.viaversion.viaversion.api.minecraft.BlockChangeRecord; import com.viaversion.viaversion.api.minecraft.BlockChangeRecord1_8; @@ -37,7 +38,7 @@ import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ServerboundPacke import com.viaversion.viaversion.rewriter.BlockRewriter; import com.viaversion.viaversion.rewriter.RecipeRewriter; -public class BlockItemPackets1_16_2 extends com.viaversion.viabackwards.api.rewriters.ItemRewriter { +public class BlockItemPackets1_16_2 extends BackwardsItemRewriter { public BlockItemPackets1_16_2(Protocol1_16_1To1_16_2 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_SHORT_ARRAY); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java index 80a20948..a0ddad19 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java @@ -18,7 +18,7 @@ package com.viaversion.viabackwards.protocol.protocol1_16_4to1_17.packets; import com.viaversion.viabackwards.ViaBackwards; -import com.viaversion.viabackwards.api.rewriters.ItemRewriter; +import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter; import com.viaversion.viabackwards.api.rewriters.MapColorRewriter; import com.viaversion.viabackwards.protocol.protocol1_16_4to1_17.Protocol1_16_4To1_17; import com.viaversion.viabackwards.protocol.protocol1_16_4to1_17.data.MapColorRewrites; @@ -53,7 +53,7 @@ import java.util.Arrays; import java.util.BitSet; import java.util.List; -public final class BlockItemPackets1_17 extends ItemRewriter { +public final class BlockItemPackets1_17 extends BackwardsItemRewriter { public BlockItemPackets1_17(Protocol1_16_4To1_17 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_SHORT_ARRAY); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java index 6287e81f..a51e84ed 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java @@ -17,7 +17,7 @@ */ package com.viaversion.viabackwards.protocol.protocol1_17_1to1_18.packets; -import com.viaversion.viabackwards.api.rewriters.ItemRewriter; +import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter; import com.viaversion.viabackwards.protocol.protocol1_17_1to1_18.Protocol1_17_1To1_18; import com.viaversion.viabackwards.protocol.protocol1_17_1to1_18.data.BlockEntityIds; import com.viaversion.viaversion.api.data.ParticleMappings; @@ -45,7 +45,7 @@ import java.util.ArrayList; import java.util.BitSet; import java.util.List; -public final class BlockItemPackets1_18 extends ItemRewriter { +public final class BlockItemPackets1_18 extends BackwardsItemRewriter { public BlockItemPackets1_18(final Protocol1_17_1To1_18 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_ARRAY); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/BlockItemPackets1_19.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/BlockItemPackets1_19.java index 4483c1a2..a413a597 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/BlockItemPackets1_19.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/BlockItemPackets1_19.java @@ -17,7 +17,7 @@ */ package com.viaversion.viabackwards.protocol.protocol1_18_2to1_19.packets; -import com.viaversion.viabackwards.api.rewriters.ItemRewriter; +import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter; import com.viaversion.viabackwards.protocol.protocol1_18_2to1_19.Protocol1_18_2To1_19; import com.viaversion.viaversion.api.data.ParticleMappings; import com.viaversion.viaversion.api.data.entity.EntityTracker; @@ -36,7 +36,7 @@ import com.viaversion.viaversion.rewriter.BlockRewriter; import com.viaversion.viaversion.rewriter.RecipeRewriter; import com.viaversion.viaversion.util.MathUtil; -public final class BlockItemPackets1_19 extends ItemRewriter { +public final class BlockItemPackets1_19 extends BackwardsItemRewriter { public BlockItemPackets1_19(final Protocol1_18_2To1_19 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_ARRAY); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/packets/BlockItemPackets1_19_3.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/packets/BlockItemPackets1_19_3.java index 6b46c46a..0f71a927 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/packets/BlockItemPackets1_19_3.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/packets/BlockItemPackets1_19_3.java @@ -17,7 +17,7 @@ */ package com.viaversion.viabackwards.protocol.protocol1_19_1to1_19_3.packets; -import com.viaversion.viabackwards.api.rewriters.ItemRewriter; +import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter; import com.viaversion.viabackwards.protocol.protocol1_19_1to1_19_3.Protocol1_19_1To1_19_3; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; @@ -29,7 +29,7 @@ import com.viaversion.viaversion.rewriter.BlockRewriter; import com.viaversion.viaversion.rewriter.RecipeRewriter; import com.viaversion.viaversion.util.Key; -public final class BlockItemPackets1_19_3 extends ItemRewriter { +public final class BlockItemPackets1_19_3 extends BackwardsItemRewriter { public BlockItemPackets1_19_3(final Protocol1_19_1To1_19_3 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_ARRAY); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/BlockItemPackets1_19_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/BlockItemPackets1_19_4.java index eb8b53ab..94eb562e 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/BlockItemPackets1_19_4.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/BlockItemPackets1_19_4.java @@ -17,7 +17,7 @@ */ package com.viaversion.viabackwards.protocol.protocol1_19_3to1_19_4.packets; -import com.viaversion.viabackwards.api.rewriters.ItemRewriter; +import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter; import com.viaversion.viabackwards.protocol.protocol1_19_3to1_19_4.Protocol1_19_3To1_19_4; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; @@ -29,7 +29,7 @@ import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPac import com.viaversion.viaversion.rewriter.BlockRewriter; import com.viaversion.viaversion.util.Key; -public final class BlockItemPackets1_19_4 extends ItemRewriter { +public final class BlockItemPackets1_19_4 extends BackwardsItemRewriter { public BlockItemPackets1_19_4(final Protocol1_19_3To1_19_4 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_ARRAY); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_4to1_20/packets/BlockItemPackets1_20.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_4to1_20/packets/BlockItemPackets1_20.java index e0459463..b8962dd5 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_4to1_20/packets/BlockItemPackets1_20.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_4to1_20/packets/BlockItemPackets1_20.java @@ -17,7 +17,7 @@ */ package com.viaversion.viabackwards.protocol.protocol1_19_4to1_20.packets; -import com.viaversion.viabackwards.api.rewriters.ItemRewriter; +import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter; import com.viaversion.viabackwards.protocol.protocol1_19_4to1_20.Protocol1_19_4To1_20; import com.viaversion.viabackwards.protocol.protocol1_19_4to1_20.storage.BackSignEditStorage; import com.viaversion.viaversion.api.minecraft.BlockChangeRecord; @@ -41,7 +41,7 @@ import java.util.HashSet; import java.util.Set; import org.checkerframework.checker.nullness.qual.Nullable; -public final class BlockItemPackets1_20 extends ItemRewriter { +public final class BlockItemPackets1_20 extends BackwardsItemRewriter { private static final Set NEW_TRIM_PATTERNS = new HashSet<>(Arrays.asList("host", "raiser", "shaper", "silence", "wayfinder")); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/rewriter/BlockItemPacketRewriter1_20_3.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/rewriter/BlockItemPacketRewriter1_20_3.java index 74dccf19..be0b3d67 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/rewriter/BlockItemPacketRewriter1_20_3.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/rewriter/BlockItemPacketRewriter1_20_3.java @@ -18,7 +18,7 @@ package com.viaversion.viabackwards.protocol.protocol1_20_2to1_20_3.rewriter; import com.viaversion.viabackwards.ViaBackwards; -import com.viaversion.viabackwards.api.rewriters.ItemRewriter; +import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter; import com.viaversion.viabackwards.protocol.protocol1_20_2to1_20_3.Protocol1_20_2To1_20_3; import com.viaversion.viaversion.api.data.ParticleMappings; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; @@ -33,7 +33,7 @@ import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.Clientb import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.rewriter.RecipeRewriter1_20_3; import com.viaversion.viaversion.rewriter.BlockRewriter; -public final class BlockItemPacketRewriter1_20_3 extends ItemRewriter { +public final class BlockItemPacketRewriter1_20_3 extends BackwardsItemRewriter { public BlockItemPacketRewriter1_20_3(final Protocol1_20_2To1_20_3 protocol) { super(protocol, Type.ITEM1_20_2, Type.ITEM1_20_2_ARRAY); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_3to1_20_5/Protocol1_20_3To1_20_5.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_3to1_20_5/Protocol1_20_3To1_20_5.java index 798d0127..6617f253 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_3to1_20_5/Protocol1_20_3To1_20_5.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_3to1_20_5/Protocol1_20_3To1_20_5.java @@ -76,6 +76,7 @@ public final class Protocol1_20_3To1_20_5 extends BackwardsProtocol tagRewriter = new TagRewriter<>(this); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20to1_20_2/rewriter/BlockItemPacketRewriter1_20_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20to1_20_2/rewriter/BlockItemPacketRewriter1_20_2.java index dcd1f78d..107fd9c2 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20to1_20_2/rewriter/BlockItemPacketRewriter1_20_2.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20to1_20_2/rewriter/BlockItemPacketRewriter1_20_2.java @@ -17,7 +17,7 @@ */ package com.viaversion.viabackwards.protocol.protocol1_20to1_20_2.rewriter; -import com.viaversion.viabackwards.api.rewriters.ItemRewriter; +import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter; import com.viaversion.viabackwards.protocol.protocol1_20to1_20_2.Protocol1_20To1_20_2; import com.viaversion.viaversion.api.data.ParticleMappings; import com.viaversion.viaversion.api.data.entity.EntityTracker; @@ -46,7 +46,7 @@ import com.viaversion.viaversion.util.Key; import com.viaversion.viaversion.util.MathUtil; import org.checkerframework.checker.nullness.qual.Nullable; -public final class BlockItemPacketRewriter1_20_2 extends ItemRewriter { +public final class BlockItemPacketRewriter1_20_2 extends BackwardsItemRewriter { public BlockItemPacketRewriter1_20_2(final Protocol1_20To1_20_2 protocol) { super(protocol, Type.ITEM1_20_2, Type.ITEM1_20_2_ARRAY);