Fix merge conflicts

10 files changed, 196 insertions, 49 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/CroesusHelper.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/CroesusHelper.java
index c536542b..2d868782 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/CroesusHelper.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/CroesusHelper.java
@@ -1,8 +1,8 @@
 package me.xmrvizzy.skyblocker.skyblock.dungeon;
 
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
-import me.xmrvizzy.skyblocker.container.ColorHighlight;
-import me.xmrvizzy.skyblocker.container.ContainerSolver;
+import me.xmrvizzy.skyblocker.gui.ColorHighlight;
+import me.xmrvizzy.skyblocker.gui.ContainerSolver;
 import net.minecraft.item.ItemStack;
 
 import java.util.ArrayList;
@@ -11,20 +11,23 @@ import java.util.Map;
 
 public class CroesusHelper extends ContainerSolver {
 
-    public CroesusHelper() { super("^Croesus$"); }
+    public CroesusHelper() {
+        super("^Croesus$");
+    }
 
     @Override
-    public boolean isEnabled() {
+    protected boolean isEnabled() {
         return SkyblockerConfig.get().locations.dungeons.croesusHelper;
     }
 
     @Override
-    public List<ColorHighlight> getColors(String[] groups, Map<Integer, ItemStack> slots) {
+    protected List<ColorHighlight> getColors(String[] groups, Map<Integer, ItemStack> slots) {
         List<ColorHighlight> highlights = new ArrayList<>();
         for (Map.Entry<Integer, ItemStack> entry : slots.entrySet()) {
             ItemStack stack = entry.getValue();
-            if (stack != null && stack.getNbt() != null && stack.getNbt().toString().contains("opened"))
-                highlights.add(new ColorHighlight(entry.getKey(), GRAY_HIGHLIGHT));
+            if (stack != null && stack.getNbt() != null && stack.getNbt().toString().contains("opened")) {
+                highlights.add(ColorHighlight.gray(entry.getKey()));
+            }
         }
         return highlights;
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java
index 4554372b..219f4258 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java
@@ -21,7 +21,7 @@ public class DungeonBlaze {
     
     public static void update() {
         ClientWorld world = MinecraftClient.getInstance().world;
-        if (world == null || !Utils.isInDungeons) return;
+        if (world == null || !Utils.isInDungeons()) return;
         if(!renderHooked){
 
             WorldRenderEvents.END.register(DungeonBlaze::blazeRenderer);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java
index dda8da41..2a97d0ee 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java
@@ -2,8 +2,13 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon;
 
 import org.apache.commons.lang3.StringUtils;
 
+import com.mojang.brigadier.Command;
+
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.MapRenderer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
@@ -11,8 +16,11 @@ import net.minecraft.item.FilledMapItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.map.MapState;
 import net.minecraft.nbt.NbtCompound;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 
 public class DungeonMap {
+	private static final Identifier MAP_BACKGROUND = new Identifier("textures/map/map_background.png");
 
     public static void render(MatrixStack matrices) {
         MinecraftClient client = MinecraftClient.getInstance();
@@ -28,14 +36,36 @@ public class DungeonMap {
             MapRenderer map = client.gameRenderer.getMapRenderer();
             MapState state = FilledMapItem.getMapState(mapid, client.world);
             float scaling = SkyblockerConfig.get().locations.dungeons.mapScaling;
+        	int x = SkyblockerConfig.get().locations.dungeons.mapX;
+        	int y = SkyblockerConfig.get().locations.dungeons.mapY;
 
             if (state == null) return;
             matrices.push();
-            matrices.translate(2, 2, 0);
+            matrices.translate(x, y, 0);
             matrices.scale(scaling, scaling, 0f);
             map.draw( matrices, vertices, mapid, state, false, 15728880);
             vertices.draw();
             matrices.pop();
         }
     }
+    
+    public static void renderHUDMap(DrawContext context, int x, int y) {
+    	float scaling = SkyblockerConfig.get().locations.dungeons.mapScaling;
+    	int size = (int) (128 * scaling);
+    	context.drawTexture(MAP_BACKGROUND, x, y, 0, 0, size, size, size, size);
+    }
+    
+    public static void init() {
+    	ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> {
+    		dispatcher.register(ClientCommandManager.literal("skyblocker")
+    				.then(ClientCommandManager.literal("hud")
+    						.then(ClientCommandManager.literal("dungeonmap")
+    								.executes(context -> {
+    									MinecraftClient client = context.getSource().getClient();
+    									client.send(() -> client.setScreen(new DungeonMapConfigScreen(Text.literal("Dungeon Map Config"))));
+    									
+    									return Command.SINGLE_SUCCESS;
+    								}))));
+    	});
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
new file mode 100644
index 00000000..ffd7a8b6
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
@@ -0,0 +1,57 @@
+package me.xmrvizzy.skyblocker.skyblock.dungeon;
+
+import java.awt.Color;
+
+import me.shedaniel.autoconfig.AutoConfig;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.utils.RenderUtils;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.text.Text;
+
+public class DungeonMapConfigScreen extends Screen {
+	
+	private int hudX = SkyblockerConfig.get().locations.dungeons.mapX;
+	private int hudY = SkyblockerConfig.get().locations.dungeons.mapY;
+	
+	protected DungeonMapConfigScreen(Text title) {
+		super(title);
+	}
+	
+	@Override
+	public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+		super.render(context, mouseX, mouseY, delta);
+		renderBackground(context);
+		DungeonMap.renderHUDMap(context, hudX, hudY);
+		context.drawCenteredTextWithShadow(textRenderer, "Right Click To Reset Position", width / 2, height / 2, Color.GRAY.getRGB());
+	}
+	
+	@Override
+	public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
+		float scaling = SkyblockerConfig.get().locations.dungeons.mapScaling;
+		int size = (int) (128 * scaling);
+		if(RenderUtils.pointExistsInArea((int) mouseX, (int) mouseY, hudX, hudY, hudX + size, hudY + size) && button == 0) {
+			hudX = (int) Math.max(Math.min(mouseX - (size / 2), this.width - size), 0);
+			hudY = (int) Math.max(Math.min(mouseY - (size / 2), this.height - size), 0);
+		}
+		return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
+	}
+	
+	@Override
+	public boolean mouseClicked(double mouseX, double mouseY, int button) {
+		if(button == 1) {
+			hudX = 2;
+			hudY = 2;
+		}
+		
+		return super.mouseClicked(mouseX, mouseY, button);
+	}
+	
+	@Override
+	public void close() {
+		SkyblockerConfig.get().locations.dungeons.mapX = hudX;
+		SkyblockerConfig.get().locations.dungeons.mapY = hudY;
+		AutoConfig.getConfigHolder(SkyblockerConfig.class).save();
+		super.close();
+	}
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/LividColor.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/LividColor.java
new file mode 100644
index 00000000..4701c485
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/LividColor.java
@@ -0,0 +1,42 @@
+package me.xmrvizzy.skyblocker.skyblock.dungeon;
+
+import me.xmrvizzy.skyblocker.SkyblockerMod;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.utils.Utils;
+import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.util.math.BlockPos;
+
+public class LividColor {
+    private static int tenTicks = 0;
+
+    public static void init() {
+        ClientReceiveMessageEvents.GAME.register((message, overlay) -> {
+            if (SkyblockerConfig.get().locations.dungeons.lividColor.enableLividColor && message.getString().equals("[BOSS] Livid: I respect you for making it to here, but I'll be your undoing.")) {
+                tenTicks = 8;
+            }
+        });
+    }
+
+    public static void update() {
+        MinecraftClient client = MinecraftClient.getInstance();
+        if (tenTicks != 0) {
+            if (SkyblockerConfig.get().locations.dungeons.lividColor.enableLividColor && Utils.isInDungeons() && client.world != null) {
+                if (tenTicks == 1) {
+                    SkyblockerMod.getInstance().messageScheduler.sendMessageAfterCooldown(SkyblockerConfig.get().locations.dungeons.lividColor.lividColorText.replace("[color]", "red"));
+                    tenTicks = 0;
+                    return;
+                }
+                String key = client.world.getBlockState(new BlockPos(5, 110, 42)).getBlock().getTranslationKey();
+                if (key.startsWith("block.minecraft.") && key.endsWith("wool") && !key.endsWith("red_wool")) {
+                    SkyblockerMod.getInstance().messageScheduler.sendMessageAfterCooldown(SkyblockerConfig.get().locations.dungeons.lividColor.lividColorText.replace("[color]", key.substring(16, key.length() - 5)));
+                    tenTicks = 0;
+                    return;
+                }
+                tenTicks--;
+            } else {
+                tenTicks = 0;
+            }
+        }
+    }
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java
index 42fcc36a..8ae7ce7b 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java
@@ -3,6 +3,7 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon;
 import me.xmrvizzy.skyblocker.SkyblockerMod;
 import me.xmrvizzy.skyblocker.chat.ChatFilterResult;
 import me.xmrvizzy.skyblocker.chat.ChatPatternListener;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import me.xmrvizzy.skyblocker.utils.Utils;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
@@ -15,45 +16,60 @@ import java.util.regex.Pattern;
 
 public class Reparty extends ChatPatternListener {
     private static final MinecraftClient client = MinecraftClient.getInstance();
-    private static final SkyblockerMod skyblocker = SkyblockerMod.getInstance();
     public static final Pattern PLAYER = Pattern.compile(" ([a-zA-Z0-9_]{2,16}) ●");
     private static final int BASE_DELAY = 10;
 
     private String[] players;
     private int playersSoFar;
     private boolean repartying;
+    private String partyLeader;
 
     public Reparty() {
-        super("^(?:You are not currently in a party\\.|Party (?:Membe|Moderato)rs(?: \\(([0-9]+)\\)|:( .*)))$");
+        super("^(?:You are not currently in a party\\." +
+                "|Party (?:Membe|Moderato)rs(?: \\(([0-9]+)\\)|:( .*))" +
+                "|([\\[A-z+\\]]* )?(?<disband>.*) has disbanded .*" +
+                "|.*\n([\\[A-z+\\]]* )?(?<invite>.*) has invited you to join their party!" +
+                "\nYou have 60 seconds to accept. Click here to join!\n.*)$");
+
         this.repartying = false;
         ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("rp").executes(context -> {
-            if (!Utils.isOnSkyblock || this.repartying || client.player == null) return 0;
+            if (!Utils.isOnSkyblock() || this.repartying || client.player == null) return 0;
             this.repartying = true;
-            client.player.networkHandler.sendCommand("p list");
+            SkyblockerMod.getInstance().messageScheduler.sendMessageAfterCooldown("/p list");
             return 0;
         })));
     }
 
     @Override
     public ChatFilterResult state() {
-        return this.repartying ? ChatFilterResult.FILTER : ChatFilterResult.PASS;
+        return (SkyblockerConfig.get().general.acceptReparty || this.repartying) ? ChatFilterResult.FILTER : ChatFilterResult.PASS;
     }
 
     @Override
     public boolean onMatch(Text message, Matcher matcher) {
-        if (matcher.group(1) != null) {
+        if (matcher.group(1) != null && repartying) {
             this.playersSoFar = 0;
             this.players = new String[Integer.parseInt(matcher.group(1)) - 1];
-        } else if (matcher.group(2) != null) {
+        } else if (matcher.group(2) != null && repartying) {
             Matcher m = PLAYER.matcher(matcher.group(2));
             while (m.find()) {
                 this.players[playersSoFar++] = m.group(1);
             }
+        } else if (matcher.group("disband") != null && !matcher.group("disband").equals(client.getSession().getUsername())) {
+            partyLeader = matcher.group("disband");
+            SkyblockerMod.getInstance().scheduler.schedule(() -> partyLeader = null, 61);
+            return false;
+        } else if (matcher.group("invite") != null && matcher.group("invite").equals(partyLeader)) {
+            String command = "/party accept " + partyLeader;
+            sendCommand(command, 0);
+            return false;
         } else {
             this.repartying = false;
             return false;
         }
-        if (this.playersSoFar == this.players.length) reparty();
+        if (this.playersSoFar == this.players.length) {
+            reparty();
+        }
         return false;
     }
 
@@ -63,16 +79,15 @@ public class Reparty extends ChatPatternListener {
             this.repartying = false;
             return;
         }
-        sendCommand(playerEntity, "p disband", 1);
+        sendCommand("/p disband", 1);
         for (int i = 0; i < this.players.length; ++i) {
-            String command = "p invite " + this.players[i];
-            sendCommand(playerEntity, command, i + 2);
+            String command = "/p invite " + this.players[i];
+            sendCommand(command, i + 2);
         }
-        skyblocker.scheduler.schedule(() -> this.repartying = false, this.players.length + 2);
+        SkyblockerMod.getInstance().scheduler.schedule(() -> this.repartying = false, this.players.length + 2);
     }
 
-    private void sendCommand(ClientPlayerEntity player, String command, int delay) {
-        // skyblocker.scheduler.schedule(() -> player.sendChatMessage(command, Text.of(command)), delay * BASE_DELAY);
-        skyblocker.scheduler.schedule(() -> player.networkHandler.sendCommand(command), delay * BASE_DELAY);
+    private void sendCommand(String command, int delay) {
+        SkyblockerMod.getInstance().messageScheduler.queueMessage(command, delay * BASE_DELAY);
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java
index 10a2e413..f7598af5 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java
@@ -69,7 +69,7 @@ public class Trivia extends ChatPatternListener {
         answers.put("What is the status of Storm?", new String[]{"The Wither Lords"});
         answers.put("What is the status of Necron?", new String[]{"The Wither Lords"});
         answers.put("What is the status of Maxor, Storm, Goldor and Necron?", new String[]{"The Wither Lords"});
-        answers.put("How many total Fairy Souls are there?", new String[]{"240 Fairy Souls"});
+        answers.put("How many total Fairy Souls are there?", new String[]{"242 Fairy Souls"});
         answers.put("How many Fairy Souls are there in Spider's Den?", new String[]{"19 Fairy Souls"});
         answers.put("How many Fairy Souls are there in The End?", new String[]{"12 Fairy Souls"});
         answers.put("How many Fairy Souls are there in The Farming Islands?", new String[]{"20 Fairy Souls"});
@@ -87,7 +87,7 @@ public class Trivia extends ChatPatternListener {
         answers.put("What is the name of the person that upgrades pets?", new String[]{"Kat"});
         answers.put("What is the name of the lady of the Nether?", new String[]{"Elle"});
         answers.put("Which villager in the Village gives you a Rogue Sword?", new String[]{"Jamie"});
-        answers.put("How many unique minions are there?", new String[]{"58 Minions"});
+        answers.put("How many unique minions are there?", new String[]{"59 Minions"});
         answers.put("Which of these enemies does not spawn in the Spider's Den?", new String[]{"Zombie Spider", "Cave Spider", "Wither Skeleton",
                 "Dashing Spooder", "Broodfather", "Night Spider"});
         answers.put("Which of these monsters only spawns at night?", new String[]{"Zombie Villager", "Ghast"});
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
index f5c97738..add30907 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java
@@ -1,12 +1,11 @@
 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 me.xmrvizzy.skyblocker.gui.ColorHighlight;
+import me.xmrvizzy.skyblocker.gui.ContainerSolver;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-// import net.minecraft.registry.Registry;
 import net.minecraft.registry.Registries;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Identifier;
@@ -27,27 +26,28 @@ public class ColorTerminal extends ContainerSolver {
     }
 
     @Override
-    public boolean isEnabled() {
+    protected boolean isEnabled() {
         targetColor = null;
         return SkyblockerConfig.get().locations.dungeons.terminals.solveColor;
     }
 
     @Override
-    public List<ColorHighlight> getColors(String[] groups, Map<Integer, ItemStack> slots) {
+    protected List<ColorHighlight> getColors(String[] groups, Map<Integer, ItemStack> slots) {
         trimEdges(slots, 6);
         List<ColorHighlight> highlights = new ArrayList<>();
         String colorString = groups[0];
-        if(targetColor == null) {
+        if (targetColor == null) {
             targetColor = colorFromName.get(colorString);
-            if(targetColor == null) {
+            if (targetColor == null) {
                 LOGGER.error("[Skyblocker] Couldn't find dye color corresponding to \"" + colorString + "\"");
                 return Collections.emptyList();
             }
         }
-        for(Map.Entry<Integer, ItemStack> slot : slots.entrySet()) {
+        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));
+            if (!itemStack.hasEnchantments() && targetColor.equals(itemColor.get(itemStack.getItem()))) {
+                highlights.add(ColorHighlight.green(slot.getKey()));
+            }
         }
         return highlights;
     }
@@ -63,7 +63,6 @@ public class ColorTerminal extends ContainerSolver {
         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(Registries.ITEM.get(new Identifier(color.getName() + '_' + item)), color);
         itemColor.put(Items.BONE_MEAL, DyeColor.WHITE);
         itemColor.put(Items.LAPIS_LAZULI, DyeColor.BLUE);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/OrderTerminal.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/OrderTerminal.java
index c61395f4..3b4e1c50 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/OrderTerminal.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/OrderTerminal.java
@@ -1,8 +1,8 @@
 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 me.xmrvizzy.skyblocker.gui.ColorHighlight;
+import me.xmrvizzy.skyblocker.gui.ContainerSolver;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 
@@ -21,14 +21,14 @@ public class OrderTerminal extends ContainerSolver {
     }
 
     @Override
-    public boolean isEnabled() {
+    protected boolean isEnabled() {
         orderedSlots = null;
         currentNum = 0;
         return SkyblockerConfig.get().locations.dungeons.terminals.solveOrder;
     }
 
     @Override
-    public List<ColorHighlight> getColors(String[] groups, Map<Integer, ItemStack> slots) {
+    protected List<ColorHighlight> getColors(String[] groups, Map<Integer, ItemStack> slots) {
         if(orderedSlots == null && !orderSlots(slots))
             return Collections.emptyList();
         while(currentNum < PANES_NUM && Items.LIME_STAINED_GLASS_PANE.equals(slots.get(orderedSlots[currentNum]).getItem()))
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java
index 7c56746f..18326254 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java
@@ -1,8 +1,8 @@
 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 me.xmrvizzy.skyblocker.gui.ColorHighlight;
+import me.xmrvizzy.skyblocker.gui.ContainerSolver;
 import net.minecraft.item.ItemStack;
 
 import java.util.ArrayList;
@@ -15,19 +15,20 @@ public class StartsWithTerminal extends ContainerSolver {
     }
 
     @Override
-    public boolean isEnabled() {
+    protected boolean isEnabled() {
         return SkyblockerConfig.get().locations.dungeons.terminals.solveStartsWith;
     }
 
     @Override
-    public List<ColorHighlight> getColors(String[] groups, Map<Integer, ItemStack> slots) {
+    protected List<ColorHighlight> getColors(String[] groups, Map<Integer, ItemStack> slots) {
         trimEdges(slots, 6);
         String prefix = groups[0];
         List<ColorHighlight> highlights = new ArrayList<>();
-        for(Map.Entry<Integer, ItemStack> slot : slots.entrySet()) {
+        for (Map.Entry<Integer, ItemStack> slot : slots.entrySet()) {
             ItemStack stack = slot.getValue();
-            if(!stack.hasEnchantments() && stack.getName().getString().startsWith(prefix))
-                highlights.add(new ColorHighlight(slot.getKey(), GREEN_HIGHLIGHT));
+            if (!stack.hasEnchantments() && stack.getName().getString().startsWith(prefix)) {
+                highlights.add(ColorHighlight.green(slot.getKey()));
+            }
         }
         return highlights;
     }