From 0178492b593bab466d948409077c71e298cee051 Mon Sep 17 00:00:00 2001
From: Arktisfox <65837019+Arktisfox@users.noreply.github.com>
Date: Mon, 25 May 2020 21:19:37 -0400
Subject: [PATCH] Fix some book translation failures (#661)

Book pages can be sent as plain text rather than JSON. The text library doesn't use lenient parsing, so this fails, and the book isn't visible in the inventory.

This will convert the text into JSON if it's not already, before feeding it to the text library.
---
 .../translators/nbt/BookPagesTranslator.java    |  2 +-
 .../geysermc/connector/utils/MessageUtils.java  | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BookPagesTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BookPagesTranslator.java
index 15279c7a0..e802f0174 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BookPagesTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BookPagesTranslator.java
@@ -55,7 +55,7 @@ public class BookPagesTranslator extends NbtItemStackTranslator {
 
             CompoundTag pageTag = new CompoundTag("");
             pageTag.put(new StringTag("photoname", ""));
-            pageTag.put(new StringTag("text", MessageUtils.getBedrockMessage(textTag.getValue())));
+            pageTag.put(new StringTag("text", MessageUtils.getBedrockMessageLenient(textTag.getValue())));
             pages.add(pageTag);
         }
 
diff --git a/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java b/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java
index 3c924912a..d79cdab82 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java
@@ -137,6 +137,23 @@ public class MessageUtils {
         }
     }
 
+    /**
+     * Verifies the message is valid JSON in case it's plaintext. Works around GsonComponentSeraializer not using lenient mode.
+     * See https://wiki.vg/Chat for messages sent in lenient mode, and for a description on leniency.
+     *
+     * @param message Potentially lenient JSON message
+     * @return Bedrock formatted message
+     */
+    public static String getBedrockMessageLenient(String message) {
+        if (isMessage(message)) {
+            return getBedrockMessage(message);
+        } else {
+            final JsonObject obj = new JsonObject();
+            obj.addProperty("text", message);
+            return getBedrockMessage(obj.toString());
+        }
+    }
+
     public static String getBedrockMessage(String message) {
         Component component = phraseJavaMessage(message);
         return LegacyComponentSerializer.legacy().serialize(component);