From 49b20e37cb6e623ab8b0a49db2d79c2eb4f61372 Mon Sep 17 00:00:00 2001
From: mmxw11 <mmxw11@users.noreply.github.com>
Date: Fri, 22 Sep 2017 17:16:04 +0300
Subject: [PATCH] Properly format book data

---
 .../protocol1_9to1_8/ItemRewriter.java        | 35 +++++++++++++++++++
 .../packets/PlayerPackets.java                |  3 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ItemRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ItemRewriter.java
index de1472f90..17df9b020 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ItemRewriter.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ItemRewriter.java
@@ -186,6 +186,41 @@ public class ItemRewriter {
             }
         }
     }
+    
+    public static void rewriteBookToServer(Item item) {
+        short id = item.getId();
+        if (id != 387) {
+            return;
+        }
+        CompoundTag tag = item.getTag();
+        ListTag pages = tag.get("pages");
+        if (pages == null) { // is this even possible?
+            return;
+        }
+        for (int i = 0; i < pages.size(); i++) {
+            Tag pageTag = pages.get(i);
+            if (!(pageTag instanceof StringTag)) {
+                continue;
+            }
+            StringTag stag = (StringTag) pageTag;
+            String value = stag.getValue();
+            if (value.replaceAll(" ", "").isEmpty()) {
+                value = "\"" + fixBookSpaceChars(value) + "\"";
+            } else {
+                value = fixBookSpaceChars(value);
+            }
+            stag.setValue(value);
+        }
+    }
+    
+    private static String fixBookSpaceChars(String str) {
+        if (!str.startsWith(" ")) {
+            return str;
+        }
+        // hacky but it works :)
+        str = "\u00A7r" + str;
+        return str;
+    }
 
     public static void toClient(Item item) {
         if (item != null) {
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/PlayerPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/PlayerPackets.java
index 0a0c03758..e83969b50 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/PlayerPackets.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/PlayerPackets.java
@@ -500,8 +500,9 @@ public class PlayerPackets {
                         String name = wrapper.get(Type.STRING, 0);
                         if (name.equalsIgnoreCase("MC|BSign")) {
                             Item item = wrapper.passthrough(Type.ITEM);
-                            if (item != null) {
+                            if (item != null) { //TODO: HERE
                                 item.setId((short) 387); // Written Book
+                                ItemRewriter.rewriteBookToServer(item);
                             }
                         }
                         if (name.equalsIgnoreCase("MC|AutoCmd")) {