Merge branch 'master' into autorejoin2

7 files changed, 34 insertions, 34 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 ec3655f0..2d868782 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/CroesusHelper.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/CroesusHelper.java
@@ -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/DungeonMap.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java
index e5441b5c..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,14 +2,13 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 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.DrawableHelper;
+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;
@@ -50,11 +49,10 @@ public class DungeonMap {
         }
     }
     
-    public static void renderHUDMap(MatrixStack matrices, int x, int y) {
+    public static void renderHUDMap(DrawContext context, int x, int y) {
     	float scaling = SkyblockerConfig.get().locations.dungeons.mapScaling;
     	int size = (int) (128 * scaling);
-    	RenderSystem.setShaderTexture(0, MAP_BACKGROUND);
-    	DrawableHelper.drawTexture(matrices, x, y, 0, 0, size, size, size, size);
+    	context.drawTexture(MAP_BACKGROUND, x, y, 0, 0, size, size, size, size);
     }
     
     public static void init() {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
index 8fba6a7a..ffd7a8b6 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
@@ -5,8 +5,8 @@ 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.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 
 public class DungeonMapConfigScreen extends Screen {
@@ -19,11 +19,11 @@ public class DungeonMapConfigScreen extends Screen {
 	}
 	
 	@Override
-	public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-		super.render(matrices, mouseX, mouseY, delta);
-		renderBackground(matrices);
-		DungeonMap.renderHUDMap(matrices, hudX, hudY);
-		drawCenteredTextWithShadow(matrices, textRenderer, "Right Click To Reset Position", width / 2, height / 2, Color.GRAY.getRGB());
+	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
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/LividColor.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/LividColor.java
index 276a41b6..4701c485 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/LividColor.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/LividColor.java
@@ -11,11 +11,10 @@ public class LividColor {
     private static int tenTicks = 0;
 
     public static void init() {
-        ClientReceiveMessageEvents.ALLOW_GAME.register((message, overlay) -> {
+        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;
             }
-            return true;
         });
     }
 
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 0bfc0d60..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
@@ -6,7 +6,6 @@ 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 1cf0dcfc..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
@@ -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 26d2a2c4..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
@@ -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;
     }