Fix trusted tag limiting

kennytv · kennytv · commit f3be21ed9dc3 · 2026-01-25T13:16:36.000+01:00
Fixes ViaVersion/ViaVersion#4792
diff --git a/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java b/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java
@@ -78,7 +78,7 @@
 
 public interface ViaBackwardsPlatform {
 
-    String MINIMUM_VV_VERSION = "5.7.1";
+    String MINIMUM_VV_VERSION = "5.7.2";
 
     default void init(final File configFile) {
         init(new ViaBackwardsConfig(configFile, getLogger()));
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java
@@ -112,7 +112,7 @@ public void registerPackets() {
         protocol.registerClientbound(ClientboundPackets1_20_2.BLOCK_ENTITY_DATA, wrapper -> {
             wrapper.passthrough(Types.BLOCK_POSITION1_14); // Position
             wrapper.passthrough(Types.VAR_INT); // Type
-            wrapper.write(Types.NAMED_COMPOUND_TAG, handleBlockEntity(wrapper.read(Types.COMPOUND_TAG)));
+            wrapper.write(Types.NAMED_COMPOUND_TAG, handleBlockEntity(wrapper.read(Types.TRUSTED_COMPOUND_TAG)));
         });
 
         protocol.registerClientbound(ClientboundPackets1_20_2.LEVEL_CHUNK_WITH_LIGHT, wrapper -> {
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_3to1_20_2/Protocol1_20_3To1_20_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_3to1_20_2/Protocol1_20_3To1_20_2.java
@@ -363,13 +363,13 @@ private PacketHandler resourcePackHandler() {
     }
 
     private void convertComponent(final PacketWrapper wrapper) {
-        final Tag tag = wrapper.read(Types.TAG);
+        final Tag tag = wrapper.read(Types.TRUSTED_TAG);
         translatableRewriter.processTag(wrapper.user(), tag);
         wrapper.write(Types.COMPONENT, ComponentUtil.tagToJson(tag));
     }
 
     private void convertOptionalComponent(final PacketWrapper wrapper) {
-        final Tag tag = wrapper.read(Types.OPTIONAL_TAG);
+        final Tag tag = wrapper.read(Types.TRUSTED_OPTIONAL_TAG);
         translatableRewriter.processTag(wrapper.user(), tag);
         wrapper.write(Types.OPTIONAL_COMPONENT, ComponentUtil.tagToJson(tag));
     }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/Protocol1_20_5To1_20_3.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/Protocol1_20_5To1_20_3.java
@@ -130,7 +130,7 @@ protected void registerPackets() {
         });
 
         registerClientbound(ClientboundPackets1_20_5.SERVER_DATA, wrapper -> {
-            wrapper.passthrough(Types.TAG); // MOTD
+            wrapper.passthrough(Types.TRUSTED_TAG); // MOTD
             wrapper.passthrough(Types.OPTIONAL_BYTE_ARRAY_PRIMITIVE); // Icon
             wrapper.write(Types.BOOLEAN, wrapper.user().get(SecureChatStorage.class).enforcesSecureChat());
         });
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
@@ -71,7 +71,7 @@ public void registerPackets() {
         protocol.registerClientbound(ClientboundPackets1_20_5.BLOCK_ENTITY_DATA, wrapper -> {
             wrapper.passthrough(Types.BLOCK_POSITION1_14); // Position
             wrapper.passthrough(Types.VAR_INT); // Block entity type
-            final CompoundTag tag = wrapper.passthrough(Types.COMPOUND_TAG);
+            final CompoundTag tag = wrapper.passthrough(Types.TRUSTED_COMPOUND_TAG);
             blockRewriter.updateBlockEntityTag(tag);
         });
 
@@ -196,7 +196,7 @@ public void registerPackets() {
                     wrapper.passthrough(Types.BYTE); // X
                     wrapper.passthrough(Types.BYTE); // Y
                     wrapper.passthrough(Types.BYTE); // Rotation
-                    wrapper.passthrough(Types.OPTIONAL_TAG); // Display name
+                    wrapper.passthrough(Types.TRUSTED_OPTIONAL_TAG); // Display name
                 }
             }
         });
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java
@@ -402,7 +402,7 @@ public void register() {
                     wrapper.passthrough(Types.VAR_INT); // Latency
                 }
                 if (actions.get(5)) {
-                    final Tag displayName = wrapper.passthrough(Types.OPTIONAL_TAG);
+                    final Tag displayName = wrapper.passthrough(Types.TRUSTED_OPTIONAL_TAG);
                     protocol.getComponentRewriter().processTag(wrapper.user(), displayName);
                 }
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_4to1_21_2/Protocol1_21_4To1_21_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_4to1_21_2/Protocol1_21_4To1_21_2.java
@@ -152,7 +152,7 @@ protected void registerPackets() {
                     wrapper.passthrough(Types.VAR_INT); // Latency
                 }
                 if (actions.get(5)) {
-                    translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.OPTIONAL_TAG));
+                    translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TRUSTED_OPTIONAL_TAG));
                 }
                 if (actions.get(6)) {
                     wrapper.passthrough(Types.VAR_INT); // List order
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/Protocol1_21_5To1_21_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/Protocol1_21_5To1_21_4.java
@@ -154,16 +154,16 @@ public void handleArgument(final PacketWrapper wrapper, final String argumentTyp
                 }
             }
 
