From 7fd0a26af7ecc51af84da9317c7a19d4575bfa1b Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 28 Aug 2023 13:09:44 +0200
Subject: Added a toggle for the already existing feature ender slayer Laser
 phase timer in damage indicator

---
 .../config/features/DamageIndicatorConfig.java     | 25 ++++++++++++++++------
 .../damageindicator/DamageIndicatorManager.kt      | 22 ++++++++++---------
 2 files changed, 31 insertions(+), 16 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicatorConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicatorConfig.java
index 099b2c3c4..ddcca5eba 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicatorConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicatorConfig.java
@@ -72,11 +72,6 @@ public class DamageIndicatorConfig {
     @ConfigEditorBoolean
     public boolean showDamageOverTime = false;
 
-    @Expose
-    @ConfigOption(name = "Health During Laser", desc = "Show the health of Voidgloom Seraph 4 during the laser phase.")
-    @ConfigEditorBoolean
-    public boolean showHealthDuringLaser = false;
-
     @Expose
     @ConfigOption(name = "Hide Nametag", desc = "Hide the vanilla nametag of damage indicator bosses.")
     @ConfigEditorBoolean
@@ -88,10 +83,28 @@ public class DamageIndicatorConfig {
     public boolean timeToKillSlayer = true;
 
 
+    @Expose
+    @ConfigOption(name = "Ender Slayer", desc = "")
+    @Accordion
+    public EnderSlayerConfig enderSlayer = new EnderSlayerConfig();
+
+    public static class EnderSlayerConfig {
+
+        @Expose
+        @ConfigOption(name = "Laser phase timer", desc = "Show a timer when the laser phase will end.")
+        @ConfigEditorBoolean
+        public boolean laserPhaseTimer = false;
+
+        @Expose
+        @ConfigOption(name = "Health During Laser", desc = "Show the health of Voidgloom Seraph 4 during the laser phase.")
+        @ConfigEditorBoolean
+        public boolean showHealthDuringLaser = false;
+    }
+
     @Expose
     @ConfigOption(name = "Vampire Slayer", desc = "")
     @Accordion
-    public VampireSlayerConfig vampireSlayer = new VampireSlayerConfig();
+    public DamageIndicatorConfig.VampireSlayerConfig vampireSlayer = new DamageIndicatorConfig.VampireSlayerConfig();
 
     public static class VampireSlayerConfig {
         @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
index 157883909..068257d95 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
@@ -637,16 +637,18 @@ class DamageIndicatorManager {
         }
 
         //Laser phase
-        if (entity.ridingEntity != null) {
-            val ticksAlive = entity.ridingEntity.ticksExisted.toLong()
-            //TODO more tests, more exact values, better logic? idk make this working perfectly pls
-            //val remainingTicks = 8 * 20 - ticksAlive
-            val remainingTicks = (8.9 * 20).toLong() - ticksAlive
-
-            if (config.showHealthDuringLaser) {
-                entityData.nameSuffix = " §f" + formatDelay(remainingTicks * 50)
-            } else {
-                return formatDelay(remainingTicks * 50)
+        if (config.enderSlayer.laserPhaseTimer) {
+            if (entity.ridingEntity != null) {
+                val ticksAlive = entity.ridingEntity.ticksExisted.toLong()
+                //TODO more tests, more exact values, better logic? idk make this working perfectly pls
+                //val remainingTicks = 8 * 20 - ticksAlive
+                val remainingTicks = (8.9 * 20).toLong() - ticksAlive
+
+                if (config.enderSlayer.showHealthDuringLaser) {
+                    entityData.nameSuffix = " §f" + formatDelay(remainingTicks * 50)
+                } else {
+                    return formatDelay(remainingTicks * 50)
+                }
             }
         }
 
-- 
cgit