From 362a21a4b1a9130e28aee71ba402cd433a255f39 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Fri, 29 Oct 2021 10:59:59 -0400
Subject: [PATCH] Use Jitpack for Adventure to fix boolean string serialization

Fixes #2596
---
 connector/pom.xml                             | 21 +++++++++++++++++--
 .../translators/nbt/BasicItemTranslator.java  |  6 +++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/connector/pom.xml b/connector/pom.xml
index c65e73b51..c12c0d24f 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -11,7 +11,7 @@
     <artifactId>connector</artifactId>
 
     <properties>
-        <adventure.version>4.9.2</adventure.version>
+        <adventure.version>3d6eaaf63f</adventure.version>
         <fastutil.version>8.5.2</fastutil.version>
         <jackson.version>2.12.4</jackson.version>
         <netty.version>4.1.66.Final</netty.version>
@@ -160,6 +160,10 @@
                     <groupId>com.github.steveice10</groupId>
                     <artifactId>mcauthlib</artifactId>
                 </exclusion>
+                <exclusion> <!-- TEMPORARY -->
+                    <groupId>net.kyori</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -223,7 +227,20 @@
         </dependency>
         <!-- Adventure text serialization -->
         <dependency>
-            <groupId>net.kyori</groupId>
+            <groupId>com.github.KyoriPowered.adventure</groupId>
+            <artifactId>adventure-text-serializer-gson</artifactId> <!-- TEMPORARY until https://github.com/KyoriPowered/adventure/commit/3d6eaaf63f44ddd981a4b3bbb1e0018aa6252da8 is in release -->
+            <version>${adventure.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.KyoriPowered.adventure</groupId>
+            <artifactId>adventure-text-serializer-gson-legacy-impl</artifactId> <!-- TEMPORARY until https://github.com/KyoriPowered/adventure/commit/3d6eaaf63f44ddd981a4b3bbb1e0018aa6252da8 is in release -->
+            <version>${adventure.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+<!--            <groupId>net.kyori</groupId>-->
+            <groupId>com.github.KyoriPowered.adventure</groupId>
             <artifactId>adventure-text-serializer-legacy</artifactId>
             <version>${adventure.version}</version>
             <scope>compile</scope>
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BasicItemTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BasicItemTranslator.java
index 58d72de0e..b6b1dfac6 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BasicItemTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BasicItemTranslator.java
@@ -56,10 +56,10 @@ public class BasicItemTranslator extends NbtItemStackTranslator {
             return;
         }
 
-        ListTag loreTag = displayTag.get("Lore");
-        if (loreTag != null) {
+        Tag loreTag = displayTag.get("Lore");
+        if (loreTag instanceof ListTag listTag) {
             List<Tag> lore = new ArrayList<>();
-            for (Tag tag : loreTag.getValue()) {
+            for (Tag tag : listTag.getValue()) {
                 if (!(tag instanceof StringTag)) continue;
                 lore.add(new StringTag("", MessageTranslator.convertMessageLenient(((StringTag) tag).getValue(), session.getLocale())));
             }