Large refactor of EntityChatData, EntityChatDataLight, and ChatDataManager.…

Large refactor of EntityChatData, EntityChatDataLight, and ChatDataManager. Separating these into smaller, individual files, to make it easier to maintain.

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

@@ -3,6 +3,7 @@ package com.owlmaddie.network;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.owlmaddie.chat.ChatDataManager;
+import com.owlmaddie.chat.EntityChatData;
 import com.owlmaddie.ui.BubbleRenderer;
 import com.owlmaddie.ui.PlayerMessageManager;
 import com.owlmaddie.utils.ClientEntityFinder;
@@ -111,7 +112,7 @@ public class ClientPackets {
                 MobEntity entity = ClientEntityFinder.getEntityByUUID(client.world, entityId);
                 if (entity != null) {
                     ChatDataManager chatDataManager = ChatDataManager.getClientInstance();
-                    ChatDataManager.EntityChatData chatData = chatDataManager.getOrCreateChatData(entity.getUuidAsString());
+                    EntityChatData chatData = chatDataManager.getOrCreateChatData(entity.getUuidAsString());
                     chatData.playerId = playerIdStr;
                     if (!message.isEmpty()) {
                         chatData.currentMessage = message;
@@ -161,7 +162,7 @@ public class ClientPackets {
 
                     // Parse JSON and update client chat data
                     Gson GSON = new Gson();
-                    Type type = new TypeToken<ConcurrentHashMap<String, ChatDataManager.EntityChatData>>(){}.getType();
+                    Type type = new TypeToken<ConcurrentHashMap<String, EntityChatData>>(){}.getType();
                     ChatDataManager.getClientInstance().entityChatDataMap = GSON.fromJson(chatDataJSON, type);
 
                     // Clear receivedChunks for future use

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

@@ -2,6 +2,7 @@ package com.owlmaddie.ui;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.owlmaddie.chat.ChatDataManager;
+import com.owlmaddie.chat.EntityChatData;
 import com.owlmaddie.utils.EntityHeights;
 import com.owlmaddie.utils.EntityRendererAccessor;
 import com.owlmaddie.utils.TextureLoader;
@@ -470,7 +471,7 @@ public class BubbleRenderer {
             Matrix4f matrix = matrices.peek().getPositionMatrix();
 
             // Look-up greeting (if any)
-            ChatDataManager.EntityChatData chatData = null;
+            EntityChatData chatData = null;
             if (entity instanceof MobEntity) {
                 chatData = ChatDataManager.getClientInstance().getOrCreateChatData(entity.getUuidAsString());
             } else if (entity instanceof PlayerEntity) {

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

 package com.owlmaddie.ui;
 
 import com.owlmaddie.chat.ChatDataManager;
+import com.owlmaddie.chat.EntityChatData;
 import com.owlmaddie.network.ClientPackets;
 import com.owlmaddie.utils.ClientEntityFinder;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
@@ -119,7 +120,7 @@ public class ClickHandler {
             MobEntity closestEntity = ClientEntityFinder.getEntityByUUID(client.world, closestEntityUUID);
             if (closestEntity != null) {
                 // Look-up conversation
-                ChatDataManager.EntityChatData chatData = ChatDataManager.getClientInstance().getOrCreateChatData(closestEntityUUID.toString());
+                EntityChatData chatData = ChatDataManager.getClientInstance().getOrCreateChatData(closestEntityUUID.toString());
 
                 // Determine area clicked inside chat bubble (top, left, right)
                 String hitRegion = determineHitRegion(closestHitResult.get(), closestBubbleData.position, camera, closestBubbleData.height);

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

 package com.owlmaddie.ui;
 
 import com.owlmaddie.chat.ChatDataManager;
+import com.owlmaddie.chat.EntityChatData;
+
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -8,7 +10,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * many ticks to remain visible, and the message to display. Similar to an EntityChatData, but
  * much simpler.
  */
-public class PlayerMessage extends ChatDataManager.EntityChatData {
+public class PlayerMessage extends EntityChatData {
     public AtomicInteger tickCountdown;
 
     public PlayerMessage(String playerId, String messageText, int ticks) {

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

@@ -118,7 +118,7 @@ public class ChatGPTRequest {
         return (int) Math.round(text.length() / 3.5);
     }
 
-    public static CompletableFuture<String> fetchMessageFromChatGPT(ConfigurationHandler.Config config, String systemPrompt, Map<String, String> contextData, List<ChatDataManager.ChatMessage> messageHistory, Boolean jsonMode) {
+    public static CompletableFuture<String> fetchMessageFromChatGPT(ConfigurationHandler.Config config, String systemPrompt, Map<String, String> contextData, List<ChatMessage> messageHistory, Boolean jsonMode) {
         // Init API & LLM details
         String apiUrl = config.getUrl();
         String apiKey = config.getApiKey();
@@ -151,7 +151,7 @@ public class ChatGPTRequest {
 
                 // Iterate backwards through the message history
                 for (int i = messageHistory.size() - 1; i >= 0; i--) {
-                    ChatDataManager.ChatMessage chatMessage = messageHistory.get(i);
+                    ChatMessage chatMessage = messageHistory.get(i);
                     String senderName = chatMessage.sender.toString().toLowerCase(Locale.ENGLISH);
                     String messageText = replacePlaceholders(chatMessage.message, contextData);
                     int messageTokens = estimateTokenSize(senderName + ": " + messageText);

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

+package com.owlmaddie.chat;
+
+/**
+ * The {@code ChatMessage} class represents a single message.
+ */
+public class ChatMessage {
+    public String message;
+    public ChatDataManager.ChatSender sender;
+
+    public ChatMessage(String message, ChatDataManager.ChatSender sender) {
+        this.message = message;
+        this.sender = sender;
+    }
+}
\ No newline at end of file

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

+package com.owlmaddie.chat;
+
+/**
+ * The {@code EntityChatDataLight} class represents the current displayed message, and no
+ * previous messages or player message history. This is primarily used to broadcast the
+ * currently displayed messages to players as they connect to the server.
+ */
+public class EntityChatDataLight {
+    public String entityId;
+    public String currentMessage;
+    public int currentLineNumber;
+    public ChatDataManager.ChatStatus status;
+    public ChatDataManager.ChatSender sender;
+    public int friendship;
+}
\ No newline at end of file

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

 package com.owlmaddie.goals;
 
 import com.owlmaddie.chat.ChatDataManager;
+import com.owlmaddie.chat.EntityChatData;
 import com.owlmaddie.controls.LookControls;
 import com.owlmaddie.network.ServerPackets;
 import com.owlmaddie.utils.RandomTargetFinder;
@@ -71,7 +72,7 @@ public class LeadPlayerGoal extends PlayerBaseGoal {
                 String arrivedMessage = "<You have arrived at your destination>";
 
                 ChatDataManager chatDataManager = ChatDataManager.getServerInstance();
-                ChatDataManager.EntityChatData chatData = chatDataManager.getOrCreateChatData(this.entity.getUuidAsString());
+                EntityChatData chatData = chatDataManager.getOrCreateChatData(this.entity.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

 package com.owlmaddie.mixin;
 
 import com.owlmaddie.chat.ChatDataManager;
+import com.owlmaddie.chat.EntityChatData;
 import com.owlmaddie.network.ServerPackets;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
@@ -21,7 +22,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 @Mixin(LivingEntity.class)
 public class MixinLivingEntity {
 
-    private ChatDataManager.EntityChatData getChatData(LivingEntity entity) {
+    private EntityChatData getChatData(LivingEntity entity) {
         ChatDataManager chatDataManager = ChatDataManager.getServerInstance();
         return chatDataManager.getOrCreateChatData(entity.getUuidAsString());
     }
@@ -30,7 +31,7 @@ public class MixinLivingEntity {
     private void modifyCanTarget(LivingEntity target, CallbackInfoReturnable<Boolean> cir) {
         if (target instanceof PlayerEntity) {
             LivingEntity thisEntity = (LivingEntity) (Object) this;
-            ChatDataManager.EntityChatData chatData = getChatData(thisEntity);
+            EntityChatData chatData = getChatData(thisEntity);
             if (chatData.friendship > 0) {
                 // Friendly creatures can't target a player
                 cir.setReturnValue(false);
@@ -53,7 +54,7 @@ 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
-            ChatDataManager.EntityChatData chatData = getChatData(thisEntity);
+            EntityChatData chatData = getChatData(thisEntity);
             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.

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

 package com.owlmaddie.mixin;
 
 import com.owlmaddie.chat.ChatDataManager;
+import com.owlmaddie.chat.EntityChatData;
 import com.owlmaddie.network.ServerPackets;
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.entity.passive.TameableEntity;
@@ -52,7 +53,7 @@ public class MixinMobEntity {
 
         // Get chat data for entity
         ChatDataManager chatDataManager = ChatDataManager.getServerInstance();
-        ChatDataManager.EntityChatData chatData = chatDataManager.getOrCreateChatData(thisEntity.getUuidAsString());
+        EntityChatData chatData = chatDataManager.getOrCreateChatData(thisEntity.getUuidAsString());
 
         // Check if the player successfully interacts with an item
         if (player instanceof ServerPlayerEntity) {

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

 package com.owlmaddie.network;
 
 import com.owlmaddie.chat.ChatDataManager;
+import com.owlmaddie.chat.EntityChatData;
 import com.owlmaddie.chat.ChatDataSaverScheduler;
 import com.owlmaddie.commands.ConfigurationHandler;
 import com.owlmaddie.goals.EntityBehaviorManager;
@@ -63,7 +64,7 @@ public class ServerPackets {
             server.execute(() -> {
                 MobEntity entity = (MobEntity)ServerEntityFinder.getEntityByUUID(player.getServerWorld(), entityId);
                 if (entity != null) {
-                    ChatDataManager.EntityChatData chatData = ChatDataManager.getServerInstance().getOrCreateChatData(entity.getUuidAsString());
+                    EntityChatData chatData = ChatDataManager.getServerInstance().getOrCreateChatData(entity.getUuidAsString());
                     if (chatData.characterSheet.isEmpty()) {
                         generate_character(userLanguage, chatData, player, entity);
                     }
@@ -84,7 +85,7 @@ public class ServerPackets {
                     TalkPlayerGoal talkGoal = new TalkPlayerGoal(player, entity, 3.5F);
                     EntityBehaviorManager.addGoal(entity, talkGoal, GoalPriority.TALK_PLAYER);
 
-                    ChatDataManager.EntityChatData chatData = ChatDataManager.getServerInstance().getOrCreateChatData(entity.getUuidAsString());
+                    EntityChatData chatData = ChatDataManager.getServerInstance().getOrCreateChatData(entity.getUuidAsString());
                     LOGGER.debug("Update read lines to " + lineNumber + " for: " + entity.getType().toString());
                     chatData.setLineNumber(lineNumber);
                 }
@@ -104,7 +105,7 @@ public class ServerPackets {
                     TalkPlayerGoal talkGoal = new TalkPlayerGoal(player, entity, 3.5F);
                     EntityBehaviorManager.addGoal(entity, talkGoal, GoalPriority.TALK_PLAYER);
 
-                    ChatDataManager.EntityChatData chatData = ChatDataManager.getServerInstance().getOrCreateChatData(entity.getUuidAsString());
+                    EntityChatData chatData = ChatDataManager.getServerInstance().getOrCreateChatData(entity.getUuidAsString());
                     LOGGER.debug("Hiding chat bubble for: " + entity.getType().toString());
                     chatData.setStatus(ChatDataManager.ChatStatus.valueOf(status_name));
                 }
@@ -148,7 +149,7 @@ public class ServerPackets {
             server.execute(() -> {
                 MobEntity entity = (MobEntity)ServerEntityFinder.getEntityByUUID(player.getServerWorld(), entityId);
                 if (entity != null) {
-                    ChatDataManager.EntityChatData chatData = ChatDataManager.getServerInstance().getOrCreateChatData(entity.getUuidAsString());
+                    EntityChatData chatData = ChatDataManager.getServerInstance().getOrCreateChatData(entity.getUuidAsString());
                     if (chatData.characterSheet.isEmpty()) {
                         generate_character(userLanguage, chatData, player, entity);
                     } else {
@@ -257,7 +258,7 @@ public class ServerPackets {
         }
     }
 
-    public static void generate_character(String userLanguage, ChatDataManager.EntityChatData chatData, ServerPlayerEntity player, MobEntity entity) {
+    public static void generate_character(String userLanguage, EntityChatData chatData, ServerPlayerEntity player, MobEntity entity) {
         // Set talk to player goal (prevent entity from walking off)
         TalkPlayerGoal talkGoal = new TalkPlayerGoal(player, entity, 3.5F);
         EntityBehaviorManager.addGoal(entity, talkGoal, GoalPriority.TALK_PLAYER);
@@ -288,7 +289,7 @@ public class ServerPackets {
         chatData.generateMessage(userLanguage, player, "system-character", userMessageBuilder.toString(), false);
     }
 
-    public static void generate_chat(String userLanguage, ChatDataManager.EntityChatData chatData, ServerPlayerEntity player, MobEntity entity, String message, boolean is_auto_message) {
+    public static void generate_chat(String userLanguage, EntityChatData chatData, ServerPlayerEntity player, MobEntity entity, String message, boolean is_auto_message) {
         // Set talk to player goal (prevent entity from walking off)
         TalkPlayerGoal talkGoal = new TalkPlayerGoal(player, entity, 3.5F);
         EntityBehaviorManager.addGoal(entity, talkGoal, GoalPriority.TALK_PLAYER);
@@ -299,7 +300,7 @@ public class ServerPackets {
     }
 
     // Send new message to all connected players
-    public static void BroadcastPacketMessage(ChatDataManager.EntityChatData chatData) {
+    public static void BroadcastPacketMessage(EntityChatData chatData) {
         for (ServerWorld world : serverInstance.getWorlds()) {
             UUID entityId = UUID.fromString(chatData.entityId);
             MobEntity entity = (MobEntity)ServerEntityFinder.getEntityByUUID(world, entityId);

src/test/java/com/owlmaddie/utils/EntityTestData.java

@@ -3,6 +3,7 @@ package com.owlmaddie.utils;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.owlmaddie.chat.ChatDataManager;
+import com.owlmaddie.chat.ChatMessage;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -26,7 +27,7 @@ public class EntityTestData {
     public String currentMessage;
     public int currentLineNumber;
     public ChatDataManager.ChatStatus status;
-    public List<ChatDataManager.ChatMessage> previousMessages;
+    public List<ChatMessage> previousMessages;
     public String characterSheet;
     public ChatDataManager.ChatSender sender;
     public int friendship; // -3 to 3 (0 = neutral)
@@ -64,7 +65,7 @@ public class EntityTestData {
         String truncatedMessage = message.substring(0, Math.min(message.length(), ChatDataManager.MAX_CHAR_IN_USER_MESSAGE));
 
         // Add message to history
-        previousMessages.add(new ChatDataManager.ChatMessage(truncatedMessage, messageSender));
+        previousMessages.add(new ChatMessage(truncatedMessage, messageSender));
 
         // Set new message and reset line number of displayed text
         currentMessage = truncatedMessage;