Fixing EntityChatDataLight, to correctly inflate from the full EntityChatData…

Fixing EntityChatDataLight, to correctly inflate from the full EntityChatData instances, including the current playerData.

src/main/java/com/owlmaddie/chat/ChatDataManager.java

@@ -139,9 +139,7 @@ public class ChatDataManager {
             // Create "light" version of entire chat data HashMap
             HashMap<String, EntityChatDataLight> lightVersionMap = new HashMap<>();
             this.entityChatDataMap.forEach((id, entityChatData) -> lightVersionMap.put(id, entityChatData.toLightVersion(playerId)));
-
-            // Convert light chat data to JSON string
-            return GSON.toJson(lightVersionMap).toString();
+            return GSON.toJson(lightVersionMap);
         } catch (Exception e) {
             // Handle exceptions
             return "";
@@ -153,6 +151,9 @@ public class ChatDataManager {
         File saveFile = new File(server.getSavePath(WorldSavePath.ROOT).toFile(), "chatdata.json");
         LOGGER.info("Saving chat data to " + saveFile.getAbsolutePath());
 
+        // Clean up blank, temp entities in data
+        entityChatDataMap.values().removeIf(entityChatData -> entityChatData.status == ChatStatus.NONE);
+
         try (Writer writer = new OutputStreamWriter(new FileOutputStream(saveFile), StandardCharsets.UTF_8)) {
             GSON.toJson(this.entityChatDataMap, writer);
         } catch (Exception e) {
@@ -172,6 +173,9 @@ public class ChatDataManager {
                 Type type = new TypeToken<ConcurrentHashMap<String, EntityChatData>>(){}.getType();
                 this.entityChatDataMap = GSON.fromJson(reader, type);
 
+                // Clean up blank, temp entities in data
+                entityChatDataMap.values().removeIf(entityChatData -> entityChatData.status == ChatStatus.NONE);
+
                 // Post-process each EntityChatData object
                 for (EntityChatData entityChatData : entityChatDataMap.values()) {
                     entityChatData.postDeserializeInitialization();

src/main/java/com/owlmaddie/chat/EntityChatData.java

@@ -107,6 +107,10 @@ public class EntityChatData {
 
     // Get the player data (or fallback to the blank player)
     public PlayerData getPlayerData(UUID playerId) {
+        if (this.players == null) {
+            return new PlayerData();
+        }
+
         // Check if the playerId exists in the players map
         String playerIdStr = playerId.toString();
         if (this.players.containsKey(playerIdStr)) {
@@ -115,25 +119,12 @@ public class EntityChatData {
             // If the specific player ID is not found, fall back to the "" blank player
             return this.players.get("");
         }
-        return null;
+        return new PlayerData();
     }
 
     // Generate light version of chat data (no previous messages)
     public EntityChatDataLight toLightVersion(UUID playerId) {
-        EntityChatDataLight light = new EntityChatDataLight();
-        light.entityId = this.entityId;
-        light.currentMessage = this.currentMessage;
-        light.currentLineNumber = this.currentLineNumber;
-        light.status = this.status;
-        light.sender = this.sender;
-        PlayerData playerData = this.getPlayerData(playerId);
-        if (playerData != null) {
-            light.friendship = playerData.friendship;
-        } else {
-            light.friendship = 0;
-        }
-
-        return light;
+        return new EntityChatDataLight(this, playerId);
     }
 
     public String getCharacterProp(String propertyName) {

src/main/java/com/owlmaddie/chat/EntityChatDataLight.java

 package com.owlmaddie.chat;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
 /**
  * The {@code EntityChatDataLight} class represents the current displayed message, and no
  * previous messages or player message history. This is primarily used to broadcast the
@@ -11,5 +15,20 @@ public class EntityChatDataLight {
     public int currentLineNumber;
     public ChatDataManager.ChatStatus status;
     public ChatDataManager.ChatSender sender;
-    public int friendship;
+    public Map<String, PlayerData> players;
+
+    // Constructor to initialize the light version from the full version
+    public EntityChatDataLight(EntityChatData fullData, UUID playerId) {
+        this.entityId = fullData.entityId;
+        this.currentMessage = fullData.currentMessage;
+        this.currentLineNumber = fullData.currentLineNumber;
+        this.status = fullData.status;
+        this.sender = fullData.sender;
+
+        // Initialize the players map and add only the current player's data
+        this.players = new HashMap<>();
+        String playerIdStr = playerId.toString();
+        PlayerData playerData = fullData.getPlayerData(playerId);
+        this.players.put(playerIdStr, playerData);
+    }
 }
\ No newline at end of file