From 504018b9f80b2064abcc1e868a85834d09222e47 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Sat, 2 Aug 2025 23:30:59 +0200 Subject: [PATCH] NightJson: expand maps --- src/main/java/eu/midnightdust/yaytris/util/NightJson.java | 7 ++++--- tetris_scores.json5 | 7 ++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/midnightdust/yaytris/util/NightJson.java b/src/main/java/eu/midnightdust/yaytris/util/NightJson.java index ea6c2e7..0fbc5cc 100644 --- a/src/main/java/eu/midnightdust/yaytris/util/NightJson.java +++ b/src/main/java/eu/midnightdust/yaytris/util/NightJson.java @@ -79,8 +79,9 @@ public class NightJson { while (it.hasNext()) { Object key = it.next(); Object val = map.get(key); + mapPairs.append("\n\t\t"); mapPairs.append(String.format("%s: %s", objToString(key, key.getClass()), objToString(val, val.getClass()))); - mapPairs.append(it.hasNext() ? "," : "}"); + mapPairs.append(it.hasNext() ? "," : "\n\t}"); } return mapPairs.toString(); } @@ -153,9 +154,9 @@ public class NightJson { return jsonToMap(String.valueOf(submapString), k -> field.isPresent() ? getTypeArgument(field.get(), 1) : String.class); } else { - if (val.startsWith(" ")) val = val.substring(1); + while (val.startsWith(" ")) val = val.substring(1); val = val.replaceAll("[\"}\n]", ""); - if (val.endsWith(",")) val = val.substring(0, val.length() - 1); + while (val.endsWith(",") || val.endsWith("\n") || val.endsWith("\t")) val = val.substring(0, val.length() - 1); return stringToObj(val, keyToType.apply(key)); } diff --git a/tetris_scores.json5 b/tetris_scores.json5 index d35a8e2..0d66331 100644 --- a/tetris_scores.json5 +++ b/tetris_scores.json5 @@ -1,3 +1,8 @@ { - "scores": {"Martin": 6401} + "scores": { + "Marrrtin": 2648, + "Marrtin": 623, + "Martin": 147, + "Mark": 84 + } } \ No newline at end of file