From 0105ee95a2aadf141f5f606bd0a739ae462c22af Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+ChomeNS@users.noreply.github.com>
Date: Sat, 24 May 2025 18:13:48 +0700
Subject: [PATCH] refactor: improve comma adding in SNBTUtilities

---
 build-number.txt                               |  2 +-
 .../chomens_bot/util/SNBTUtilities.java        | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/build-number.txt b/build-number.txt
index 0e8a4ef4..4dbebb27 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-3295
\ No newline at end of file
+3297
\ No newline at end of file
diff --git a/src/main/java/me/chayapak1/chomens_bot/util/SNBTUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/SNBTUtilities.java
index 4d0727c7..56ba851e 100644
--- a/src/main/java/me/chayapak1/chomens_bot/util/SNBTUtilities.java
+++ b/src/main/java/me/chayapak1/chomens_bot/util/SNBTUtilities.java
@@ -1,5 +1,6 @@
 package me.chayapak1.chomens_bot.util;
 
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import net.kyori.adventure.text.Component;
@@ -57,16 +58,14 @@ public class SNBTUtilities {
         } else if (json.isJsonArray()) {
             final StringBuilder stringBuilder = new StringBuilder(BEGIN_ARRAY);
 
-            boolean notEmpty = false;
+            final JsonArray array = json.getAsJsonArray();
 
-            for (final JsonElement element : json.getAsJsonArray()) {
-                notEmpty = true;
+            int i = 1;
+            for (final JsonElement element : array) {
                 stringBuilder.append(fromJson(element));
-                stringBuilder.append(COMMA);
+                if (i++ != array.size()) stringBuilder.append(COMMA);
             }
 
-            if (notEmpty) stringBuilder.deleteCharAt(stringBuilder.length() - 1); // removes comma
-
             stringBuilder.append(END_ARRAY);
 
             return stringBuilder.toString();
@@ -75,15 +74,14 @@ public class SNBTUtilities {
 
             final Set<Map.Entry<String, JsonElement>> entries = json.getAsJsonObject().entrySet();
 
+            int i = 1;
             for (final Map.Entry<String, JsonElement> entry : entries) {
                 stringBuilder.append(entry.getKey()) // no escape :O (optional for adventure)
                         .append(COLON)
-                        .append(fromJson(entry.getValue()))
-                        .append(COMMA);
+                        .append(fromJson(entry.getValue()));
+                if (i++ != entries.size()) stringBuilder.append(COMMA);
             }
 
-            if (!entries.isEmpty()) stringBuilder.deleteCharAt(stringBuilder.length() - 1); // removes comma
-
             stringBuilder.append(END_OBJECT);
 
             return stringBuilder.toString();