From 82ada0bcd8c22209bf70402329a36c909b10c4fc Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 23 Feb 2022 18:15:39 +0100 Subject: [PATCH] Add new default command parser --- .../viaversion/api/protocol/version/ProtocolVersion.java | 2 +- .../com/viaversion/viaversion/rewriter/CommandRewriter.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java index f7e4dbad3..db393ee7b 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java +++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java @@ -79,7 +79,7 @@ public class ProtocolVersion { public static final ProtocolVersion v1_17 = register(755, "1.17"); public static final ProtocolVersion v1_17_1 = register(756, "1.17.1"); public static final ProtocolVersion v1_18 = register(757, "1.18/1.18.1", new VersionRange("1.18", 0, 1)); - public static final ProtocolVersion v1_18_2 = register(758, 70, "1.18.2"); + public static final ProtocolVersion v1_18_2 = register(758, 72, "1.18.2"); public static final ProtocolVersion unknown = register(-1, "UNKNOWN"); public static ProtocolVersion register(int version, String name) { diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/CommandRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/CommandRewriter.java index 315b84d2f..88625410a 100644 --- a/common/src/main/java/com/viaversion/viaversion/rewriter/CommandRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/rewriter/CommandRewriter.java @@ -67,6 +67,12 @@ public abstract class CommandRewriter { this.parserHandlers.put("minecraft:score_holder", wrapper -> { wrapper.passthrough(Type.BYTE); // Flags }); + this.parserHandlers.put("minecraft:resource", wrapper -> { + wrapper.passthrough(Type.STRING); // Resource location + }); + this.parserHandlers.put("minecraft:resource_or_tag", wrapper -> { + wrapper.passthrough(Type.STRING); // Resource location/tag + }); } public void handleArgument(PacketWrapper wrapper, String argumentType) throws Exception {