null safety around chat type registry and rendering

rfresh2 · Nov 5, 2024 · 54b3fe8 · 54b3fe8
1 parent c152764
commit 54b3fe8
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 56 deletions.
diff --git a/src/main/java/com/zenith/cache/data/chat/ChatSession.java b/src/main/java/com/zenith/cache/data/chat/ChatSession.java
@@ -25,10 +25,6 @@
 public class ChatSession {
     private final UUID sessionId;
     protected StepPlayerCertificates.PlayerCertificates playerCertificates;
-    protected LastSeenTrackedEntry[] lastSeenTrackedEntries;
-    protected int offset;
-    protected int tail;
-    protected LastSeenTrackedEntry lastTrackedMessage;
     protected int chainIndex = 0;
 
     public void sign(ServerboundChatPacket packet) {

diff --git a/src/main/java/com/zenith/cache/data/chat/ChatType.java b/src/main/java/com/zenith/cache/data/chat/ChatType.java
@@ -6,18 +6,25 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.zenith.Shared.CLIENT_LOG;
+
 public record ChatType(int id, String translationKey, List<String> parameters) {
     public Component render(@Nullable Component sender, @Nullable Component content, @Nullable Component target) {
-        List<Component> args = new ArrayList<>(parameters.size());
-        for (var parameter : parameters) {
-            switch (parameter) {
-                case "sender" -> args.add(sender);
-                case "content" -> args.add(content);
-                case "target" -> args.add(target);
+        try {
+            List<Component> args = new ArrayList<>(parameters.size());
+            for (var parameter : parameters) {
+                switch (parameter) {
+                    case "sender" -> args.add(sender);
+                    case "content" -> args.add(content);
+                    case "target" -> args.add(target);
+                }
             }
+            return Component
+                .translatable(translationKey)
+                .arguments(args);
+        } catch (final Exception e) {
+            CLIENT_LOG.warn("Failed to render chat type: {}", translationKey, e);
+            return Component.translatable(translationKey);
         }
-        return Component
-            .translatable(translationKey)
-            .arguments(args);
     }
 }
diff --git a/src/main/java/com/zenith/cache/data/chat/ChatTypeRegistry.java b/src/main/java/com/zenith/cache/data/chat/ChatTypeRegistry.java
@@ -8,6 +8,7 @@
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import lombok.Data;
 import org.geysermc.mcprotocollib.protocol.data.game.RegistryEntry;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -34,7 +35,7 @@ public void initialize(List<RegistryEntry> registryEntries) {
         }
     }
 
-    public ChatType getChatType(int id) {
+    public @Nullable ChatType getChatType(int id) {
         return chatTypes.get(id);
     }
 

diff --git a/src/main/java/com/zenith/network/client/handler/incoming/DisguisedChatHandler.java b/src/main/java/com/zenith/network/client/handler/incoming/DisguisedChatHandler.java
@@ -18,28 +18,32 @@ public class DisguisedChatHandler implements PacketHandler<ClientboundDisguisedC
     public ClientboundDisguisedChatPacket apply(final ClientboundDisguisedChatPacket packet, final ClientSession session) {
         var senderPlayerEntry = CACHE.getTabListCache().getFromName(ComponentSerializer.serializePlain(packet.getName()));
         ChatType chatType = CACHE.getChatCache().getChatTypeRegistry().getChatType(packet.getChatType().id());
-        Component chatComponent = chatType.render(
-            packet.getName(),
-            packet.getMessage(),
-            packet.getTargetName());
-        if (CONFIG.client.extra.logChatMessages) {
-            CLIENT_LOG.info("{}", ComponentSerializer.serializeJson(chatComponent));
+        if (chatType != null) {
+            Component chatComponent = chatType.render(
+                packet.getName(),
+                packet.getMessage(),
+                packet.getTargetName());
+            if (CONFIG.client.extra.logChatMessages) {
+                CLIENT_LOG.info("{}", ComponentSerializer.serializeJson(chatComponent));
+            }
+            Optional<PlayerListEntry> whisperTarget = Optional.empty();
+            if ("commands.message.display.incoming".equals(chatType.translationKey())) {
+                whisperTarget = CACHE.getTabListCache().get(CACHE.getProfileCache().getProfile().getId());
+            } else if ("commands.message.display.outgoing".equals(chatType.translationKey())) {
+                whisperTarget = CACHE.getTabListCache().getFromName( // ???
+                     ComponentSerializer.serializePlain(packet.getTargetName())
+                );
+            }
+            EVENT_BUS.postAsync(new ServerChatReceivedEvent(
+                senderPlayerEntry,
+                chatComponent,
+                ComponentSerializer.serializePlain(chatComponent),
+                whisperTarget,
+                Optional.empty()
+            ));
+        } else {
+            CLIENT_LOG.warn("Unknown chat type: {}", packet.getChatType().id());
         }
-        Optional<PlayerListEntry> whisperTarget = Optional.empty();
-        if ("commands.message.display.incoming".equals(chatType.translationKey())) {
-            whisperTarget = CACHE.getTabListCache().get(CACHE.getProfileCache().getProfile().getId());
-        } else if ("commands.message.display.outgoing".equals(chatType.translationKey())) {
-            whisperTarget = CACHE.getTabListCache().getFromName( // ???
-                ComponentSerializer.serializePlain(packet.getTargetName())
-            );
-        }
-        EVENT_BUS.postAsync(new ServerChatReceivedEvent(
-            senderPlayerEntry,
-            chatComponent,
-            ComponentSerializer.serializePlain(chatComponent),
-            whisperTarget,
-            Optional.empty()
-        ));
         return packet;
     }
 }
diff --git a/src/main/java/com/zenith/network/client/handler/incoming/PlayerChatHandler.java b/src/main/java/com/zenith/network/client/handler/incoming/PlayerChatHandler.java
@@ -21,28 +21,32 @@ public ClientboundPlayerChatPacket apply(ClientboundPlayerChatPacket packet, Cli
         // so no chat relay, chat events, and other stuff
         var senderPlayerEntry = CACHE.getTabListCache().get(packet.getSender());
         var chatType = CACHE.getChatCache().getChatTypeRegistry().getChatType(packet.getChatType().id());
-        Component chatComponent = chatType.render(
-            packet.getName(),
-            Component.text(packet.getContent()),
-            packet.getTargetName());
-        if (CONFIG.client.extra.logChatMessages) {
-            CLIENT_LOG.info("{}", ComponentSerializer.serializeJson(chatComponent));
+        if (chatType != null) {
+            Component chatComponent = chatType.render(
+                packet.getName(),
+                Component.text(packet.getContent()),
+                packet.getTargetName());
+            if (CONFIG.client.extra.logChatMessages) {
+                CLIENT_LOG.info("{}", ComponentSerializer.serializeJson(chatComponent));
+            }
+            Optional<PlayerListEntry> whisperTarget = Optional.empty();
+            if ("commands.message.display.incoming".equals(chatType.translationKey())) {
+                whisperTarget = CACHE.getTabListCache().get(CACHE.getProfileCache().getProfile().getId());
+            } else if ("commands.message.display.outgoing".equals(chatType.translationKey())) {
+                whisperTarget = CACHE.getTabListCache().getFromName( // ???
+                     ComponentSerializer.serializePlain(packet.getTargetName())
+                );
+            }
+            EVENT_BUS.postAsync(new ServerChatReceivedEvent(
+                senderPlayerEntry,
+                chatComponent,
+                ComponentSerializer.serializePlain(chatComponent),
+                whisperTarget,
+                Optional.empty()
+            ));
+        } else {
+            CLIENT_LOG.warn("Unknown chat type: {}", packet.getChatType().id());
         }
-        Optional<PlayerListEntry> whisperTarget = Optional.empty();
-        if ("commands.message.display.incoming".equals(chatType.translationKey())) {
-            whisperTarget = CACHE.getTabListCache().get(CACHE.getProfileCache().getProfile().getId());
-        } else if ("commands.message.display.outgoing".equals(chatType.translationKey())) {
-            whisperTarget = CACHE.getTabListCache().getFromName( // ???
-                ComponentSerializer.serializePlain(packet.getTargetName())
-            );
-        }
-        EVENT_BUS.postAsync(new ServerChatReceivedEvent(
-            senderPlayerEntry,
-            chatComponent,
-            ComponentSerializer.serializePlain(chatComponent),
-            whisperTarget,
-            Optional.empty()
-        ));
         return packet;
     }
 }