Improvement: Clicked blocks highlight (#2166)

Co-authored-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

2 files changed, 63 insertions, 3 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java
index 1729623d2..60809f44f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java
@@ -12,9 +12,8 @@ public class DungeonConfig {
 
     @Expose
     @ConfigOption(name = "Clicked Blocks", desc = "Highlight levers, chests, and Wither Essence when clicked in Dungeons.")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean highlightClickedBlocks = false;
+    @Accordion
+    public HighlightClickedBlocksConfig clickedBlocks = new HighlightClickedBlocksConfig();
 
     @Expose
     @ConfigOption(name = "Milestones Display", desc = "Show the current milestone in Dungeons.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/HighlightClickedBlocksConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/HighlightClickedBlocksConfig.java
new file mode 100644
index 000000000..6ba7232b0
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/HighlightClickedBlocksConfig.java
@@ -0,0 +1,61 @@
+package at.hannibal2.skyhanni.config.features.dungeon;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class HighlightClickedBlocksConfig {
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Highlight levers, chests, and wither essence when clicked in Dungeons.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = false;
+
+    @Expose
+    @ConfigOption(name = "Chest Color", desc = "Color of clicked chests.")
+    @ConfigEditorColour
+    public String chestColor = "0:178:85:255:85";
+
+    @Expose
+    @ConfigOption(name = "Trapped Chest Color", desc = "Color of clicked trapped chests.")
+    @ConfigEditorColour
+    public String trappedChestColor = "0:178:0:170:0";
+
+    @Expose
+    @ConfigOption(name = "Locked Chest Color", desc = "Color of clicked locked chests.")
+    @ConfigEditorColour
+    public String lockedChestColor = "0:178:255:85:85";
+
+    @Expose
+    @ConfigOption(name = "Wither Essence Color", desc = "Color of clicked wither essence.")
+    @ConfigEditorColour
+    public String witherEssenceColor = "0:178:255:85:255";
+
+    @Expose
+    @ConfigOption(name = "Lever Color", desc = "Color of clicked levers.")
+    @ConfigEditorColour
+    public String leverColor = "0:178:255:255:85";
+
+    @Expose
+    @ConfigOption(name = "Show Text", desc = "Shows a text saying what you clicked with the highlight.")
+    @ConfigEditorBoolean
+    public boolean showText = true;
+
+    @Expose
+    @ConfigOption(name = "Random Color", desc = "If enabled makes the colors random.")
+    @ConfigEditorBoolean
+    public boolean randomColor = false;
+
+    @ConfigOption(name = "Reset Colors", desc = "Resets the colors of the highlights to default ones.")
+    @ConfigEditorButton(buttonText = "Reset")
+    public Runnable reset = () -> {
+        chestColor = "0:178:85:255:85";
+        trappedChestColor = "0:178:0:170:0";
+        lockedChestColor = "0:178:255:85:85";
+        witherEssenceColor = "0:178:255:85:255";
+        leverColor = "0:178:255:255:85";
+    };
+}