Add custom color option, localization changes (#1486)

3 files changed, 22 insertions, 9 deletions

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 44f7ee86..d37a4e25 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
@@ -18,6 +18,8 @@ import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 
+import java.awt.Color;
+
 public class DungeonsCategory {
 
 	public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) {
@@ -276,6 +278,13 @@ public class DungeonsCategory {
 										newValue -> config.dungeons.livid.enableSolidColor = newValue)
 								.controller(ConfigUtils.createBooleanController())
 								.build())
+						.option(Option.<Color>createBuilder()
+								.name(Text.translatable("skyblocker.config.dungeons.livid.customColor"))
+								.binding(defaults.dungeons.livid.customColor,
+										() -> config.dungeons.livid.customColor,
+										newValue -> config.dungeons.livid.customColor = newValue)
+								.controller(ConfigUtils.createColourController(false))
+								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("skyblocker.config.dungeons.livid.enableLividColorGlow"))
 								.description(Text.translatable("skyblocker.config.dungeons.livid.enableLividColorGlow.@Tooltip"))
@@ -293,14 +302,6 @@ public class DungeonsCategory {
 								.controller(ConfigUtils.createBooleanController())
 								.build())
 						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.config.dungeons.livid.enableLividColorText"))
-								.description(Text.translatable("skyblocker.config.dungeons.livid.enableLividColorText.@Tooltip"))
-								.binding(defaults.dungeons.livid.enableLividColorText,
-										() -> config.dungeons.livid.enableLividColorText,
-										newValue -> config.dungeons.livid.enableLividColorText = newValue)
-								.controller(ConfigUtils.createBooleanController())
-								.build())
-						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("skyblocker.config.dungeons.livid.enableLividColorTitle"))
 								.description(Text.translatable("skyblocker.config.dungeons.livid.enableLividColorTitle.@Tooltip"))
 								.binding(defaults.dungeons.livid.enableLividColorTitle,
@@ -308,6 +309,14 @@ public class DungeonsCategory {
 										newValue -> config.dungeons.livid.enableLividColorTitle = newValue)
 								.controller(ConfigUtils.createBooleanController())
 								.build())
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("skyblocker.config.dungeons.livid.enableLividColorText"))
+								.description(Text.translatable("skyblocker.config.dungeons.livid.enableLividColorText.@Tooltip"))
+								.binding(defaults.dungeons.livid.enableLividColorText,
+										() -> config.dungeons.livid.enableLividColorText,
+										newValue -> config.dungeons.livid.enableLividColorText = newValue)
+								.controller(ConfigUtils.createBooleanController())
+								.build())
 						.option(Option.<String>createBuilder()
 								.name(Text.translatable("skyblocker.config.dungeons.livid.lividColorText"))
 								.description(Text.translatable("skyblocker.config.dungeons.livid.lividColorText.@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 a3e0770b..b4463bde 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java
@@ -4,6 +4,8 @@ import de.hysky.skyblocker.utils.waypoint.Waypoint;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.util.Formatting;
 
+import java.awt.Color;
+
 public class DungeonsConfig {
 	public boolean fancyPartyFinder = true;
 
@@ -101,6 +103,8 @@ public class DungeonsConfig {
 	public static class Livid {
 		public boolean enableSolidColor = false;
 
+		public Color customColor = Color.RED;
+
 		public boolean enableLividColorGlow = false;
 
 		public boolean enableLividColorBoundingBox = true;
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 fdddeb72..d5ffd353 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java
@@ -126,7 +126,7 @@ public class LividColor {
 
     @SuppressWarnings("DataFlowIssue")
     public static int getGlowColor(String name) {
-        if (SkyblockerConfigManager.get().dungeons.livid.enableSolidColor) return Formatting.RED.getColorValue();
+        if (SkyblockerConfigManager.get().dungeons.livid.enableSolidColor) return SkyblockerConfigManager.get().dungeons.livid.customColor.getRGB();
         if (LIVID_TO_FORMATTING.containsKey(name)) return LIVID_TO_FORMATTING.get(name).getColorValue();
         return Formatting.WHITE.getColorValue();
     }