JSON book bugfix

Might only work on 1.20.3+ needs testing on older versions.
RockinChaos · Dec 10, 2023 · 7547181 · 7547181
1 parent 00c64f3
commit 7547181
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/main/java/me/RockinChaos/itemjoin/item/ItemDesigner.java b/src/main/java/me/RockinChaos/itemjoin/item/ItemDesigner.java
@@ -510,7 +510,8 @@ private void setJSONBookPages(final ItemMap itemMap) {
             for (String pageString : pagesSection.getKeys(false)) {
                 List<String> pageList = itemMap.getNodeLocation().getStringList(".pages." + pageString);
                 rawPages.add(pageList);
-                StringBuilder textBuilder = new StringBuilder("[\"\"");
+                StringBuilder textBuilder = new StringBuilder("{\"text\":\"\",\"extra\":[");
+                boolean firstIn = true;
                 for (String string : pageList) {
                     Map<Integer, String> JSONBuilder = new HashMap<>();
                     String formatLine = string.replace("\n", "\\n");
@@ -554,15 +555,22 @@ private void setJSONBookPages(final ItemMap itemMap) {
                                     }
                                 }
                             }
-                            textBuilder.append("}," + "{\"text\":\"\\n\",\"color\":\"reset\"}");
+                            textBuilder.append("},{\"text\":\"\\n\"}");
+                            firstIn = false;
                         }
                     } else if (formatLine.contains("raw:")) {
-                        textBuilder.append(formatLine.replace("raw: ", "").replace("raw:", "").replace("[\"\"", "").replace("\"bold\":false}]", "\"bold\":false}").replace("\"bold\":true}]", "\"bold\":true}")).append(",").append("{\"text\":\"\\n\",\"color\":\"reset\"}");
+                        String format = (!firstIn ? "," : "") + formatLine.replace("raw: ", "").replace("raw:", "").replace("[\"\",", "").replace("[\"\"", "").replace("\"bold\":false}]", "\"bold\":false}").replace("\"bold\":true}]", "\"bold\":true}");
+                        if (format.endsWith("]")) {
+                            format = StringUtils.replaceLast(format, "]", "");
+                        }
+                        textBuilder.append(format).append(",{\"text\":\"\\n\"}");
+                        firstIn = false;
                     } else {
-                        textBuilder.append("," + "{\"text\":\"").append(formatLine).append("\"}").append(",").append("{\"text\":\"\\n\",\"color\":\"reset\"}");
+                        textBuilder.append(!firstIn ? "," : "").append("{\"text\":\"").append(formatLine).append("\"},{\"text\":\"\\n\"}");
+                        firstIn = false;
                     }
                 }
-                JSONPages.add(textBuilder + "]");
+                JSONPages.add(textBuilder + "]}");
             }
             itemMap.setPages(JSONPages);
             itemMap.setListPages(rawPages);