-            translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.OPTIONAL_TAG)); // Unsigned content
+            translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TRUSTED_OPTIONAL_TAG)); // Unsigned content
 
             final int filterMaskType = wrapper.passthrough(Types.VAR_INT);
             if (filterMaskType == 2) { // Partially filtered
                 wrapper.passthrough(Types.LONG_ARRAY_PRIMITIVE); // Mask
             }
 
             wrapper.passthrough(ChatType.TYPE); // Chat Type
-            translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TAG)); // Name
-            translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.OPTIONAL_TAG)); // Target Name
+            translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TRUSTED_TAG)); // Name
+            translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TRUSTED_OPTIONAL_TAG)); // Target Name
         });
         registerServerbound(ServerboundPackets1_21_4.CHAT_COMMAND_SIGNED, wrapper -> {
             wrapper.passthrough(Types.STRING); // Command
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/rewriter/BlockItemPacketRewriter1_21_5.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/rewriter/BlockItemPacketRewriter1_21_5.java
@@ -225,8 +225,8 @@ public void registerPackets() {
 
                 // Display data
                 if (wrapper.passthrough(Types.BOOLEAN)) {
-                    final Tag title = wrapper.passthrough(Types.TAG);
-                    final Tag description = wrapper.passthrough(Types.TAG);
+                    final Tag title = wrapper.passthrough(Types.TRUSTED_TAG);
+                    final Tag description = wrapper.passthrough(Types.TRUSTED_TAG);
                     final ComponentRewriter componentRewriter = protocol.getComponentRewriter();
                     if (componentRewriter != null) {
                         componentRewriter.processTag(wrapper.user(), title);
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/Protocol1_21_6To1_21_5.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/Protocol1_21_6To1_21_5.java
@@ -169,7 +169,7 @@ public void handleArgument(final PacketWrapper wrapper, final String argumentTyp
             final int id = wrapper.read(Types.VAR_INT) - 1;
             CompoundTag tag;
             if (id == -1) {
-                tag = (CompoundTag) wrapper.read(Types.TAG);
+                tag = (CompoundTag) wrapper.read(Types.TRUSTED_TAG);
             } else {
                 tag = registryAndTags.fromRegistry(id);
             }
@@ -185,7 +185,7 @@ public void handleArgument(final PacketWrapper wrapper, final String argumentTyp
 
             final RegistryAndTags registryAndTags = wrapper.user().get(RegistryAndTags.class);
             final ServerLinks serverLinks = wrapper.user().get(ServerLinks.class);
-            final CompoundTag tag = (CompoundTag) wrapper.read(Types.TAG);
+            final CompoundTag tag = (CompoundTag) wrapper.read(Types.TRUSTED_TAG);
 
             final DialogViewProvider provider = Via.getManager().getProviders().get(DialogViewProvider.class);
             provider.openDialog(wrapper.user(), new Dialog(registryAndTags, serverLinks, tag));
@@ -317,7 +317,7 @@ private void storeServerLinks(final PacketWrapper wrapper) {
                 final String url = wrapper.passthrough(Types.STRING);
                 serverLinks.storeLink(id, url);
             } else {
-                final Tag tag = wrapper.passthrough(Types.TAG);
+                final Tag tag = wrapper.passthrough(Types.TRUSTED_TAG);
                 final String url = wrapper.passthrough(Types.STRING);
                 serverLinks.storeLink(tag, url);
             }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/provider/ChestDialogViewProvider.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/provider/ChestDialogViewProvider.java
@@ -113,7 +113,7 @@ public void openChestView(final UserConnection connection, final ChestDialogStor
         final PacketWrapper openScreen = PacketWrapper.create(ClientboundPackets1_21_5.OPEN_SCREEN, connection);
         openScreen.write(Types.VAR_INT, storage.containerId());
         openScreen.write(Types.VAR_INT, 2); // Container type id
-        openScreen.write(Types.TAG, handleTag(connection, storage.dialog().title()));
+        openScreen.write(Types.TRUSTED_TAG, handleTag(connection, storage.dialog().title()));
         openScreen.send(Protocol1_21_6To1_21_5.class);
         updateDialog(connection, storage.dialog());
     }
@@ -457,7 +457,7 @@ protected void openAnvilView(
         final PacketWrapper openScreen = PacketWrapper.create(ClientboundPackets1_21_5.OPEN_SCREEN, connection);
         openScreen.write(Types.VAR_INT, storage.containerId());
         openScreen.write(Types.VAR_INT, 8); // Container type id
-        openScreen.write(Types.TAG, title);
+        openScreen.write(Types.TRUSTED_TAG, title);
         openScreen.send(Protocol1_21_6To1_21_5.class);
 
         final Item[] items = new Item[1];
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/Protocol1_21_9To1_21_7.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/Protocol1_21_9To1_21_7.java
@@ -181,7 +181,7 @@ protected void registerPackets() {
             no.put("action", disconnectAction);
             tag.put("no", no);
 
-            wrapper.write(Types.TAG, tag);
+            wrapper.write(Types.TRUSTED_TAG, tag);
         });
 
         registerServerbound(ServerboundConfigurationPackets1_21_6.CUSTOM_CLICK_ACTION, wrapper -> {
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/rewriter/EntityPacketRewriter1_21_9.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/rewriter/EntityPacketRewriter1_21_9.java
@@ -277,7 +277,7 @@ private void sendInitialPlayerInfoUpdate(final UserConnection connection, final
         playerInfo.write(Types.VAR_INT, 0); // Gamemode
         playerInfo.write(Types.BOOLEAN, false); // Listed
         playerInfo.write(Types.VAR_INT, 0); // Latency
-        playerInfo.write(Types.OPTIONAL_TAG, null);
+        playerInfo.write(Types.TRUSTED_OPTIONAL_TAG, null);
         playerInfo.write(Types.VAR_INT, 1000); // List order
         playerInfo.write(Types.BOOLEAN, true); // Show hat
         playerInfo.send(Protocol1_21_9To1_21_7.class);
@@ -292,7 +292,7 @@ private void sendPlayerInfoDisplayNameUpdate(final UserConnection connection, fi
         playerInfo.write(Types.PROFILE_ACTIONS_ENUM1_21_4, actions);
         playerInfo.write(Types.VAR_INT, 1);
         playerInfo.write(Types.UUID, mannequinData.uuid());
-        playerInfo.write(Types.OPTIONAL_TAG, displayName);
+        playerInfo.write(Types.TRUSTED_OPTIONAL_TAG, displayName);
         playerInfo.send(Protocol1_21_9To1_21_7.class);
 
         sendPlayerTeamDisplayName(connection, mannequinData, displayName);
@@ -304,13 +304,13 @@ private void sendPlayerTeamDisplayName(final UserConnection connection, final Ma
         final PacketWrapper addTeam = PacketWrapper.create(ClientboundPackets1_21_6.SET_PLAYER_TEAM, connection);
         addTeam.write(Types.STRING, mannequinData.name());
         addTeam.write(Types.BYTE, mannequinData.hasTeam() ? (byte) 2 : 0); // Mode
-        addTeam.write(Types.TAG, nonNullDisplayName); // Display Name
+        addTeam.write(Types.TRUSTED_TAG, nonNullDisplayName); // Display Name
         addTeam.write(Types.BYTE, (byte) 0); // Flags
         addTeam.write(Types.VAR_INT, 0); // Nametag visibility
         addTeam.write(Types.VAR_INT, 0); // Collision rule
         addTeam.write(Types.VAR_INT, 15); // Color
-        addTeam.write(Types.TAG, nonNullDisplayName); // Prefix
-        addTeam.write(Types.TAG, new StringTag("")); // Suffix
+        addTeam.write(Types.TRUSTED_TAG, nonNullDisplayName); // Prefix
+        addTeam.write(Types.TRUSTED_TAG, new StringTag("")); // Suffix
         if (!mannequinData.hasTeam()) {
             addTeam.write(Types.STRING_ARRAY, new String[]{mannequinData.name()});
             mannequinData.setHasTeam(true);
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21to1_20_5/Protocol1_21To1_20_5.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21to1_20_5/Protocol1_21To1_20_5.java
@@ -110,7 +110,7 @@ protected void registerPackets() {
         cancelClientbound(ClientboundConfigurationPackets1_21.SERVER_LINKS);
 
         registerClientbound(ClientboundPackets1_21.DISGUISED_CHAT, wrapper -> {
-            translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TAG)); // Message
+            translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TRUSTED_TAG)); // Message
 
             final Holder<ChatType> chatType = wrapper.read(ChatType.TYPE);
             if (chatType.isDirect()) {
@@ -137,7 +137,7 @@ protected void registerPackets() {
                 }
             }
 
-            wrapper.passthrough(Types.OPTIONAL_TAG); // Unsigned content
+            wrapper.passthrough(Types.TRUSTED_OPTIONAL_TAG); // Unsigned content
 
             final int filterMaskType = wrapper.passthrough(Types.VAR_INT);
             if (filterMaskType == 2) {
@@ -152,8 +152,8 @@ protected void registerPackets() {
                 wrapper.write(Types.VAR_INT, chatType.id());
             }
 
-            translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TAG)); // Name
-            translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.OPTIONAL_TAG)); // Target Name
+            translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TRUSTED_TAG)); // Name
+            translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TRUSTED_OPTIONAL_TAG)); // Target Name
         });
 
         registerClientbound(ClientboundPackets1_21.UPDATE_ATTRIBUTES, wrapper -> {
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-projectVersion=5.7.1
+projectVersion=5.7.2-SNAPSHOT
 
 # Smile emoji (note that modrinth may not have added the version on release yet)
 mcVersions=1.21.11, 1.21.10, 1.21.9, 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ metadata.format.version = "1.1"
 [versions]
 
 # ViaVersion
-viaver = "5.7.1"
+viaver = "5.7.2-SNAPSHOT"
 
 # Common provided
 netty = "4.0.20.Final"
diff --git a/sponge/src/main/resources/META-INF/sponge_plugins.json b/sponge/src/main/resources/META-INF/sponge_plugins.json
@@ -47,7 +47,7 @@
       },
       {
         "id": "viaversion",
-        "version": "[5.7.1-SNAPSHOT,)"
+        "version": "[5.7.2-SNAPSHOT,)"
       }
     ]
   },

Original file line number	Diff line number	Diff line change
`@@ -363,13 +363,13 @@ private PacketHandler resourcePackHandler() {`
`363`	`363`	`}`
`364`	`364`
`365`	`365`	`private void convertComponent(final PacketWrapper wrapper) {`
`366`		`- final Tag tag = wrapper.read(Types.TAG);`
	`366`	`+ final Tag tag = wrapper.read(Types.TRUSTED_TAG);`
`367`	`367`	`translatableRewriter.processTag(wrapper.user(), tag);`
`368`	`368`	`wrapper.write(Types.COMPONENT, ComponentUtil.tagToJson(tag));`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	`private void convertOptionalComponent(final PacketWrapper wrapper) {`
`372`		`- final Tag tag = wrapper.read(Types.OPTIONAL_TAG);`
	`372`	`+ final Tag tag = wrapper.read(Types.TRUSTED_OPTIONAL_TAG);`
`373`	`373`	`translatableRewriter.processTag(wrapper.user(), tag);`
`374`	`374`	`wrapper.write(Types.OPTIONAL_COMPONENT, ComponentUtil.tagToJson(tag));`
`375`	`375`	`}`
Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ public void register() {`
`402`	`402`	`wrapper.passthrough(Types.VAR_INT); // Latency`
`403`	`403`	`}`
`404`	`404`	`if (actions.get(5)) {`
`405`		`- final Tag displayName = wrapper.passthrough(Types.OPTIONAL_TAG);`
	`405`	`+ final Tag displayName = wrapper.passthrough(Types.TRUSTED_OPTIONAL_TAG);`
`406`	`406`	`protocol.getComponentRewriter().processTag(wrapper.user(), displayName);`
`407`	`407`	`}`
`408`	`408`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ protected void registerPackets() {`
`152`	`152`	`wrapper.passthrough(Types.VAR_INT); // Latency`
`153`	`153`	`}`
`154`	`154`	`if (actions.get(5)) {`
`155`		`- translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.OPTIONAL_TAG));`
	`155`	`+ translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TRUSTED_OPTIONAL_TAG));`
`156`	`156`	`}`
`157`	`157`	`if (actions.get(6)) {`
`158`	`158`	`wrapper.passthrough(Types.VAR_INT); // List order`
Original file line number	Diff line number	Diff line change
`@@ -154,16 +154,16 @@ public void handleArgument(final PacketWrapper wrapper, final String argumentTyp`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
`157`		`- translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.OPTIONAL_TAG)); // Unsigned content`
	`157`	`+ translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TRUSTED_OPTIONAL_TAG)); // Unsigned content`
`158`	`158`
`159`	`159`	`final int filterMaskType = wrapper.passthrough(Types.VAR_INT);`
`160`	`160`	`if (filterMaskType == 2) { // Partially filtered`
`161`	`161`	`wrapper.passthrough(Types.LONG_ARRAY_PRIMITIVE); // Mask`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`wrapper.passthrough(ChatType.TYPE); // Chat Type`
`165`		`- translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TAG)); // Name`
`166`		`- translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.OPTIONAL_TAG)); // Target Name`
	`165`	`+ translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TRUSTED_TAG)); // Name`
	`166`	`+ translatableRewriter.processTag(wrapper.user(), wrapper.passthrough(Types.TRUSTED_OPTIONAL_TAG)); // Target Name`
`167`	`167`	`});`
`168`	`168`	`registerServerbound(ServerboundPackets1_21_4.CHAT_COMMAND_SIGNED, wrapper -> {`
`169`	`169`	`wrapper.passthrough(Types.STRING); // Command`