Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into cleanup-2

# Conflicts:
#	src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
#	src/main/java/de/hysky/skyblocker/utils/Http.java
#	src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java

Pull changes from upstream master

39 files changed, 2067 insertions, 835 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/FairySouls.java b/src/main/java/de/hysky/skyblocker/skyblock/FairySouls.java
index 24465e06..cef17d8e 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/FairySouls.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/FairySouls.java
@@ -1,6 +1,5 @@
 package de.hysky.skyblocker.skyblock;
 
-import com.google.common.collect.ImmutableSet;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -9,7 +8,8 @@ import com.mojang.brigadier.CommandDispatcher;
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
-import de.hysky.skyblocker.utils.NEURepo;
+import de.hysky.skyblocker.utils.Constants;
+import de.hysky.skyblocker.utils.NEURepoManager;
 import de.hysky.skyblocker.utils.PosUtils;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.render.RenderHelper;
@@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory;
 import java.io.*;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
 
 import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 
@@ -64,25 +65,10 @@ public class FairySouls {
     }
 
     private static void loadFairySouls() {
-        fairySoulsLoaded = NEURepo.runAsyncAfterLoad(() -> {
-            try (BufferedReader reader = new BufferedReader(new FileReader(NEURepo.LOCAL_REPO_DIR.resolve("constants").resolve("fairy_souls.json").toFile()))) {
-                for (Map.Entry<String, JsonElement> fairySoulJson : JsonParser.parseReader(reader).getAsJsonObject().asMap().entrySet()) {
-                    if (fairySoulJson.getKey().equals("//") || fairySoulJson.getKey().equals("Max Souls")) {
-                        if (fairySoulJson.getKey().equals("Max Souls")) {
-                            maxSouls = fairySoulJson.getValue().getAsInt();
-                        }
-                        continue;
-                    }
-                    ImmutableSet.Builder<BlockPos> fairySoulsForLocation = ImmutableSet.builder();
-                    for (JsonElement fairySoul : fairySoulJson.getValue().getAsJsonArray().asList()) {
-                        fairySoulsForLocation.add(PosUtils.parsePosString(fairySoul.getAsString()));
-                    }
-                    fairySouls.put(fairySoulJson.getKey(), fairySoulsForLocation.build());
-                }
-                LOGGER.debug("[Skyblocker] Loaded fairy soul locations");
-            } catch (IOException e) {
-                LOGGER.error("[Skyblocker] Failed to load fairy soul locations", e);
-            }
+        fairySoulsLoaded = NEURepoManager.runAsyncAfterLoad(() -> {
+            maxSouls = NEURepoManager.NEU_REPO.getConstants().getFairySouls().getMaxSouls();
+            NEURepoManager.NEU_REPO.getConstants().getFairySouls().getSoulLocations().forEach((location, fairySoulsForLocation) -> fairySouls.put(location, fairySoulsForLocation.stream().map(coordinate -> new BlockPos(coordinate.getX(), coordinate.getY(), coordinate.getZ())).collect(Collectors.toUnmodifiableSet())));
+            LOGGER.debug("[Skyblocker] Loaded {} fairy souls across {} locations", fairySouls.values().stream().mapToInt(Set::size).sum(), fairySouls.size());
 
             try (BufferedReader reader = new BufferedReader(new FileReader(SkyblockerMod.CONFIG_DIR.resolve("found_fairy_souls.json").toFile()))) {
                 for (Map.Entry<String, JsonElement> foundFairiesForProfileJson : JsonParser.parseReader(reader).getAsJsonObject().asMap().entrySet()) {
@@ -101,6 +87,7 @@ public class FairySouls {
             } catch (IOException e) {
                 LOGGER.error("[Skyblocker] Failed to load found fairy souls", e);
             }
+            LOGGER.info("[Skyblocker] Loaded {} fairy souls across {} locations and {} found fairy souls across {} locations in {} profiles", fairySouls.values().stream().mapToInt(Set::size).sum(), fairySouls.size(), foundFairies.values().stream().map(Map::values).flatMap(Collection::stream).mapToInt(Set::size).sum(), foundFairies.values().stream().mapToInt(Map::size).sum(), foundFairies.size());
         });
     }
 
@@ -131,12 +118,12 @@ public class FairySouls {
                 .then(literal("fairySouls")
                         .then(literal("markAllInCurrentIslandFound").executes(context -> {
                             FairySouls.markAllFairiesOnCurrentIslandFound();
-                            context.getSource().sendFeedback(Text.translatable("skyblocker.fairySouls.markAllFound"));
+                            context.getSource().sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.fairySouls.markAllFound")));
                             return 1;
                         }))
                         .then(literal("markAllInCurrentIslandMissing").executes(context -> {
                             FairySouls.markAllFairiesOnCurrentIslandMissing();
-                            context.getSource().sendFeedback(Text.translatable("skyblocker.fairySouls.markAllMissing"));
+                            context.getSource().sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.fairySouls.markAllMissing")));
                             return 1;
                         }))));
     }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java b/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java
index 5ea5513e..c290e5b8 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java
@@ -1,8 +1,7 @@
 package de.hysky.skyblocker.skyblock;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
-import de.hysky.skyblocker.skyblock.item.PriceInfoTooltip;
+import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip;
 import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.render.RenderHelper;
@@ -27,7 +26,7 @@ public class TeleportOverlay {
     private static void render(WorldRenderContext wrc) {
         if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().general.teleportOverlay.enableTeleportOverlays && client.player != null && client.world != null) {
             ItemStack heldItem = client.player.getMainHandStack();
-            String itemId = PriceInfoTooltip.getInternalNameFromNBT(heldItem, true);
+            String itemId = ItemTooltip.getInternalNameFromNBT(heldItem, true);
             NbtCompound extraAttributes = ItemUtils.getExtraAttributes(heldItem);
 
             if (itemId != null) {
@@ -103,13 +102,7 @@ public class TeleportOverlay {
         @SuppressWarnings("DataFlowIssue")
         BlockState state = client.world.getBlockState(pos);
         if (!state.isAir() && client.world.getBlockState(pos.up()).isAir() && client.world.getBlockState(pos.up(2)).isAir()) {
-            RenderSystem.polygonOffset(-1f, -10f);
-            RenderSystem.enablePolygonOffset();
-
             RenderHelper.renderFilledIfVisible(wrc, pos, COLOR_COMPONENTS, 0.5f);
-
-            RenderSystem.polygonOffset(0f, 0f);
-            RenderSystem.disablePolygonOffset();
         }
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/diana/MythologicalRitual.java b/src/main/java/de/hysky/skyblocker/skyblock/diana/MythologicalRitual.java
new file mode 100644
index 00000000..e2962702
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/diana/MythologicalRitual.java
@@ -0,0 +1,213 @@
+package de.hysky.skyblocker.skyblock.diana;
+
+import com.mojang.brigadier.Command;
+import de.hysky.skyblocker.SkyblockerMod;
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.utils.ItemUtils;
+import de.hysky.skyblocker.utils.Utils;
+import de.hysky.skyblocker.utils.render.RenderHelper;
+import de.hysky.skyblocker.utils.waypoint.Waypoint;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
+import net.fabricmc.fabric.api.event.player.AttackBlockCallback;
+import net.fabricmc.fabric.api.event.player.UseBlockCallback;
+import net.fabricmc.fabric.api.event.player.UseItemCallback;
+import net.fabricmc.fabric.api.util.TriState;
+import net.minecraft.block.Blocks;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.command.argument.BlockPosArgumentType;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.packet.s2c.play.ParticleS2CPacket;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.text.Text;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.DyeColor;
+import net.minecraft.util.Hand;
+import net.minecraft.util.TypedActionResult;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+import org.apache.commons.math3.stat.regression.SimpleRegression;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument;
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
+
+public class MythologicalRitual {
+    private static final Pattern GRIFFIN_BURROW_DUG = Pattern.compile("(?<message>You dug out a Griffin Burrow!|You finished the Griffin burrow chain!) \\((?<index>\\d)/4\\)");
+    private static final float[] ORANGE_COLOR_COMPONENTS = DyeColor.ORANGE.getColorComponents();
+    private static long lastEchoTime;
+    private static final Map<BlockPos, GriffinBurrow> griffinBurrows = new HashMap<>();
+    @Nullable
+    private static BlockPos lastDugBurrowPos;
+    private static GriffinBurrow previousBurrow = new GriffinBurrow(BlockPos.ORIGIN);
+
+    public static void init() {
+        WorldRenderEvents.AFTER_TRANSLUCENT.register(MythologicalRitual::render);
+        AttackBlockCallback.EVENT.register(MythologicalRitual::onAttackBlock);
+        UseBlockCallback.EVENT.register(MythologicalRitual::onUseBlock);
+        UseItemCallback.EVENT.register(MythologicalRitual::onUseItem);
+        ClientReceiveMessageEvents.GAME.register(MythologicalRitual::onChatMessage);
+        ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(literal(SkyblockerMod.NAMESPACE).then(literal("diana")
+                .then(literal("clearGriffinBurrows").executes(context -> {
+                    griffinBurrows.clear();
+                    return Command.SINGLE_SUCCESS;
+                }))
+                .then(literal("clearGriffinBurrow")
+                        .then(argument("pos", BlockPosArgumentType.blockPos()).executes(context -> {
+                            griffinBurrows.remove(context.getArgument("pos", BlockPos.class));
+                            return Command.SINGLE_SUCCESS;
+                        }))
+                )
+        )));
+
+        // Put a root burrow so echo detection works without a previous burrow
+        previousBurrow.confirmed = TriState.DEFAULT;
+        griffinBurrows.put(BlockPos.ORIGIN, previousBurrow);
+    }
+
+    public static void onParticle(ParticleS2CPacket packet) {
+        if (isActive()) {
+            if (ParticleTypes.CRIT.equals(packet.getParameters().getType()) || ParticleTypes.ENCHANT.equals(packet.getParameters().getType())) {
+                BlockPos pos = BlockPos.ofFloored(packet.getX(), packet.getY(), packet.getZ()).down();
+                if (MinecraftClient.getInstance().world == null || !MinecraftClient.getInstance().world.getBlockState(pos).isOf(Blocks.GRASS_BLOCK)) {
+                    return;
+                }
+                GriffinBurrow burrow = griffinBurrows.computeIfAbsent(pos, GriffinBurrow::new);
+                if (ParticleTypes.CRIT.equals(packet.getParameters().getType())) burrow.critParticle++;
+                if (ParticleTypes.ENCHANT.equals(packet.getParameters().getType())) burrow.enchantParticle++;
+                if (burrow.critParticle >= 5 && burrow.enchantParticle >= 5 && burrow.confirmed == TriState.FALSE) {
+                    griffinBurrows.get(pos).init();
+                }
+            } else if (ParticleTypes.DUST.equals(packet.getParameters().getType())) {
+                BlockPos pos = BlockPos.ofFloored(packet.getX(), packet.getY(), packet.getZ()).down(2);
+                GriffinBurrow burrow = griffinBurrows.get(pos);
+                if (burrow == null) {
+                    return;
+                }
+                burrow.regression.addData(packet.getX(), packet.getZ());
+                double slope = burrow.regression.getSlope();
+                if (Double.isNaN(slope)) {
+                    return;
+                }
+                Vec3d nextBurrowDirection = new Vec3d(100, 0, slope * 100).normalize().multiply(100);
+                if (burrow.nextBurrowPlane == null) {
+                    burrow.nextBurrowPlane = new Vec3d[4];
+                }
+                burrow.nextBurrowPlane[0] = Vec3d.of(pos).add(nextBurrowDirection).subtract(0, 50, 0);
+                burrow.nextBurrowPlane[1] = Vec3d.of(pos).subtract(nextBurrowDirection).subtract(0, 50, 0);
+                burrow.nextBurrowPlane[2] = burrow.nextBurrowPlane[1].add(0, 100, 0);
+                burrow.nextBurrowPlane[3] = burrow.nextBurrowPlane[0].add(0, 100, 0);
+            } else if (ParticleTypes.DRIPPING_LAVA.equals(packet.getParameters().getType())) {
+                if (System.currentTimeMillis() > lastEchoTime + 10_000) {
+                    return;
+                }
+                if (previousBurrow.echoBurrowDirection == null) {
+                    previousBurrow.echoBurrowDirection = new Vec3d[2];
+                }
+                previousBurrow.echoBurrowDirection[0] = previousBurrow.echoBurrowDirection[1];
+                previousBurrow.echoBurrowDirection[1] = new Vec3d(packet.getX(), packet.getY(), packet.getZ());
+                if (previousBurrow.echoBurrowDirection[0] == null || previousBurrow.echoBurrowDirection[1] == null) {
+                    return;
+                }
+                Vec3d echoBurrowDirection = previousBurrow.echoBurrowDirection[1].subtract(previousBurrow.echoBurrowDirection[0]).normalize().multiply(100);
+                if (previousBurrow.echoBurrowPlane == null) {
+                    previousBurrow.echoBurrowPlane = new Vec3d[4];
+                }
+                previousBurrow.echoBurrowPlane[0] = previousBurrow.echoBurrowDirection[0].add(echoBurrowDirection).subtract(0, 50, 0);
+                previousBurrow.echoBurrowPlane[1] = previousBurrow.echoBurrowDirection[0].subtract(echoBurrowDirection).subtract(0, 50, 0);
+                previousBurrow.echoBurrowPlane[2] = previousBurrow.echoBurrowPlane[1].add(0, 100, 0);
+                previousBurrow.echoBurrowPlane[3] = previousBurrow.echoBurrowPlane[0].add(0, 100, 0);
+            }
+        }
+    }
+
+    public static void render(WorldRenderContext context) {
+        if (isActive()) {
+            for (GriffinBurrow burrow : griffinBurrows.values()) {
+                if (burrow.shouldRender()) {
+                    burrow.render(context);
+                }
+                if (burrow.confirmed != TriState.FALSE) {
+                    if (burrow.nextBurrowPlane != null) {
+                        RenderHelper.renderQuad(context, burrow.nextBurrowPlane, ORANGE_COLOR_COMPONENTS, 0.25F, true);
+                    }
+                    if (burrow.echoBurrowPlane != null) {
+                        RenderHelper.renderQuad(context, burrow.echoBurrowPlane, ORANGE_COLOR_COMPONENTS, 0.25F, true);
+                    }
+                }
+            }
+        }
+    }
+
+    public static ActionResult onAttackBlock(PlayerEntity player, World world, Hand hand, BlockPos pos, Direction direction) {
+        return onInteractBlock(pos);
+    }
+
+    public static ActionResult onUseBlock(PlayerEntity player, World world, Hand hand, BlockHitResult hitResult) {
+        return onInteractBlock(hitResult.getBlockPos());
+    }
+
+    @NotNull
+    private static ActionResult onInteractBlock(BlockPos pos) {
+        if (isActive() && griffinBurrows.containsKey(pos)) {
+            lastDugBurrowPos = pos;
+        }
+        return ActionResult.PASS;
+    }
+
+    public static TypedActionResult<ItemStack> onUseItem(PlayerEntity player, World world, Hand hand) {
+        ItemStack stack = player.getStackInHand(hand);
+        if (isActive() && ItemUtils.getItemId(stack).equals("ANCESTRAL_SPADE")) {
+            lastEchoTime = System.currentTimeMillis();
+        }
+        return TypedActionResult.pass(stack);
+    }
+
+    public static void onChatMessage(Text message, boolean overlay) {
+        if (isActive() && GRIFFIN_BURROW_DUG.matcher(message.getString()).matches()) {
+            previousBurrow.confirmed = TriState.FALSE;
+            previousBurrow = griffinBurrows.get(lastDugBurrowPos);
+            previousBurrow.confirmed = TriState.DEFAULT;
+        }
+    }
+
+    private static boolean isActive() {
+        return SkyblockerConfigManager.get().general.mythologicalRitual.enableMythologicalRitualHelper && Utils.getLocationRaw().equals("hub");
+    }
+
+    private static class GriffinBurrow extends Waypoint {
+        private int critParticle;
+        private int enchantParticle;
+        private TriState confirmed = TriState.FALSE;
+        private final SimpleRegression regression = new SimpleRegression();
+        private Vec3d[] nextBurrowPlane;
+        @Nullable
+        private Vec3d[] echoBurrowDirection;
+        private Vec3d[] echoBurrowPlane;
+
+        private GriffinBurrow(BlockPos pos) {
+            super(pos, Type.WAYPOINT, ORANGE_COLOR_COMPONENTS, 0.25F);
+        }
+
+        private void init() {
+            confirmed = TriState.TRUE;
+            regression.clear();
+        }
+
+        @Override
+        public boolean shouldRender() {
+            return super.shouldRender() && confirmed == TriState.TRUE;
+        }
+    }
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java
index 6369291b..689788e1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java
@@ -237,12 +237,12 @@ public class CreeperBeams {
         // render either in a color if not created or faintly green if created
         public void render(WorldRenderContext wrc, float[] color) {
             if (toDo) {
-                RenderHelper.renderOutline(wrc, outlineOne, color, 3);
-                RenderHelper.renderOutline(wrc, outlineTwo, color, 3);
+                RenderHelper.renderOutline(wrc, outlineOne, color, 3, false);
+                RenderHelper.renderOutline(wrc, outlineTwo, color, 3, false);
                 RenderHelper.renderLinesFromPoints(wrc, line, color, 1, 2);
             } else {
-                RenderHelper.renderOutline(wrc, outlineOne, LIME_COLOR_COMPONENTS, 1);
-                RenderHelper.renderOutline(wrc, outlineTwo, LIME_COLOR_COMPONENTS, 1);
+                RenderHelper.renderOutline(wrc, outlineOne, LIME_COLOR_COMPONENTS, 1, false);
+                RenderHelper.renderOutline(wrc, outlineTwo, LIME_COLOR_COMPONENTS, 1, false);
                 RenderHelper.renderLinesFromPoints(wrc, line, LIME_COLOR_COMPONENTS, 0.75f, 1);
             }
         }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonBlaze.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonBlaze.java
index cfb16b4d..f49a2f2e 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonBlaze.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonBlaze.java
@@ -128,11 +128,11 @@ public class DungeonBlaze {
      */
     private static void renderBlazeOutline(ArmorStandEntity blaze, ArmorStandEntity nextBlaze, WorldRenderContext wrc) {
         Box blazeBox = blaze.getBoundingBox().expand(0.3, 0.9, 0.3).offset(0, -1.1, 0);
-        RenderHelper.renderOutline(wrc, blazeBox, GREEN_COLOR_COMPONENTS, 5f);
+        RenderHelper.renderOutline(wrc, blazeBox, GREEN_COLOR_COMPONENTS, 5f, false);
 
         if (nextBlaze != null && nextBlaze.isAlive() && nextBlaze != blaze) {
             Box nextBlazeBox = nextBlaze.getBoundingBox().expand(0.3, 0.9, 0.3).offset(0, -1.1, 0);
-            RenderHelper.renderOutline(wrc, nextBlazeBox, WHITE_COLOR_COMPONENTS, 5f);
+            RenderHelper.renderOutline(wrc, nextBlazeBox, WHITE_COLOR_COMPONENTS, 5f, false);
 
             Vec3d blazeCenter = blazeBox.getCenter();
             Vec3d nextBlazeCenter = nextBlazeBox.getCenter();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonChestProfit.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonChestProfit.java
index 4e6a5240..1e889af3 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonChestProfit.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonChestProfit.java
@@ -4,7 +4,8 @@ import com.google.gson.JsonObject;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.mixin.accessor.ScreenAccessor;
-import de.hysky.skyblocker.skyblock.item.PriceInfoTooltip;
+import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip;
+import de.hysky.skyblocker.skyblock.item.tooltip.TooltipInfoType;
 import de.hysky.skyblocker.utils.Utils;
 import it.unimi.dsi.fastutil.ints.IntBooleanPair;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
@@ -54,7 +55,7 @@ public class DungeonChestProfit {
 
 					if (!stack.isEmpty()) {
 						String name = stack.getName().getString();
-						String id = PriceInfoTooltip.getInternalNameFromNBT(stack, false);
+						String id = ItemTooltip.getInternalNameFromNBT(stack, false);
 
 						//Regular item price
 						if (id != null) {
@@ -128,8 +129,8 @@ public class DungeonChestProfit {
 	 * was based on complete data.
 	 */
 	private static IntBooleanPair getItemPrice(String id) {
-		JsonObject bazaarPrices = PriceInfoTooltip.getBazaarPrices();
-		JsonObject lbinPrices = PriceInfoTooltip.getLBINPrices();
+		JsonObject bazaarPrices = TooltipInfoType.BAZAAR.getData();
+		JsonObject lbinPrices = TooltipInfoType.LOWEST_BINS.getData();
 
 		if (bazaarPrices == null || lbinPrices == null) return IntBooleanPair.of(0, false);
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
index 69018cd4..c198238b 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
@@ -57,6 +57,7 @@ public class DungeonMapConfigScreen extends Screen {
 		SkyblockerConfigManager.get().locations.dungeons.mapX = hudX;
 		SkyblockerConfigManager.get().locations.dungeons.mapY = hudY;
 		SkyblockerConfigManager.save();
+		
 		this.client.setScreen(parent);
 	}
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/TicTacToe.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/TicTacToe.java
index 2d56c8a0..7f249e7d 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/TicTacToe.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/TicTacToe.java
@@ -127,7 +127,7 @@ public class TicTacToe {
 	private static void solutionRenderer(WorldRenderContext context) {
 		try {
 			if (SkyblockerConfigManager.get().locations.dungeons.solveTicTacToe && nextBestMoveToMake != null) {
-				RenderHelper.renderOutline(context, nextBestMoveToMake, RED_COLOR_COMPONENTS, 5);
+				RenderHelper.renderOutline(context, nextBestMoveToMake, RED_COLOR_COMPONENTS, 5, false);
 			}
 		} catch (Exception e) {
 			LOGGER.error("[Skyblocker Tic Tac Toe] Encountered an exception while rendering the tic tac toe solution!", e);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonMapUtils.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonMapUtils.java
index 259cc3f3..73d4a452 100644
--- a/