🐛 Fixed formatting incorrectly putting , at the end of lists rather than as separators.

Author: ImBit

src/client/java/xyz/bitsquidd/ninja/format/FormatHelper.java

@@ -3,6 +3,7 @@
 import net.minecraft.core.BlockPos;
 import org.jspecify.annotations.NullMarked;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -23,4 +24,28 @@ public static String formatPosition(final BlockPos pos) {
     public static String formatRotation(final float pitch, final float yaw) {
         return String.format("[Pitch;%.1f Yaw;%.1f]", pitch, yaw);
     }
+
+    public static String formatList(Collection<?> entries, int maxEntries) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("[");
+
+        List<String> entriesList = entries.stream().map(Object::toString).toList();
+        int size = entriesList.size();
+
+        boolean tooMany = size > maxEntries;
+        int displayed = Math.min(size, maxEntries);
+
+        for (int i = 0; i < displayed; i++) {
+            if (i > 0) sb.append(",");
+            sb.append(entriesList.get(i));
+        }
+
+        if (tooMany) {
+            sb.append("...+").append(size - maxEntries).append(" more]");
+        } else {
+            sb.append("]");
+        }
+
+        return sb.toString();
+    }
 }

src/client/java/xyz/bitsquidd/ninja/handler/PacketHandler.java

@@ -5,12 +5,9 @@
 
 import xyz.bitsquidd.ninja.format.PacketInfoBundle;
 
-import java.util.Collection;
-import java.util.List;
-
 @NullMarked
 public abstract class PacketHandler<T extends Packet<?>> {
-    private static final int MAX_DISPLAYED_ENTRIES = 5;
+    protected static final int MAX_DISPLAYED_ENTRIES = 5;
 
 
     protected final Class<T> packetClass;
@@ -53,30 +50,4 @@ public final PacketInfoBundle getPacketInfo(Packet<?> packet) {
 
     protected abstract PacketInfoBundle getPacketInfoInternal(T packet);
 
-
-    // Helper functions:
-    protected final String formatList(Collection<?> entries) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("[");
-
-        List<String> entriesList = entries.stream().map(Object::toString).toList();
-        int size = entriesList.size();
-
-        boolean tooMany = size > MAX_DISPLAYED_ENTRIES;
-
-        for (int i = 0; i < MAX_DISPLAYED_ENTRIES; i++) {
-            if (i >= size) break;
-            sb.append(entriesList.get(i));
-            if (i > 0) sb.append(",");
-        }
-
-        if (tooMany) {
-            sb.append("...+").append(size - MAX_DISPLAYED_ENTRIES).append(" more]");
-        } else {
-            sb.append("]");
-        }
-
-        return sb.toString();
-    }
-
 }

src/client/java/xyz/bitsquidd/ninja/handler/impl/clientbound/RemoveEntitiesHandler.java

@@ -4,6 +4,7 @@
 import net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket;
 import org.jetbrains.annotations.NotNull;
 
+import xyz.bitsquidd.ninja.format.FormatHelper;
 import xyz.bitsquidd.ninja.format.PacketInfoBundle;
 import xyz.bitsquidd.ninja.format.PacketInfoSegment;
 import xyz.bitsquidd.ninja.handler.PacketHandler;
@@ -23,7 +24,7 @@ public RemoveEntitiesHandler() {
 
     @Override
     protected @NotNull PacketInfoBundle getPacketInfoInternal(ClientboundRemoveEntitiesPacket packet) {
-        String removedEntityIdList = formatList(packet.getEntityIds().stream().toList());
+        String removedEntityIdList = FormatHelper.formatList(packet.getEntityIds().stream().toList(), MAX_DISPLAYED_ENTRIES);
 
         return PacketInfoBundle.of(
               packetType,

src/client/java/xyz/bitsquidd/ninja/handler/impl/clientbound/SetPassengersHandler.java

@@ -4,6 +4,7 @@
 import net.minecraft.network.protocol.game.ClientboundSetPassengersPacket;
 import org.jetbrains.annotations.NotNull;
 
+import xyz.bitsquidd.ninja.format.FormatHelper;
 import xyz.bitsquidd.ninja.format.PacketInfoBundle;
 import xyz.bitsquidd.ninja.format.PacketInfoSegment;
 import xyz.bitsquidd.ninja.handler.PacketHandler;
@@ -25,7 +26,7 @@ public SetPassengersHandler() {
 
     @Override
     protected @NotNull PacketInfoBundle getPacketInfoInternal(ClientboundSetPassengersPacket packet) {
-        String passengerIdList = formatList(packet.getPassengers().length > 0 ? Arrays.stream(packet.getPassengers()).boxed().toList() : List.of());
+        String passengerIdList = FormatHelper.formatList(packet.getPassengers().length > 0 ? Arrays.stream(packet.getPassengers()).boxed().toList() : List.of(), MAX_DISPLAYED_ENTRIES);
 
         return PacketInfoBundle.of(
               packetType,

src/client/java/xyz/bitsquidd/ninja/handler/impl/clientbound/SetPlayerTeamHandler.java

@@ -4,6 +4,7 @@
 import net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket;
 import org.jetbrains.annotations.NotNull;
 
+import xyz.bitsquidd.ninja.format.FormatHelper;
 import xyz.bitsquidd.ninja.format.PacketInfoBundle;
 import xyz.bitsquidd.ninja.format.PacketInfoSegment;
 import xyz.bitsquidd.ninja.handler.PacketHandler;
@@ -36,7 +37,7 @@ public SetPlayerTeamHandler() {
         segments.add(PacketInfoSegment.of(Component.text("PlayerAction"), Component.text(playerAction != null ? playerAction.name() : "null")));
 
         if (!packet.getPlayers().isEmpty()) {
-            segments.add(PacketInfoSegment.of(Component.text("Players"), Component.text(formatList(packet.getPlayers()))));
+            segments.add(PacketInfoSegment.of(Component.text("Players"), Component.text(FormatHelper.formatList(packet.getPlayers(), MAX_DISPLAYED_ENTRIES))));
         }
 
         packet.getParameters().ifPresent(params -> {