Small refactor to playerData args, and a fix to prevent "" blank player from…

Small refactor to playerData args, and a fix to prevent "" blank player from being in every entitychatdata. It should only exist with migrated data. Also made the old legacy JSON properties disappear after saving this new data structure.

src/client/java/com/owlmaddie/network/ClientPackets.java

@@ -113,8 +113,8 @@ public class ClientPackets {
                 MobEntity entity = ClientEntityFinder.getEntityByUUID(client.world, entityId);
                 if (entity != null) {
                     ChatDataManager chatDataManager = ChatDataManager.getClientInstance();
-                    EntityChatData chatData = chatDataManager.getOrCreateChatData(entity.getUuidAsString());
-                    PlayerData playerData = chatData.getPlayerData(playerId);
+                    EntityChatData chatData = chatDataManager.getOrCreateChatData(entity.getUuidAsString(), playerId.toString());
+                    PlayerData playerData = chatData.getPlayerData(playerId.toString());
                     if (!message.isEmpty()) {
                         chatData.currentMessage = message;
                     }

src/client/java/com/owlmaddie/ui/BubbleRenderer.java

@@ -479,8 +479,8 @@ public class BubbleRenderer {
             EntityChatData chatData = null;
             PlayerData playerData = null;
             if (entity instanceof MobEntity) {
-                chatData = ChatDataManager.getClientInstance().getOrCreateChatData(entity.getUuidAsString());
-                playerData = chatData.getPlayerData(player.getUuid());
+                chatData = ChatDataManager.getClientInstance().getOrCreateChatData(entity.getUuidAsString(), player.getUuidAsString());
+                playerData = chatData.getPlayerData(player.getUuidAsString());
             } else if (entity instanceof PlayerEntity) {
                 chatData = PlayerMessageManager.getMessage(entity.getUuid());
             }

src/client/java/com/owlmaddie/ui/ClickHandler.java

@@ -120,7 +120,7 @@ public class ClickHandler {
             MobEntity closestEntity = ClientEntityFinder.getEntityByUUID(client.world, closestEntityUUID);
             if (closestEntity != null) {
                 // Look-up conversation
-                EntityChatData chatData = ChatDataManager.getClientInstance().getOrCreateChatData(closestEntityUUID.toString());
+                EntityChatData chatData = ChatDataManager.getClientInstance().getOrCreateChatData(closestEntityUUID.toString(), player.getUuidAsString());
 
                 // Determine area clicked inside chat bubble (top, left, right)
                 String hitRegion = determineHitRegion(closestHitResult.get(), closestBubbleData.position, camera, closestBubbleData.height);

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

@@ -77,8 +77,8 @@ public class ChatDataManager {
     }
 
     // Retrieve chat data for a specific entity, or create it if it doesn't exist
-    public EntityChatData getOrCreateChatData(String entityId) {
-        return entityChatDataMap.computeIfAbsent(entityId, k -> new EntityChatData(entityId, ""));
+    public EntityChatData getOrCreateChatData(String entityId, String playerId) {
+        return entityChatDataMap.computeIfAbsent(entityId, k -> new EntityChatData(entityId, playerId));
     }
 
     // Update the UUID in the map (i.e. bucketed entity and then released, changes their UUID)

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

 package com.owlmaddie.chat;
 
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
 import com.owlmaddie.commands.ConfigurationHandler;
 import com.owlmaddie.controls.SpeedControls;
 import com.owlmaddie.goals.*;
@@ -21,16 +23,13 @@ import net.minecraft.village.VillageGossipType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import com.google.gson.annotations.SerializedName;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * The {@code EntityChatData} class represents a conversation between an
@@ -48,16 +47,16 @@ public class EntityChatData {
     public int auto_generated;
 
     @SerializedName("playerId")
+    @Expose(serialize = false)
     private String legacyPlayerId;
 
     @SerializedName("previousMessages")
+    @Expose(serialize = false)
     public List<ChatMessage> legacyMessages;
 
     @SerializedName("friendship")
-    public int legacyFriendship;
-
-    public String birthDate;
-    public String deathDate;
+    @Expose(serialize = false)
+    public Integer legacyFriendship;
 
     // The map to store data for each player interacting with this entity
     public Map<String, PlayerData> players;
@@ -65,7 +64,9 @@ public class EntityChatData {
     public EntityChatData(String entityId, String playerId) {
         this.entityId = entityId;
         this.players = new HashMap<>();
-        this.players.put("", new PlayerData()); // Add default blank player
+        if (!playerId.isEmpty()) {
+            this.players.put(playerId, new PlayerData());
+        }
         this.currentMessage = "";
         this.currentLineNumber = 0;
         this.characterSheet = "";
@@ -73,8 +74,9 @@ public class EntityChatData {
         this.sender = ChatDataManager.ChatSender.USER;
         this.auto_generated = 0;
 
-        this.legacyFriendship = 0;
-        this.legacyMessages = new ArrayList<>();
+        this.legacyPlayerId = null;
+        this.legacyMessages = null;
+        this.legacyFriendship = null;
     }
 
     // Post-deserialization initialization
@@ -82,14 +84,13 @@ public class EntityChatData {
         if (this.players == null) {
             this.players = new HashMap<>(); // Ensure players map is initialized
         }
-        this.players.computeIfAbsent("", k -> new PlayerData());
         if (this.legacyPlayerId != null && !this.legacyPlayerId.isEmpty()) {
-            this.migrateData(this.legacyPlayerId);
+            this.migrateData();
         }
     }
 
     // Migrate old data into the new structure
-    private void migrateData(String oldPlayerId) {
+    private void migrateData() {
         // Ensure the blank player data entry exists
         PlayerData blankPlayerData = this.players.computeIfAbsent("", k -> new PlayerData());
 
@@ -102,25 +103,29 @@ public class EntityChatData {
         // Clean up old player data
         this.legacyPlayerId = null;
         this.legacyMessages = null;
-        this.legacyFriendship = 0;
+        this.legacyFriendship = null;
     }
 
     // Get the player data (or fallback to the blank player)
-    public PlayerData getPlayerData(UUID playerId) {
+    public PlayerData getPlayerData(String 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)) {
-            return this.players.get(playerIdStr);
-        } else if (this.players.containsKey("")) {
-            // If the specific player ID is not found, fall back to the "" blank player
+        if (this.players.containsKey("")) {
+            // If a blank migrated legacy entity is found, always return this
             return this.players.get("");
-        }
+
+        } else if (this.players.containsKey(playerId)) {
+            // Return a specific player's data
+            return this.players.get(playerId);
+
+        } else {
+            // Return a blank player data
             return new PlayerData();
         }
+    }
 
     // Generate light version of chat data (no previous messages)
     public EntityChatDataLight toLightVersion(UUID playerId) {
@@ -211,7 +216,7 @@ public class EntityChatData {
         contextData.put("entity_skills", getCharacterProp("Skills"));
         contextData.put("entity_background", getCharacterProp("Background"));
 
-        PlayerData playerData = this.getPlayerData(player.getUuid());
+        PlayerData playerData = this.getPlayerData(player.getUuidAsString());
         if (playerData != null) {
             contextData.put("entity_friendship", String.valueOf(playerData.friendship));
         } else {
@@ -248,7 +253,7 @@ public class EntityChatData {
         String promptText = ChatPrompt.loadPromptFromResource(ServerPackets.serverInstance.getResourceManager(), systemPrompt);
 
         // Get messages for player
-        PlayerData playerData = this.getPlayerData(player.getUuid());
+        PlayerData playerData = this.getPlayerData(player.getUuidAsString());
 
         // fetch HTTP response from ChatGPT
         ChatGPTRequest.fetchMessageFromChatGPT(config, promptText, contextData, playerData.messages, false).thenAccept(output_message -> {
@@ -439,7 +444,7 @@ public class EntityChatData {
         String truncatedMessage = message.substring(0, Math.min(message.length(), ChatDataManager.MAX_CHAR_IN_USER_MESSAGE));
 
         // Get or create player data
-        PlayerData playerData = getPlayerData(playerId);
+        PlayerData playerData = getPlayerData(playerId.toString());
 
         // Add message to history
         playerData.messages.add(new ChatMessage(truncatedMessage, messageSender));

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

@@ -28,7 +28,7 @@ public class EntityChatDataLight {
         // 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);
+        PlayerData playerData = fullData.getPlayerData(playerId.toString());
         this.players.put(playerIdStr, playerData);
     }
 }
\ No newline at end of file

src/main/java/com/owlmaddie/goals/LeadPlayerGoal.java

@@ -72,7 +72,7 @@ public class LeadPlayerGoal extends PlayerBaseGoal {
                 String arrivedMessage = "<You have arrived at your destination>";
 
                 ChatDataManager chatDataManager = ChatDataManager.getServerInstance();
-                EntityChatData chatData = chatDataManager.getOrCreateChatData(this.entity.getUuidAsString());
+                EntityChatData chatData = chatDataManager.getOrCreateChatData(this.entity.getUuidAsString(), this.targetEntity.getUuidAsString());
                 if (!chatData.characterSheet.isEmpty() && chatData.auto_generated < chatDataManager.MAX_AUTOGENERATE_RESPONSES) {
                     ServerPackets.generate_chat("N/A", chatData, (ServerPlayerEntity) this.targetEntity, this.entity, arrivedMessage, true);
                 }

src/main/java/com/owlmaddie/mixin/MixinLivingEntity.java

@@ -23,17 +23,17 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 @Mixin(LivingEntity.class)
 public class MixinLivingEntity {
 
-    private EntityChatData getChatData(LivingEntity entity) {
+    private EntityChatData getChatData(LivingEntity entity, PlayerEntity player) {
         ChatDataManager chatDataManager = ChatDataManager.getServerInstance();
-        return chatDataManager.getOrCreateChatData(entity.getUuidAsString());
+        return chatDataManager.getOrCreateChatData(entity.getUuidAsString(), player.getUuidAsString());
     }
 
     @Inject(method = "canTarget(Lnet/minecraft/entity/LivingEntity;)Z", at = @At("HEAD"), cancellable = true)
     private void modifyCanTarget(LivingEntity target, CallbackInfoReturnable<Boolean> cir) {
         if (target instanceof PlayerEntity) {
             LivingEntity thisEntity = (LivingEntity) (Object) this;
-            EntityChatData entityData = getChatData(thisEntity);
-            PlayerData playerData = entityData.getPlayerData(target.getUuid());
+            EntityChatData entityData = getChatData(thisEntity, (PlayerEntity) target);
+            PlayerData playerData = entityData.getPlayerData(target.getUuidAsString());
             if (playerData.friendship > 0) {
                 // Friendly creatures can't target a player
                 cir.setReturnValue(false);
@@ -56,11 +56,11 @@ public class MixinLivingEntity {
         if (attacker instanceof PlayerEntity && thisEntity instanceof MobEntity && !thisEntity.isDead()) {
             // Generate attacked message (only if the previous user message was not an attacked message)
             // We don't want to constantly generate messages during a prolonged, multi-damage event
-            EntityChatData chatData = getChatData(thisEntity);
+            ServerPlayerEntity player = (ServerPlayerEntity) attacker;
+            EntityChatData chatData = getChatData(thisEntity, player);
             if (!chatData.characterSheet.isEmpty() && chatData.auto_generated < ChatDataManager.MAX_AUTOGENERATE_RESPONSES) {
                 // Only auto-generate a response to being attacked if chat data already exists
                 // and this is the first attack event.
-                ServerPlayerEntity player = (ServerPlayerEntity) attacker;
                 ItemStack weapon = player.getMainHandStack();
                 String weaponName = weapon.isEmpty() ? "with fists" : "with " + weapon.getItem().toString();
 

src/main/java/com/owlmaddie/mixin/MixinMobEntity.java

@@ -54,8 +54,8 @@ public class MixinMobEntity {
 
         // Get chat data for entity
         ChatDataManager chatDataManager = ChatDataManager.getServerInstance();
-        EntityChatData entityData = chatDataManager.getOrCreateChatData(thisEntity.getUuidAsString());
-        PlayerData playerData = entityData.getPlayerData(player.getUuid());
+        EntityChatData entityData = chatDataManager.getOrCreateChatData(thisEntity.getUuidAsString(), player.getUuidAsString());
+        PlayerData playerData = entityData.getPlayerData(player.getUuidAsString());
 
         // Check if the player successfully interacts with an item
         if (player instanceof ServerPlayerEntity) {

src/main/java/com/owlmaddie/network/ServerPackets.java

@@ -65,7 +65,7 @@ public class ServerPackets {
             server.execute(() -> {
                 MobEntity entity = (MobEntity)ServerEntityFinder.getEntityByUUID(player.getServerWorld(), entityId);
                 if (entity != null) {
-                    EntityChatData chatData = ChatDataManager.getServerInstance().getOrCreateChatData(entity.getUuidAsString());
+                    EntityChatData chatData = ChatDataManager.getServerInstance().getOrCreateChatData(entity.getUuidAsString(), player.getUuidAsString());
                     if (chatData.characterSheet.isEmpty()) {
                         generate_character(userLanguage, chatData, player, entity);
                     }
@@ -86,7 +86,7 @@ public class ServerPackets {
                     TalkPlayerGoal talkGoal = new TalkPlayerGoal(player, entity, 3.5F);
                     EntityBehaviorManager.addGoal(entity, talkGoal, GoalPriority.TALK_PLAYER);
 
-                    EntityChatData chatData = ChatDataManager.getServerInstance().getOrCreateChatData(entity.getUuidAsString());
+                    EntityChatData chatData = ChatDataManager.getServerInstance().getOrCreateChatData(entity.getUuidAsString(), player.getUuidAsString());
                     LOGGER.debug("Update read lines to " + lineNumber + " for: " + entity.getType().toString());
                     chatData.setLineNumber(lineNumber);
                 }
@@ -106,7 +106,7 @@ public class ServerPackets {
                     TalkPlayerGoal talkGoal = new TalkPlayerGoal(player, entity, 3.5F);
                     EntityBehaviorManager.addGoal(entity, talkGoal, GoalPriority.TALK_PLAYER);
 
-                    EntityChatData chatData = ChatDataManager.getServerInstance().getOrCreateChatData(entity.getUuidAsString());
+                    EntityChatData chatData = ChatDataManager.getServerInstance().getOrCreateChatData(entity.getUuidAsString(), player.getUuidAsString());
                     LOGGER.debug("Hiding chat bubble for: " + entity.getType().toString());
                     chatData.setStatus(ChatDataManager.ChatStatus.valueOf(status_name));
                 }
@@ -150,7 +150,7 @@ public class ServerPackets {
             server.execute(() -> {
                 MobEntity entity = (MobEntity)ServerEntityFinder.getEntityByUUID(player.getServerWorld(), entityId);
                 if (entity != null) {
-                    EntityChatData chatData = ChatDataManager.getServerInstance().getOrCreateChatData(entity.getUuidAsString());
+                    EntityChatData chatData = ChatDataManager.getServerInstance().getOrCreateChatData(entity.getUuidAsString(), player.getUuidAsString());
                     if (chatData.characterSheet.isEmpty()) {
                         generate_character(userLanguage, chatData, player, entity);
                     } else {
@@ -318,7 +318,7 @@ public class ServerPackets {
                 // Iterate over all players and send the packet
                 for (ServerPlayerEntity player : serverInstance.getPlayerManager().getPlayerList()) {
 
-                    PlayerData playerData = chatData.getPlayerData(player.getUuid());
+                    PlayerData playerData = chatData.getPlayerData(player.getUuidAsString());
                     PacketByteBuf buffer = new PacketByteBuf(Unpooled.buffer());
 
                     // Write the entity's chat updated data