Fix warnings triggering when fully disabled

Signed-off-by: Octol1ttle <[email protected]>
Octol1ttle · Mar 2, 2024 · 31008dc · 31008dc
1 parent 6486997
commit 31008dc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/ru/octol1ttle/flightassistant/alerts/AlertSoundData.java b/src/main/java/ru/octol1ttle/flightassistant/alerts/AlertSoundData.java
@@ -44,7 +44,7 @@ public record AlertSoundData(@Nullable SoundEvent sound, int priority) {
     );
 
     public static AlertSoundData ifEnabled(ComputerConfig.WarningMode mode, AlertSoundData data) {
-        if (mode.screenOnly()) {
+        if (mode.audioDisabled()) {
             return AlertSoundData.EMPTY;
         }
 

diff --git a/src/main/java/ru/octol1ttle/flightassistant/alerts/nav/gpws/ExcessiveDescentAlert.java b/src/main/java/ru/octol1ttle/flightassistant/alerts/nav/gpws/ExcessiveDescentAlert.java
@@ -31,7 +31,7 @@ public boolean isTriggered() {
 
     @Override
     public boolean render(TextRenderer textRenderer, DrawContext context, int x, int y, boolean highlight) {
-        if (FAConfig.computer().sinkrateWarning.audioOnly()) {
+        if (FAConfig.computer().sinkrateWarning.screenDisabled()) {
             return false;
         }
 
@@ -54,7 +54,7 @@ public boolean render(TextRenderer textRenderer, DrawContext context, int x, int
 
     @Override
     public @NotNull AlertSoundData getSoundData() {
-        if (FAConfig.computer().sinkrateWarning.screenOnly()) {
+        if (FAConfig.computer().sinkrateWarning.audioDisabled()) {
             return AlertSoundData.EMPTY;
         }
 

diff --git a/...main/java/ru/octol1ttle/flightassistant/alerts/nav/gpws/ExcessiveTerrainClosureAlert.java b/...main/java/ru/octol1ttle/flightassistant/alerts/nav/gpws/ExcessiveTerrainClosureAlert.java
@@ -54,7 +54,7 @@ public boolean isTriggered() {
 
     @Override
     public boolean render(TextRenderer textRenderer, DrawContext context, int x, int y, boolean highlight) {
-        if (FAConfig.computer().terrainWarning.audioOnly()) {
+        if (FAConfig.computer().terrainWarning.screenDisabled()) {
             return false;
         }
 
@@ -77,7 +77,7 @@ public boolean render(TextRenderer textRenderer, DrawContext context, int x, int
 
     @Override
     public @NotNull AlertSoundData getSoundData() {
-        if (FAConfig.computer().terrainWarning.screenOnly()) {
+        if (FAConfig.computer().terrainWarning.audioDisabled()) {
             return AlertSoundData.EMPTY;
         }
 

diff --git a/src/main/java/ru/octol1ttle/flightassistant/alerts/other/StallAlert.java b/src/main/java/ru/octol1ttle/flightassistant/alerts/other/StallAlert.java
@@ -31,7 +31,7 @@ public boolean isTriggered() {
 
     @Override
     public boolean render(TextRenderer textRenderer, DrawContext context, int x, int y, boolean highlight) {
-        if (FAConfig.computer().stallWarning.audioOnly()) {
+        if (FAConfig.computer().stallWarning.screenDisabled()) {
             return false;
         }
 

diff --git a/src/main/java/ru/octol1ttle/flightassistant/config/ComputerConfig.java b/src/main/java/ru/octol1ttle/flightassistant/config/ComputerConfig.java
@@ -56,14 +56,14 @@ public enum WarningMode implements NameableEnum {
         SCREEN_AND_AUDIO,
         AUDIO_ONLY,
         SCREEN_ONLY,
-        @SuppressWarnings("unused") DISABLED;
+        DISABLED;
 
-        public boolean audioOnly() {
-            return this == AUDIO_ONLY;
+        public boolean screenDisabled() {
+            return this == AUDIO_ONLY || this == DISABLED;
         }
 
-        public boolean screenOnly() {
-            return this == SCREEN_ONLY;
+        public boolean audioDisabled() {
+            return this == SCREEN_ONLY || this == DISABLED;
         }
 
         @Override