From 17639832d16a6de342c8ba2129cb5e7070643763 Mon Sep 17 00:00:00 2001
From: Yasin <a.piri@hotmail.de>
Date: Wed, 3 Jul 2024 23:15:08 +0200
Subject: solid color option for livid

I didnt get working the hovertext for quicknav because of the z height. stupid z height. I will look into that after my im back from my trip.
---
 .../de/hysky/skyblocker/config/categories/DungeonsCategory.java   | 8 ++++++++
 .../java/de/hysky/skyblocker/config/configs/DungeonsConfig.java   | 3 +++
 .../java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java     | 4 +++-
 src/main/resources/assets/skyblocker/lang/en_us.json              | 2 ++
 4 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'src/main')

diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
index 20e3860c..3365cf4e 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
@@ -201,6 +201,14 @@ public class DungeonsCategory {
                 .group(OptionGroup.createBuilder()
                         .name(Text.translatable("skyblocker.config.dungeons.livid"))
                         .collapsed(true)
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.dungeons.livid.enableSolidColor"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.livid.enableSolidColor.@Tooltip")))
+                                .binding(defaults.dungeons.livid.enableSolidColor,
+                                        () -> config.dungeons.livid.enableSolidColor,
+                                        newValue -> config.dungeons.livid.enableSolidColor = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
                         .option(Option.<Boolean>createBuilder()
                                 .name(Text.translatable("skyblocker.config.dungeons.livid.enableLividColorGlow"))
                                 .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.livid.enableLividColorGlow.@Tooltip")))
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java
index 6b46be32..6a622ae6 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java
@@ -111,6 +111,9 @@ public class DungeonsConfig {
     }
 
     public static class Livid {
+        @SerialEntry
+        public boolean enableSolidColor = false;
+
         @SerialEntry
         public boolean enableLividColorGlow = false;
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java
index 5b8e6347..15d0d6dd 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java
@@ -109,7 +109,9 @@ public class LividColor {
 
     @SuppressWarnings("DataFlowIssue")
     public static int getGlowColor(String name) {
-        return LIVID_TO_FORMATTING.containsKey(name) ? LIVID_TO_FORMATTING.get(name).getColorValue() : Formatting.WHITE.getColorValue();
+        if (SkyblockerConfigManager.get().dungeons.livid.enableSolidColor) return Formatting.RED.getColorValue();
+        if (LIVID_TO_FORMATTING.containsKey(name)) return LIVID_TO_FORMATTING.get(name).getColorValue();
+        return Formatting.WHITE.getColorValue();
     }
 
     private static void reset() {
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index b57e4801..8d3cdcf8 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -111,6 +111,8 @@
   "skyblocker.config.dungeons.hideSoulweaverSkulls.@Tooltip": "Hides the Haunted Skulls spawned that are spawned as a result of using Soulweaver Gloves.",
 
   "skyblocker.config.dungeons.livid": "Livid (F5/M5)",
+  "skyblocker.config.dungeons.livid.enableSolidColor": "Enable Glow and/or Bounding use same color",
+  "skyblocker.config.dungeons.livid.enableSolidColor.@Tooltip": "Instead of Livid color an Red color is Shown",
   "skyblocker.config.dungeons.livid.enableLividColorGlow": "Enable Livid Color Glow",
   "skyblocker.config.dungeons.livid.enableLividColorGlow.@Tooltip": "Applies the glowing effect to the correct Livid in F5/M5.",
   "skyblocker.config.dungeons.livid.enableLividColorBoundingBox": "Enable Livid Color Bounding Box",
-- 
cgit