From 667278f9e656b5df3a4e3143eaf441506ad87371 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Mon, 16 Oct 2023 15:35:16 +1000
Subject: [PATCH] Handle booleans in json->tag conversion

---
 api/build.gradle.kts                          |  2 +-
 .../Protocol1_20_3To1_20_2.java               | 29 ++++++++++++++-----
 gradle/libs.versions.toml                     |  4 +--
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index 008296008..9f3326bde 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
     api(libs.fastutil)
     api(libs.flare)
     api(libs.flareFastutil)
-    api(libs.nbt)
+    api(libs.vianbt)
     api(libs.gson)
 
     compileOnlyApi(libs.snakeYaml)
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java
index 50cf1fdf7..869bb425e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java
@@ -56,14 +56,25 @@ import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.Serverbou
 import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ServerboundPackets1_20_2;
 import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.rewriter.EntityPacketRewriter1_20_3;
 import com.viaversion.viaversion.rewriter.SoundRewriter;
+import java.util.Arrays;
 import java.util.BitSet;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPackets1_20_2, ClientboundPackets1_20_2, ServerboundPackets1_20_2, ServerboundPackets1_20_2> {
 
     public static final MappingData MAPPINGS = new MappingDataBase("1.20.2", "1.20.3");
+    private static final Set<String> BOOLEAN_TYPES = new HashSet<>(Arrays.asList(
+            "interpret",
+            "bold",
+            "italic",
+            "underlined",
+            "strikethrough",
+            "obfuscated"
+    ));
     private final EntityPacketRewriter1_20_3 entityRewriter = new EntityPacketRewriter1_20_3(this);
 
     public Protocol1_20_3To1_20_2() {
@@ -278,7 +289,7 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
 
     public static @Nullable JsonElement tagComponentToJson(@Nullable final Tag tag) {
         try {
-            return convertToJson(tag);
+            return convertToJson(null, tag);
         } catch (final Exception e) {
             Via.getPlatform().getLogger().severe("Error converting component: " + tag);
             e.printStackTrace();
@@ -396,7 +407,7 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
         }
     }
 
-    private static @Nullable JsonElement convertToJson(final @Nullable Tag tag) {
+    private static @Nullable JsonElement convertToJson(final @Nullable String key, final @Nullable Tag tag) {
         if (tag == null) {
             return null;
         } else if (tag instanceof CompoundTag) {
@@ -409,12 +420,16 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
             final ListTag list = (ListTag) tag;
             final JsonArray array = new JsonArray();
             for (final Tag listEntry : list) {
-                array.add(convertToJson(listEntry));
+                array.add(convertToJson(null, listEntry));
             }
             return array;
         } else if (tag instanceof NumberTag) {
-            // TODO Byte could be a boolean
-            return new JsonPrimitive((Number) tag.getValue());
+            final NumberTag numberTag = (NumberTag) tag;
+            if (key != null && BOOLEAN_TYPES.contains(key)) {
+                // Booleans don't have a direct representation in nbt
+                return new JsonPrimitive(numberTag.asBoolean());
+            }
+            return new JsonPrimitive(numberTag.getValue());
         } else if (tag instanceof StringTag) {
             return new JsonPrimitive(((StringTag) tag).getValue());
         } else if (tag instanceof ByteArrayTag) {
@@ -448,14 +463,14 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
             final CompoundTag showEntity = (CompoundTag) tag;
             final Tag idTag = showEntity.remove("id");
             if (idTag instanceof IntArrayTag) {
-                final JsonObject convertedElement = (JsonObject) convertToJson(tag);
+                final JsonObject convertedElement = (JsonObject) convertToJson(key, tag);
                 convertedElement.addProperty("id", uuidIntsToString(((IntArrayTag) idTag).getValue()));
                 object.add(key, convertedElement);
                 return;
             }
         }
 
-        object.add(key, convertToJson(tag));
+        object.add(key, convertToJson(key, tag));
     }
 
     private static String uuidIntsToString(final int[] parts) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f10e77903..7d4d9d338 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ adventure = "4.14.0"
 gson = "2.10.1"
 fastutil = "8.5.12"
 flare = "2.0.1"
-nbt = "3.0.0"
+vianbt = "3.2.0"
 
 # Common provided
 netty = "4.0.20.Final"
@@ -37,7 +37,7 @@ gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
 fastutil = { group = "it.unimi.dsi", name = "fastutil", version.ref = "fastutil" }
 flare = { group = "space.vectrix.flare", name = "flare", version.ref = "flare" }
 flareFastutil = { group = "space.vectrix.flare", name = "flare-fastutil", version.ref = "flare" }
-nbt = { group = "com.viaversion", name = "nbt", version.ref = "nbt" }
+vianbt = { group = "com.viaversion", name = "nbt", version.ref = "vianbt" }
 
 netty = { group = "io.netty", name = "netty-all", version.ref = "netty" }
 guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }