Merge branch '0.6.4' into 0.6.4-WarPartyFeature

SequoiaWynncraft · Feb 9, 2025 · 734d4ad · 734d4ad
2 parents 31df1ed + b9000b1
commit 734d4ad
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 30 deletions.
diff --git a/common/src/main/java/dev/lotnest/sequoia/core/websocket/WSConstants.java b/common/src/main/java/dev/lotnest/sequoia/core/websocket/WSConstants.java
@@ -0,0 +1,11 @@
+/*
+ * Copyright © sequoia-mod 2025.
+ * This file is released under LGPLv3. See LICENSE for full license details.
+ */
+package dev.lotnest.sequoia.core.websocket;
+
+public final class WSConstants {
+    public static final int ACK = 99;
+
+    private WSConstants() {}
+}
diff --git a/common/src/main/java/dev/lotnest/sequoia/core/websocket/WSMessageType.java b/common/src/main/java/dev/lotnest/sequoia/core/websocket/WSMessageType.java
@@ -10,11 +10,11 @@ public enum WSMessageType {
     G_CHAT_MESSAGE,
     G_CLIENT_COMMAND,
     G_RAID_SUBMISSION,
-    G_LOCATION_SERVICE,
-    G_GUILD_MAP,
+    GI_STATE_UPDATE,
+    NOT_IMPLEMENTED_1,
     G_IDENTIFY,
-    G_GUILD_WAR_RESULTS,
-    G_LOOT_POOL,
+    NOT_IMPLEMENTED_2,
+    NOT_IMPLEMENTED_3,
     G_AUTH,
     G_IC3H,
     G_RESERVED_7,

diff --git a/common/src/main/java/dev/lotnest/sequoia/core/websocket/WSStateOpCodeType.java b/common/src/main/java/dev/lotnest/sequoia/core/websocket/WSStateOpCodeType.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright © sequoia-mod 2025.
+ * This file is released under LGPLv3. See LICENSE for full license details.
+ */
+package dev.lotnest.sequoia.core.websocket;
+
+public enum WSStateOpCodeType {
+    INVALID,
+    LOCATION_SERVICE,
+    LOOT_POOL,
+    GUILD_MAP,
+    GUILD_WAR_RESULTS;
+
+    public static WSStateOpCodeType fromValue(int value) {
+        if (value < 0 || value >= values().length) {
+            return INVALID;
+        }
+        return values()[value];
+    }
+
+    public int getValue() {
+        return ordinal();
+    }
+}
diff --git a/.../src/main/java/dev/lotnest/sequoia/core/websocket/messages/GLocationServiceWSMessage.java b/.../src/main/java/dev/lotnest/sequoia/core/websocket/messages/GLocationServiceWSMessage.java
diff --git a/...rc/main/java/dev/lotnest/sequoia/features/discordchatbridge/DiscordChatBridgeFeature.java b/...rc/main/java/dev/lotnest/sequoia/features/discordchatbridge/DiscordChatBridgeFeature.java
@@ -48,7 +48,7 @@ public void onChatMessageReceived(ChatMessageReceivedEvent event) {
                 .replaceAll("\\s{2,}", " ");
         MutableComponent messageComponent = messageTextWithoutNewLines.getComponent();
 
-        if (messageTextWithoutNewLines == null || messageTextWithoutNewLines.isBlank()) {
+        if (messageTextWithoutNewLines.isBlank()) {
             return;
         }
 
@@ -106,7 +106,6 @@ public void onChatMessageReceived(ChatMessageReceivedEvent event) {
             }
         } catch (Exception exception) {
             SequoiaMod.error("Failed to send guild chat message to Discord", exception);
-            return;
         }
     }