From d00f8821ffa1caf3a92851b52e669fe9dcbafc75 Mon Sep 17 00:00:00 2001
From: ExternalTime <84183548+ExternalTime@users.noreply.github.com>
Date: Sun, 10 Oct 2021 21:39:09 +0200
Subject: Added solver for Select Colored Items terminal

---
 .../skyblocker/config/SkyblockerConfig.java        |  1 +
 .../container/ContainerSolverManager.java          |  2 +
 .../skyblock/dungeon/terminal/ColorTerminal.java   | 61 ++++++++++++++++++++++
 .../resources/assets/skyblocker/lang/en_us.json    |  1 +
 4 files changed, 65 insertions(+)
 create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index e379b131..1427c4e4 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -59,6 +59,7 @@ public class SkyblockerConfig implements ConfigData {
     }
 
     public static class Terminals {
+        public boolean solveColor = true;
         public boolean solveOrder = true;
     }
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolverManager.java b/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolverManager.java
index 52db8547..98f37b31 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolverManager.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolverManager.java
@@ -1,6 +1,7 @@
 package me.xmrvizzy.skyblocker.container;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+import me.xmrvizzy.skyblocker.skyblock.dungeon.terminal.ColorTerminal;
 import me.xmrvizzy.skyblocker.skyblock.dungeon.terminal.OrderTerminal;
 import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
@@ -24,6 +25,7 @@ public class ContainerSolverManager extends DrawableHelper {
 
     public ContainerSolverManager() {
         solvers = new ContainerSolver[]{
+                new ColorTerminal(),
                 new OrderTerminal(),
         };
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java
new file mode 100644
index 00000000..6b51754d
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java
@@ -0,0 +1,61 @@
+package me.xmrvizzy.skyblocker.skyblock.dungeon.terminal;
+
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.container.ColorHighlight;
+import me.xmrvizzy.skyblocker.container.ContainerSolver;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.util.DyeColor;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+import java.util.*;
+
+
+public class ColorTerminal extends ContainerSolver {
+    private static final Map<String, DyeColor> colorFromName;
+    private DyeColor targetColor;
+    private static final Map<Item, DyeColor> itemColor;
+
+    public ColorTerminal() {
+        super("^Select all the ([A-Z ]+) items!$");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        targetColor = null;
+        return SkyblockerConfig.get().locations.dungeons.terminals.solveColor;
+    }
+
+    @Override
+    public List<ColorHighlight> getColors(String[] groups, Map<Integer, ItemStack> slots) {
+        trimEdges(slots, 6);
+        List<ColorHighlight> highlights = new ArrayList<>();
+        if(targetColor == null)
+            targetColor = colorFromName.get(groups[0]);
+        for(Map.Entry<Integer, ItemStack> slot : slots.entrySet()) {
+            ItemStack itemStack = slot.getValue();
+            if(!itemStack.hasEnchantments() && targetColor.equals(itemColor.get(itemStack.getItem())))
+                highlights.add(new ColorHighlight(slot.getKey(), GREEN_HIGHLIGHT));
+        }
+        return highlights;
+    }
+
+
+    static {
+        colorFromName = new HashMap<>();
+        for (DyeColor color : DyeColor.values())
+            colorFromName.put(color.getName().toUpperCase(Locale.ROOT), color);
+        colorFromName.put("SILVER", DyeColor.LIGHT_GRAY);
+
+        itemColor = new HashMap<>();
+        for (DyeColor color : DyeColor.values())
+            for (String item : new String[]{"dye", "wool", "stained_glass", "terracotta"})
+                itemColor.put(Registry.ITEM.get(new Identifier(color.getName() + '_' + item)), color);
+        itemColor.put(Items.BONE_MEAL, DyeColor.WHITE);
+        itemColor.put(Items.LAPIS_LAZULI, DyeColor.BLUE);
+        itemColor.put(Items.COCOA_BEANS, DyeColor.BROWN);
+        itemColor.put(Items.INK_SAC, DyeColor.BLACK);
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index d7c6b9b9..f9d15864 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -16,6 +16,7 @@
   "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Solve Blaze Puzzle",
   "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Solve Trivia Puzzle",
   "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "Terminal Solvers",
+  "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Solve Select Colored",
   "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Solve Click In Order",
   "text.autoconfig.skyblocker.option.locations.dwarvenMines": "Dwarven Mines",
   "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Enable Drill Fuel",
-- 
cgit