Merge branch 'master' into feature/pet-rarity

pajlads · Mar 31, 2024 · 5663ccc · 5663ccc
2 parents 6b2da59 + 7555cb3
commit 5663ccc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Unreleased
 
-- Major: Add notifier for chat messages that match custom patterns. (#391)
+- Major: Add notifier for chat messages that match custom patterns. (#391, #450)
 - Minor: Include rarity and luck for pet notifications. (#433)
 - Minor: `Completed Entries` field in Discord rich embed is now called `Completed`. (#448)
 - Bugfix: Allow Lunar Chest openings to trigger kill count notifier. (#449)

diff --git a/src/main/java/dinkplugin/domain/ChatNotificationType.java b/src/main/java/dinkplugin/domain/ChatNotificationType.java
@@ -12,10 +12,11 @@
  * A condensed version of {@link ChatMessageType} for more user-friendly configuration.
  */
 public enum ChatNotificationType {
-    GAME("Game Engine", GAMEMESSAGE, ENGINE, MESBOX, LOGINLOGOUTNOTIFICATION, PLAYERRELATED),
+    GAME("Game Engine", GAMEMESSAGE, ENGINE, CONSOLE, MESBOX, DIALOG, BROADCAST, LOGINLOGOUTNOTIFICATION, PLAYERRELATED, SNAPSHOTFEEDBACK),
     CLAN("Clan Notifications", CLAN_MESSAGE, CLAN_GIM_MESSAGE, CLAN_GUEST_MESSAGE, FRIENDSCHATNOTIFICATION),
     TRADES("Trades and Duels", TRADE, TRADE_SENT, TRADEREQ, CHALREQ_TRADE, CHALREQ_FRIENDSCHAT, CHALREQ_CLANCHAT),
-    CHAT("User Messages (Discouraged)", PUBLICCHAT, PRIVATECHAT, PRIVATECHATOUT, MODCHAT, MODPRIVATECHAT, FRIENDSCHAT, CLAN_CHAT, CLAN_GUEST_CHAT, AUTOTYPER, MODAUTOTYPER);
+    PUBLIC("Public Chats", PUBLICCHAT, MODCHAT, AUTOTYPER, MODAUTOTYPER),
+    PRIVATE("Non-Public Chats", PRIVATECHAT, PRIVATECHATOUT, MODPRIVATECHAT, FRIENDSCHAT, CLAN_CHAT, CLAN_GUEST_CHAT);
 
     public static final Map<ChatMessageType, ChatNotificationType> MAPPINGS;
 

diff --git a/src/main/resources/npc_drops.json b/src/main/resources/npc_drops.json