diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsItemRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsItemRewriter.java index 35b4a34e..6b775d16 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsItemRewriter.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsItemRewriter.java @@ -19,6 +19,7 @@ package com.viaversion.viabackwards.api.rewriters; import com.viaversion.viabackwards.api.BackwardsProtocol; import com.viaversion.viabackwards.api.data.MappedItem; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; @@ -46,7 +47,7 @@ public class BackwardsItemRewriter translatableRewriter = protocol.getTranslatableRewriter(); if (translatableRewriter != null) { - translatableRewriter.processText(title); - translatableRewriter.processText(description); + translatableRewriter.processText(wrapper.user(), title); + translatableRewriter.processText(wrapper.user(), description); } - final Item icon = handleItemToClient(wrapper.read(itemType())); + final Item icon = handleItemToClient(wrapper.user(), wrapper.read(itemType())); wrapper.write(mappedItemType(), icon); wrapper.passthrough(Type.VAR_INT); // Frame type @@ -186,11 +187,11 @@ public class BackwardsItemRewriter translatableRewriter = protocol.getTranslatableRewriter(); if (translatableRewriter != null) { - translatableRewriter.processTag(title); - translatableRewriter.processTag(description); + translatableRewriter.processTag(wrapper.user(), title); + translatableRewriter.processTag(wrapper.user(), description); } - final Item icon = handleItemToClient(wrapper.read(itemType())); + final Item icon = handleItemToClient(wrapper.user(), wrapper.read(itemType())); wrapper.write(mappedItemType(), icon); wrapper.passthrough(Type.VAR_INT); // Frame type diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsItemRewriterBase.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsItemRewriterBase.java index 81f8e689..258b29dc 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsItemRewriterBase.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsItemRewriterBase.java @@ -18,6 +18,7 @@ package com.viaversion.viabackwards.api.rewriters; import com.viaversion.viabackwards.api.BackwardsProtocol; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; @@ -46,9 +47,9 @@ public abstract class BackwardsItemRewriterBase customNameData = data.getNonEmpty(StructuredDataKey.CUSTOM_NAME); if (customNameData != null) { final Tag originalName = customNameData.value().copy(); - protocol.getTranslatableRewriter().processTag(customNameData.value()); + protocol.getTranslatableRewriter().processTag(connection, customNameData.value()); if (!customNameData.value().equals(originalName)) { saveTag(createCustomTag(item), originalName, "Name"); } @@ -73,7 +74,7 @@ public class BackwardsStructuredItemRewriter loreData = data.getNonEmpty(StructuredDataKey.LORE); if (loreData != null) { for (final Tag tag : loreData.value()) { - protocol.getTranslatableRewriter().processTag(tag); + protocol.getTranslatableRewriter().processTag(connection, tag); } } } @@ -107,7 +108,7 @@ public class BackwardsStructuredItemRewriter { MetaType type = meta.metaType(); if (type == itemType) { - protocol.getItemRewriter().handleItemToClient(meta.value()); + protocol.getItemRewriter().handleItemToClient(event.user(), meta.value()); } else if (type == blockStateType) { int data = meta.value(); meta.setValue(protocol.getMappingData().getNewBlockStateId(data)); @@ -202,10 +202,10 @@ public abstract class EntityRewriterBase { MetaType type = meta.metaType(); if (type == itemType) { - meta.setValue(protocol.getItemRewriter().handleItemToClient(meta.value())); + meta.setValue(protocol.getItemRewriter().handleItemToClient(event.user(), meta.value())); } else if (type == blockStateType) { int data = meta.value(); meta.setValue(protocol.getMappingData().getNewBlockStateId(data)); @@ -232,14 +232,14 @@ public abstract class EntityRewriterBase handleItemToClient(wrapper.get(Type.ITEM1_8, 0))); + handler(wrapper -> handleItemToClient(wrapper.user(), wrapper.get(Type.ITEM1_8, 0))); // Handle Llama handler(wrapper -> { @@ -90,7 +90,7 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter { Item[] stacks = wrapper.get(Type.ITEM1_8_SHORT_ARRAY, 0); for (int i = 0; i < stacks.length; i++) - stacks[i] = handleItemToClient(stacks[i]); + stacks[i] = handleItemToClient(wrapper.user(), stacks[i]); if (isLlama(wrapper.user())) { Optional horse = getChestedHorse(wrapper.user()); @@ -123,12 +123,12 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter handleItemToServer(wrapper.get(Type.ITEM1_8, 0))); + handler(wrapper -> handleItemToServer(wrapper.user(), wrapper.get(Type.ITEM1_8, 0))); // Llama slot handler(wrapper -> { @@ -267,7 +267,7 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter { if (meta.metaType().type().equals(Type.ITEM1_8)) // Is Item - meta.setValue(handleItemToClient((Item) meta.getValue())); + meta.setValue(handleItemToClient(event.user(), (Item) meta.getValue())); }); } @@ -288,9 +288,9 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter= 0 && action <= 2) { JsonElement component = wrapper.read(Type.COMPONENT); - wrapper.write(Type.COMPONENT, Protocol1_9To1_8.fixJson(component.toString())); + wrapper.write(Type.COMPONENT, Protocol1_9To1_8.STRING_TO_JSON.transform(wrapper, component.toString())); } }); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java index 492a4082..34ac5d18 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java @@ -40,7 +40,11 @@ public class ShoulderTracker extends StoredObject { public void update() { PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_12.CHAT_MESSAGE, null, getUser()); - wrapper.write(Type.COMPONENT, Protocol1_9To1_8.fixJson(generateString())); + try { + wrapper.write(Type.COMPONENT, Protocol1_9To1_8.STRING_TO_JSON.transform(wrapper, generateString())); + } catch (final Exception e) { + throw new RuntimeException(e); + } wrapper.write(Type.BYTE, (byte) 2); try { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java index 345125b6..52be02b3 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java @@ -21,6 +21,7 @@ package com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.packets; import com.viaversion.viabackwards.api.rewriters.LegacyBlockItemRewriter; import com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.Protocol1_11_1To1_12; import com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.data.MapColorMapping; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockChangeRecord; import com.viaversion.viaversion.api.minecraft.ClientWorld; import com.viaversion.viaversion.api.minecraft.chunks.Chunk; @@ -99,12 +100,12 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter { if (meta.metaType().type().equals(Type.ITEM1_8)) // Is Item - meta.setValue(handleItemToClient((Item) meta.getValue())); + meta.setValue(handleItemToClient(event.user(), (Item) meta.getValue())); }); protocol.registerServerbound(ServerboundPackets1_9_3.CLIENT_STATUS, new PacketHandlers() { @@ -198,9 +199,9 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter { public static final ComponentRewriter COMPONENT_REWRITER = new ComponentRewriter(null, ComponentRewriter.ReadType.JSON) { @Override - public void processText(JsonElement element) { - super.processText(element); + public void processText(UserConnection connection, JsonElement element) { + super.processText(connection, element); if (element == null || !element.isJsonObject()) { return; } @@ -64,7 +65,7 @@ public class ChatPackets1_12 extends RewriterBase { protected void registerPackets() { protocol.registerClientbound(ClientboundPackets1_12.CHAT_MESSAGE, wrapper -> { JsonElement element = wrapper.passthrough(Type.COMPONENT); - COMPONENT_REWRITER.processText(element); + COMPONENT_REWRITER.processText(wrapper.user(), element); }); } } diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java index ddf0fbf4..3f750143 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java @@ -191,7 +191,7 @@ public class EntityPackets1_12 extends LegacyEntityRewriter { if (meta.metaType() == MetaType1_12.Chat) { - ChatPackets1_12.COMPONENT_REWRITER.processText((JsonElement) meta.getValue()); + ChatPackets1_12.COMPONENT_REWRITER.processText(event.user(), (JsonElement) meta.getValue()); } }); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java index 6b47c325..4d29d1de 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java @@ -21,6 +21,7 @@ package com.viaversion.viabackwards.protocol.protocol1_11to1_11_1.packets; import com.viaversion.viabackwards.api.rewriters.LegacyBlockItemRewriter; import com.viaversion.viabackwards.api.rewriters.LegacyEnchantmentRewriter; import com.viaversion.viabackwards.protocol.protocol1_11to1_11_1.Protocol1_11To1_11_1; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; @@ -53,12 +54,12 @@ public class ItemPackets1_11_1 extends LegacyBlockItemRewriter { if (meta.metaType().type().equals(Type.ITEM1_8)) { // Is Item - meta.setValue(handleItemToClient((Item) meta.getValue())); + meta.setValue(handleItemToClient(event.user(), (Item) meta.getValue())); } }); } @@ -88,18 +89,18 @@ public class ItemPackets1_11_1 extends LegacyBlockItemRewriter36) minecraft:item -> iconcrack 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 88f56c11..19d8ac00 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 @@ -261,7 +261,7 @@ public class BlockItemPackets1_13 extends BackwardsItemRewriter { final Item[] items = wrapper.get(Type.ITEM1_8_SHORT_ARRAY, 0); for (Item item : items) { - handleItemToClient(item); + handleItemToClient(wrapper.user(), item); } }); } @@ -274,7 +274,7 @@ public class BlockItemPackets1_13 extends BackwardsItemRewriter handleItemToClient(wrapper.get(Type.ITEM1_8, 0))); + handler(wrapper -> handleItemToClient(wrapper.user(), wrapper.get(Type.ITEM1_8, 0))); } }); @@ -444,7 +444,7 @@ public class BlockItemPackets1_13 extends BackwardsItemRewriter handleItemToClient(wrapper.get(Type.ITEM1_8, 0))); + handler(wrapper -> handleItemToClient(wrapper.user(), wrapper.get(Type.ITEM1_8, 0))); } }); @@ -472,7 +472,7 @@ public class BlockItemPackets1_13 extends BackwardsItemRewriter handleItemToServer(wrapper.get(Type.ITEM1_13, 0))); + handler(wrapper -> handleItemToServer(wrapper.user(), wrapper.get(Type.ITEM1_13, 0))); } }); @@ -486,7 +486,7 @@ public class BlockItemPackets1_13 extends BackwardsItemRewriter handleItemToServer(wrapper.get(Type.ITEM1_13, 0))); + handler(wrapper -> handleItemToServer(wrapper.user(), wrapper.get(Type.ITEM1_13, 0))); } }); } @@ -500,7 +500,7 @@ public class BlockItemPackets1_13 extends BackwardsItemRewriter { Particle particle = (Particle) meta.getValue(); - ParticleMapping.ParticleData data = ParticleMapping.getMapping(particle.getId()); + ParticleMapping.ParticleData data = ParticleMapping.getMapping(particle.id()); int firstArg = 0; int secondArg = 0; diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java index 25e379a0..8b0f0911 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java @@ -81,16 +81,16 @@ public class PlayerPacket1_13 extends RewriterBase { for (int i = 0; i < size; i++) { //Input Item Item input = wrapper.read(Type.ITEM1_13); - wrapper.write(Type.ITEM1_8, protocol.getItemRewriter().handleItemToClient(input)); + wrapper.write(Type.ITEM1_8, protocol.getItemRewriter().handleItemToClient(wrapper.user(), input)); //Output Item Item output = wrapper.read(Type.ITEM1_13); - wrapper.write(Type.ITEM1_8, protocol.getItemRewriter().handleItemToClient(output)); + wrapper.write(Type.ITEM1_8, protocol.getItemRewriter().handleItemToClient(wrapper.user(), output)); boolean secondItem = wrapper.passthrough(Type.BOOLEAN); //Has second item if (secondItem) { //Second Item Item second = wrapper.read(Type.ITEM1_13); - wrapper.write(Type.ITEM1_8, protocol.getItemRewriter().handleItemToClient(second)); + wrapper.write(Type.ITEM1_8, protocol.getItemRewriter().handleItemToClient(wrapper.user(), second)); } wrapper.passthrough(Type.BOOLEAN); //Trade disabled @@ -201,7 +201,7 @@ public class PlayerPacket1_13 extends RewriterBase { byte mode = wrapper.get(Type.BYTE, 0); if (mode == 0 || mode == 2) { JsonElement value = wrapper.read(Type.COMPONENT); - String legacyValue = protocol.jsonToLegacy(value); + String legacyValue = protocol.jsonToLegacy(wrapper.user(), value); wrapper.write(Type.STRING, ChatUtil.fromLegacy(legacyValue, 'f', 32)); int type = wrapper.read(Type.VAR_INT); wrapper.write(Type.STRING, type == 1 ? "hearts" : "integer"); @@ -219,7 +219,7 @@ public class PlayerPacket1_13 extends RewriterBase { byte action = wrapper.get(Type.BYTE, 0); if (action == 0 || action == 2) { JsonElement displayName = wrapper.read(Type.COMPONENT); - String legacyTextDisplayName = protocol.jsonToLegacy(displayName); + String legacyTextDisplayName = protocol.jsonToLegacy(wrapper.user(), displayName); wrapper.write(Type.STRING, ChatUtil.fromLegacy(legacyTextDisplayName, 'f', 32)); byte flags = wrapper.read(Type.BYTE); @@ -234,11 +234,11 @@ public class PlayerPacket1_13 extends RewriterBase { JsonElement prefixComponent = wrapper.read(Type.COMPONENT); JsonElement suffixComponent = wrapper.read(Type.COMPONENT); - String prefix = protocol.jsonToLegacy(prefixComponent); + String prefix = protocol.jsonToLegacy(wrapper.user(), prefixComponent); if (ViaBackwards.getConfig().addTeamColorTo1_13Prefix()) { prefix += "ยง" + (colour > -1 && colour <= 15 ? Integer.toHexString(colour) : "r"); } - String suffix = protocol.jsonToLegacy(suffixComponent); + String suffix = protocol.jsonToLegacy(wrapper.user(), suffixComponent); wrapper.write(Type.STRING, ChatUtil.fromLegacyPrefix(prefix, 'f', 16)); wrapper.write(Type.STRING, ChatUtil.fromLegacy(suffix, '\0', 16)); @@ -379,7 +379,7 @@ public class PlayerPacket1_13 extends RewriterBase { case "MC|BEdit": wrapper.setPacketType(ServerboundPackets1_13.EDIT_BOOK); Item book = wrapper.read(Type.ITEM1_8); - wrapper.write(Type.ITEM1_13, protocol.getItemRewriter().handleItemToServer(book)); + wrapper.write(Type.ITEM1_13, protocol.getItemRewriter().handleItemToServer(wrapper.user(), book)); boolean signing = channel.equals("MC|BSign"); wrapper.write(Type.BOOLEAN, signing); break; 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 89189fa8..e5c74466 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 @@ -24,6 +24,7 @@ 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; import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.ClientWorld; import com.viaversion.viaversion.api.minecraft.Environment; import com.viaversion.viaversion.api.minecraft.chunks.Chunk; @@ -69,7 +70,7 @@ public class BlockItemPackets1_14 extends BackwardsItemRewriter handleItemToServer(wrapper.passthrough(Type.ITEM1_13_2))); + protocol.registerServerbound(ServerboundPackets1_13.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.user(), wrapper.passthrough(Type.ITEM1_13_2))); protocol.registerClientbound(ClientboundPackets1_14.OPEN_WINDOW, wrapper -> { int windowId = wrapper.read(Type.VAR_INT); @@ -185,20 +186,20 @@ public class BlockItemPackets1_14 extends BackwardsItemRewriter handleItemToClient(wrapper.get(Type.ITEM1_13_2, 0))); + handler(wrapper -> handleItemToClient(wrapper.user(), wrapper.get(Type.ITEM1_13_2, 0))); handler(wrapper -> { int entityId = wrapper.get(Type.VAR_INT, 0); @@ -465,9 +466,9 @@ public class BlockItemPackets1_14 extends BackwardsItemRewriter { - rewriteParticle((Particle) meta.getValue()); + rewriteParticle(event.user(), (Particle) meta.getValue()); }); filter().type(EntityTypes1_14.FIREWORK_ROCKET).index(8).handler((event, meta) -> { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java index b0514f06..9c7893ad 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java @@ -92,7 +92,7 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol { - itemRewriter.handleItemToServer(wrapper.get(Type.ITEM1_13, 0)); + itemRewriter.handleItemToServer(wrapper.user(), wrapper.get(Type.ITEM1_13, 0)); wrapper.write(Type.VAR_INT, 0); }); } @@ -105,7 +105,7 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol { JsonElement title = wrapper.passthrough(Type.COMPONENT); - translatableRewriter.processText(title); + translatableRewriter.processText(wrapper.user(), title); if (ViaBackwards.getConfig().fix1_13FormattedInventoryTitle()) { if (title.isJsonObject() && title.getAsJsonObject().size() == 1 @@ -151,7 +151,7 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol { int action = wrapper.get(Type.VAR_INT, 0); if (action == 0 || action == 3) { - translatableRewriter.processText(wrapper.passthrough(Type.COMPONENT)); + translatableRewriter.processText(wrapper.user(), wrapper.passthrough(Type.COMPONENT)); if (action == 0) { wrapper.passthrough(Type.FLOAT); wrapper.passthrough(Type.VAR_INT); @@ -178,7 +178,7 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol { if (meta.metaType() == Types1_13.META_TYPES.itemType) { - protocol.getItemRewriter().handleItemToClient((Item) meta.getValue()); + protocol.getItemRewriter().handleItemToClient(event.user(), (Item) meta.getValue()); } else if (meta.metaType() == Types1_13.META_TYPES.blockStateType) { // Convert to new block id int data = (int) meta.getValue(); meta.setValue(protocol.getMappingData().getNewBlockStateId(data)); } else if (meta.metaType() == Types1_13.META_TYPES.particleType) { - rewriteParticle((Particle) meta.getValue()); + rewriteParticle(event.user(), (Particle) meta.getValue()); } else if (meta.metaType() == Types1_13.META_TYPES.optionalComponentType || meta.metaType() == Types1_13.META_TYPES.componentType) { JsonElement element = meta.value(); - protocol.translatableRewriter().processText(element); + protocol.translatableRewriter().processText(event.user(), element); } }); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java index caccdac5..c425c867 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java @@ -45,16 +45,16 @@ public class InventoryPackets1_13_1 extends ItemRewriter(protocol).register(ClientboundPackets1_15.DECLARE_RECIPES); - protocol.registerServerbound(ServerboundPackets1_14.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.passthrough(Type.ITEM1_13_2))); + protocol.registerServerbound(ServerboundPackets1_14.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.user(), wrapper.passthrough(Type.ITEM1_13_2))); registerSetCooldown(ClientboundPackets1_15.COOLDOWN); registerWindowItems(ClientboundPackets1_15.WINDOW_ITEMS); @@ -123,7 +123,7 @@ public class BlockItemPackets1_15 extends BackwardsItemRewriter translatableRewriter.processText(wrapper.passthrough(Type.COMPONENT))); + handler(wrapper -> translatableRewriter.processText(wrapper.user(), wrapper.passthrough(Type.COMPONENT))); map(Type.BYTE); read(Type.UUID); // Sender } @@ -94,7 +94,7 @@ public class Protocol1_15_2To1_16 extends BackwardsProtocol translatableRewriter.processText(wrapper.passthrough(Type.COMPONENT))); + handler(wrapper -> translatableRewriter.processText(wrapper.user(), wrapper.passthrough(Type.COMPONENT))); handler(wrapper -> { int windowType = wrapper.get(Type.VAR_INT, 1); if (windowType == 20) { // Smithing table diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/chat/TranslatableRewriter1_16.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/chat/TranslatableRewriter1_16.java index f4f0fde5..46ba8d2f 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/chat/TranslatableRewriter1_16.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/chat/TranslatableRewriter1_16.java @@ -19,6 +19,7 @@ package com.viaversion.viabackwards.protocol.protocol1_15_2to1_16.chat; import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter; import com.viaversion.viabackwards.protocol.protocol1_15_2to1_16.Protocol1_15_2To1_16; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.libs.gson.JsonElement; import com.viaversion.viaversion.libs.gson.JsonObject; import com.viaversion.viaversion.libs.gson.JsonPrimitive; @@ -52,8 +53,8 @@ public class TranslatableRewriter1_16 extends TranslatableRewriter handleItemToServer(wrapper.passthrough(Type.ITEM1_13_2))); + protocol.registerServerbound(ServerboundPackets1_14.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.user(), wrapper.passthrough(Type.ITEM1_13_2))); } private void handleBlockEntity(CompoundTag tag) { @@ -291,10 +292,10 @@ public class BlockItemPackets1_16 extends BackwardsItemRewriter pagesTag = tag.getListTag("pages", StringTag.class); if (pagesTag != null) { for (StringTag page : pagesTag) { - JsonElement jsonElement = protocol.getTranslatableRewriter().processText(page.getValue()); + JsonElement jsonElement = protocol.getTranslatableRewriter().processText(connection, page.getValue()); page.setValue(jsonElement.toString()); } } @@ -325,11 +326,11 @@ public class BlockItemPackets1_16 extends BackwardsItemRewriter { - int action = packetWrapper.passthrough(Type.VAR_INT); - int playerCount = packetWrapper.passthrough(Type.VAR_INT); - for (int i = 0; i < playerCount; i++) { - packetWrapper.passthrough(Type.UUID); - if (action == 0) { // Add - packetWrapper.passthrough(Type.STRING); - int properties = packetWrapper.passthrough(Type.VAR_INT); - for (int j = 0; j < properties; j++) { - packetWrapper.passthrough(Type.STRING); - packetWrapper.passthrough(Type.STRING); - packetWrapper.passthrough(Type.OPTIONAL_STRING); - } - packetWrapper.passthrough(Type.VAR_INT); - packetWrapper.passthrough(Type.VAR_INT); - // Display Name - protocol.getTranslatableRewriter().processText(packetWrapper.passthrough(Type.OPTIONAL_COMPONENT)); - } else if (action == 1) { // Update Game Mode - packetWrapper.passthrough(Type.VAR_INT); - } else if (action == 2) { // Update Ping - packetWrapper.passthrough(Type.VAR_INT); - } else if (action == 3) { // Update Display Name - // Display name - protocol.getTranslatableRewriter().processText(packetWrapper.passthrough(Type.OPTIONAL_COMPONENT)); - } // 4 = Remove Player + protocol.registerClientbound(ClientboundPackets1_16.PLAYER_INFO, wrapper -> { + int action = wrapper.passthrough(Type.VAR_INT); + int playerCount = wrapper.passthrough(Type.VAR_INT); + for (int i = 0; i < playerCount; i++) { + wrapper.passthrough(Type.UUID); + if (action == 0) { // Add + wrapper.passthrough(Type.STRING); + int properties = wrapper.passthrough(Type.VAR_INT); + for (int j = 0; j < properties; j++) { + wrapper.passthrough(Type.STRING); + wrapper.passthrough(Type.STRING); + wrapper.passthrough(Type.OPTIONAL_STRING); } - }); + wrapper.passthrough(Type.VAR_INT); + wrapper.passthrough(Type.VAR_INT); + // Display Name + protocol.getTranslatableRewriter().processText(wrapper.user(), wrapper.passthrough(Type.OPTIONAL_COMPONENT)); + } else if (action == 1) { // Update Game Mode + wrapper.passthrough(Type.VAR_INT); + } else if (action == 2) { // Update Ping + wrapper.passthrough(Type.VAR_INT); + } else if (action == 3) { // Update Display Name + // Display name + protocol.getTranslatableRewriter().processText(wrapper.user(), wrapper.passthrough(Type.OPTIONAL_COMPONENT)); + } // 4 = Remove Player } }); } @@ -244,15 +239,15 @@ public class EntityPackets1_16 extends EntityRewriter { JsonElement message = wrapper.passthrough(Type.COMPONENT); - translatableRewriter.processText(message); + translatableRewriter.processText(wrapper.user(), message); byte position = wrapper.passthrough(Type.BYTE); if (position == 2) { // https://bugs.mojang.com/browse/MC-119145 wrapper.clearPacket(); 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 d6df97b3..be554bdc 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 @@ -134,7 +134,7 @@ public class BlockItemPackets1_16_2 extends BackwardsItemRewriter handleItemToServer(wrapper.passthrough(Type.ITEM1_13_2))); + protocol.registerServerbound(ServerboundPackets1_16.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.user(), wrapper.passthrough(Type.ITEM1_13_2))); } private void handleBlockEntity(CompoundTag tag) { 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 a0ddad19..715e686a 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 @@ -77,7 +77,7 @@ public final class BlockItemPackets1_17 extends BackwardsItemRewriter handleItemToServer(wrapper.passthrough(Type.ITEM1_13_2))); + protocol.registerServerbound(ServerboundPackets1_16_2.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.user(), wrapper.passthrough(Type.ITEM1_13_2))); // TODO Since the carried and modified items are typically set incorrectly, the server sends unnecessary // set slot packets after practically every window click, since it thinks the client and server @@ -95,7 +95,7 @@ public final class BlockItemPackets1_17 extends BackwardsItemRewriter after a click and send the changed slots here wrapper.write(Type.VAR_INT, 0); // Empty array of slot+item @@ -152,7 +152,7 @@ public final class BlockItemPackets1_17 extends BackwardsItemRewriter { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java index 1fd22c0a..d51a9f10 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java @@ -152,17 +152,17 @@ public final class EntityPackets1_17 extends EntityRewriter data = particle.getArguments().remove(0); int blockState = (int) data.getValue(); if (blockState == 7786) { // Light block @@ -111,7 +111,7 @@ public final class EntityPackets1_18 extends EntityRewriter { final JsonElement content = wrapper.passthrough(Type.COMPONENT); - translatableRewriter.processText(content); + translatableRewriter.processText(wrapper.user(), content); // Screw everything that isn't a system or game info type (which would only happen on funny 1.19.0 servers) final int typeId = wrapper.read(Type.VAR_INT); 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 a413a597..bed897e3 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 @@ -70,12 +70,12 @@ public final class BlockItemPackets1_19 extends BackwardsItemRewriter= 8) { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/Protocol1_19_1To1_19_3.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/Protocol1_19_1To1_19_3.java index f990d838..88118d27 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/Protocol1_19_1To1_19_3.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/Protocol1_19_1To1_19_3.java @@ -309,7 +309,7 @@ public final class Protocol1_19_1To1_19_3 extends BackwardsProtocol { final JsonElement content = wrapper.read(Type.COMPONENT); - translatableRewriter.processText(content); + translatableRewriter.processText(wrapper.user(), content); final int chatTypeId = wrapper.read(Type.VAR_INT); final JsonElement senderName = wrapper.read(Type.COMPONENT); final JsonElement targetName = wrapper.read(Type.OPTIONAL_COMPONENT); 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 0f71a927..7360b9d0 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 @@ -79,10 +79,10 @@ public final class BlockItemPackets1_19_3 extends BackwardsItemRewriter { // TODO Maybe spawn an extra entity to ride the armor stand for blocks and items diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_4to1_20/Protocol1_19_4To1_20.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_4to1_20/Protocol1_19_4To1_20.java index f02cf8b4..15c286c2 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_4to1_20/Protocol1_19_4To1_20.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_4to1_20/Protocol1_19_4To1_20.java @@ -87,7 +87,7 @@ public final class Protocol1_19_4To1_20 extends BackwardsProtocol { wrapper.passthrough(Type.VAR_INT); // Duration wrapper.write(Type.INT, -1); // Killer ID - unused (who knows for how long?) - translatableRewriter.processText(wrapper.passthrough(Type.COMPONENT)); + translatableRewriter.processText(wrapper.user(), wrapper.passthrough(Type.COMPONENT)); }); } 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 05af8d26..9f8d6e6f 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 @@ -20,6 +20,7 @@ package com.viaversion.viabackwards.protocol.protocol1_19_4to1_20.packets; 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.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockChangeRecord; import com.viaversion.viaversion.api.minecraft.Position; import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity; @@ -60,7 +61,7 @@ public final class BlockItemPackets1_20 extends BackwardsItemRewriter handleBlockEntity(blockEntity))); create(Type.BOOLEAN, true); // Trust edges } }); @@ -106,7 +107,7 @@ public final class BlockItemPackets1_20 extends BackwardsItemRewriter { final JsonElement content = wrapper.passthrough(Type.COMPONENT); - translatableRewriter.processText(content); + translatableRewriter.processText(wrapper.user(), content); final boolean overlay = wrapper.read(Type.BOOLEAN); wrapper.write(Type.VAR_INT, overlay ? GAME_INFO_ID : SYSTEM_CHAT_ID); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/Protocol1_20_2To1_20_3.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/Protocol1_20_2To1_20_3.java index 9eccc629..4a2f30af 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/Protocol1_20_2To1_20_3.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/Protocol1_20_2To1_20_3.java @@ -148,7 +148,7 @@ public final class Protocol1_20_2To1_20_3 extends BackwardsProtocolremoveArgument(0).getValue(); if (positionSourceType == 0) { @@ -117,7 +117,7 @@ public final class EntityPacketRewriter1_20_3 extends EntityRewriter= 15) { diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java index f0e89f76..1cb2ad35 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java @@ -20,6 +20,7 @@ package com.viaversion.viabackwards.protocol.protocol1_20_3to1_20_5.rewriter; import com.viaversion.viabackwards.api.rewriters.BackwardsStructuredItemRewriter; import com.viaversion.viabackwards.protocol.protocol1_20_3to1_20_5.Protocol1_20_3To1_20_5; import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Particle; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.type.Type; @@ -86,7 +87,7 @@ public final class BlockItemPacketRewriter1_20_5 extends BackwardsStructuredItem // Move it to the beginning, move out arguments here final Particle particle = wrapper.read(Types1_20_5.PARTICLE); - rewriteParticle(particle); + rewriteParticle(wrapper.user(), particle); if (particle.id() == protocol.getMappingData().getParticleMappings().mappedId("entity_effect")) { // Remove color argument final int color = particle.removeArgument(0).getValue(); @@ -139,11 +140,11 @@ public final class BlockItemPacketRewriter1_20_5 extends BackwardsStructuredItem wrapper.passthrough(Type.VAR_INT); // Container id final int size = wrapper.passthrough(Type.VAR_INT); for (int i = 0; i < size; i++) { - final Item input = handleItemToClient(wrapper.read(Types1_20_5.ITEM_COST)); + final Item input = handleItemToClient(wrapper.user(), wrapper.read(Types1_20_5.ITEM_COST)); wrapper.write(Type.ITEM1_20_2, input); - final Item result = handleItemToClient(wrapper.read(Types1_20_5.ITEM)); + final Item result = handleItemToClient(wrapper.user(), wrapper.read(Types1_20_5.ITEM)); wrapper.write(Type.ITEM1_20_2, result); - final Item secondInput = handleItemToClient(wrapper.read(Types1_20_5.OPTIONAL_ITEM_COST)); + final Item secondInput = handleItemToClient(wrapper.user(), wrapper.read(Types1_20_5.OPTIONAL_ITEM_COST)); wrapper.write(Type.ITEM1_20_2, secondInput); wrapper.passthrough(Type.BOOLEAN); // Out of stock @@ -172,19 +173,19 @@ public final class BlockItemPacketRewriter1_20_5 extends BackwardsStructuredItem } @Override - public @Nullable Item handleItemToClient(@Nullable final Item item) { + public @Nullable Item handleItemToClient(final UserConnection connection, @Nullable final Item item) { if (item == null) return null; - super.handleItemToClient(item); + super.handleItemToClient(connection, item); return vvProtocol.getItemRewriter().toOldItem(item, DATA_CONVERTER); } @Override - public @Nullable Item handleItemToServer(@Nullable final Item item) { + public @Nullable Item handleItemToServer(final UserConnection connection, @Nullable final Item item) { if (item == null) return null; // Convert to structured item first - final Item structuredItem = vvProtocol.getItemRewriter().toStructuredItem(item); - return super.handleItemToServer(structuredItem); + final Item structuredItem = vvProtocol.getItemRewriter().toStructuredItem(connection, item); + return super.handleItemToServer(connection, structuredItem); } } \ No newline at end of file diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_3to1_20_5/rewriter/EntityPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_3to1_20_5/rewriter/EntityPacketRewriter1_20_5.java index 416a9eb6..d399fb5c 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_3to1_20_5/rewriter/EntityPacketRewriter1_20_5.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_3to1_20_5/rewriter/EntityPacketRewriter1_20_5.java @@ -77,7 +77,7 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter { final Item[] items = wrapper.read(Type.ITEM1_20_2_ARRAY); for (final Item item : items) { - handleItemToClient(item); + handleItemToClient(wrapper.user(), item); } wrapper.write(Type.ITEM1_13_2_ARRAY, items); - wrapper.write(Type.ITEM1_13_2, handleItemToClient(wrapper.read(Type.ITEM1_20_2))); // Carried item + wrapper.write(Type.ITEM1_13_2, handleItemToClient(wrapper.user(), wrapper.read(Type.ITEM1_20_2))); // Carried item }); } }); @@ -163,7 +164,7 @@ public final class BlockItemPacketRewriter1_20_2 extends BackwardsItemRewriter wrapper.write(Type.ITEM1_13_2, handleItemToClient(wrapper.read(Type.ITEM1_20_2)))); + handler(wrapper -> wrapper.write(Type.ITEM1_13_2, handleItemToClient(wrapper.user(), wrapper.read(Type.ITEM1_20_2)))); } }); protocol.registerClientbound(ClientboundPackets1_20_2.ADVANCEMENTS, wrapper -> { @@ -177,7 +178,7 @@ public final class BlockItemPacketRewriter1_20_2 extends BackwardsItemRewriter wrapper.write(Type.ITEM1_20_2, handleItemToServer(wrapper.read(Type.ITEM1_13_2)))); // 1 - Clicked Item + handler(wrapper -> wrapper.write(Type.ITEM1_20_2, handleItemToServer(wrapper.user(), wrapper.read(Type.ITEM1_13_2)))); // 1 - Clicked Item } }); protocol.registerClientbound(ClientboundPackets1_20_2.SPAWN_PARTICLE, new PacketHandlers() { @@ -276,7 +277,7 @@ public final class BlockItemPacketRewriter1_20_2 extends BackwardsItemRewriter { if (meta.metaType().type().equals(Type.ITEM1_8)) // Is Item - meta.setValue(handleItemToClient((Item) meta.getValue())); + meta.setValue(handleItemToClient(event.user(), (Item) meta.getValue())); }); // Particle diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.13to1.12.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.13to1.12.nbt index 6b5d1156..e246587a 100644 Binary files a/common/src/main/resources/assets/viabackwards/data/mappings-1.13to1.12.nbt and b/common/src/main/resources/assets/viabackwards/data/mappings-1.13to1.12.nbt differ