Fix notification status display

Author: NotRyken

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.3.0-beta.7
+
+- Fixed notification status display
+
 ## 2.3.0-beta.6
 
 - Improved format util error logging

common/src/main/java/dev/terminalmc/chatnotify/config/Notification.java

@@ -41,8 +41,8 @@ public class Notification {
     /**
      * Whether this instance is eligible for activation.
      */
-    private boolean enabled;
-    private static final boolean enabledDefault = true;
+    public boolean enabled;
+    public static final boolean enabledDefault = true;
 
     /**
      * Whether this instance allows use of exclusion triggers.
@@ -143,8 +143,8 @@ static Notification createUser() {
                         new Trigger("Profile name"),
                         new Trigger("Display name")
                 )),
-                new ArrayList<>(),
-                new ArrayList<>()
+                exclusionTriggersDefault.get(),
+                responseMessagesDefault.get()
         );
     }
 
@@ -154,38 +154,28 @@ static Notification createUser() {
      */
     static Notification createBlank(Sound sound, TextStyle textStyle) {
         return new Notification(
-                true,
-                false,
-                false,
-                false,
+                enabledDefault,
+                exclusionEnabledDefault,
+                responseEnabledDefault,
+                blockMessageDefault,
                 sound,
                 textStyle,
-                new TitleText(),
+                titleTextDefault.get(),
                 new ArrayList<>(List.of(
                         new Trigger("")
                 )),
-                new ArrayList<>(),
-                new ArrayList<>()
+                exclusionTriggersDefault.get(),
+                responseMessagesDefault.get()
         );
     }
 
-    // Notifications can be enabled and disabled manually, but for user
-    // convenience we also perform some actions automatically.
-
     /**
      * @return {@code true} if this instance is eligible for activation, 
      * {@code false} otherwise.
      */
-    public boolean isEnabled() {
+    public boolean canActivate() {
         return enabled && !editing;
     }
-
-    /**
-     * Enables or disables this instance.
-     */
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
 
     // List reordering
 

common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/option/MainOptionList.java

@@ -183,9 +183,9 @@ private static class NotifConfigEntry extends Entry {
                         CommonComponents.OPTION_ON.copy().withStyle(ChatFormatting.GREEN),
                                 CommonComponents.OPTION_OFF.copy().withStyle(ChatFormatting.RED))
                         .displayOnlyValue()
-                        .withInitialValue(notif.isEnabled())
+                        .withInitialValue(notif.enabled)
                         .create(x + mainButtonWidth + SPACING, 0, statusButtonWidth, height,
-                                Component.empty(), (button, status) -> notif.setEnabled(status)));
+                                Component.empty(), (button, status) -> notif.enabled = status));
 
                 if (index > 0) {
                     // Delete button

common/src/main/java/dev/terminalmc/chatnotify/util/MessageUtil.java

@@ -146,7 +146,7 @@ public class MessageUtil {
 
         // Check each notification, in order
         for (Notification notif : Config.get().getNotifs()) {
-            if (!notif.isEnabled()) continue;
+            if (!notif.canActivate()) continue;
 
             // Trigger search
             for (Trigger trig : notif.triggers) {

gradle.properties

@@ -3,7 +3,7 @@
 # Neo/Forge version ranges: https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html
 
 # Project
-mod_version=2.3.0-beta.6+1.21
+mod_version=2.3.0-beta.7+1.21
 mod_group=dev.terminalmc
 mod_id=chatnotify
 mod_name=ChatNotify