diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java index f3d9285d..d8a51e67 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java @@ -48,6 +48,7 @@ public class EntityPackets1_16 extends EntityRewriter dimensionTransformer = new ValueTransformer(Type.STRING, Type.INT) { @Override public Integer transform(PacketWrapper wrapper, String input) { + input = Key.namespaced(input); switch (input) { case "minecraft:the_nether": return -1; diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java index cc941c3a..58574818 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java @@ -35,6 +35,7 @@ import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag; import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets.EntityPackets; +import com.viaversion.viaversion.util.Key; import com.viaversion.viaversion.util.TagUtil; import java.util.Set; @@ -114,7 +115,7 @@ public class EntityPackets1_16_2 extends EntityRewriter { @@ -130,7 +130,7 @@ public final class EntityPackets1_19 extends EntityRewriter dimensions = TagUtil.getRegistryEntries(registry, "dimension_type"); boolean found = false; @@ -139,7 +139,7 @@ public final class EntityPackets1_19 extends EntityRewriter chatTypes = ((CompoundTag) registry.remove("minecraft:chat_type")).getListTag("value", CompoundTag.class); + CompoundTag chatTypeRegistry = (CompoundTag) registry.remove("minecraft:chat_type"); + if (chatTypeRegistry == null) { + chatTypeRegistry = (CompoundTag) registry.remove("chat_type"); + } + + final ListTag chatTypes = chatTypeRegistry.getListTag("value", CompoundTag.class); for (final CompoundTag chatType : chatTypes) { final NumberTag idTag = chatType.getNumberTag("id"); dimensionRegistryStorage.addChatType(idTag.asInt(), chatType);