Merge pull request #418 from kevinthegreat1/waypoint

Waypoint API

19 files changed, 392 insertions, 244 deletions

diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
index ad3b6318..cbe82667 100644
--- a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
+++ b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
@@ -5,7 +5,7 @@ import com.google.gson.GsonBuilder;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.debug.Debug;
 import de.hysky.skyblocker.skyblock.*;
-import de.hysky.skyblocker.skyblock.diana.MythologicalRitual;
+import de.hysky.skyblocker.skyblock.waypoint.MythologicalRitual;
 import de.hysky.skyblocker.skyblock.dungeon.*;
 import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonSecrets;
 import de.hysky.skyblocker.skyblock.dungeon.secrets.SecretsTracker;
@@ -18,10 +18,11 @@ import de.hysky.skyblocker.skyblock.quicknav.QuickNav;
 import de.hysky.skyblocker.skyblock.rift.TheRift;
 import de.hysky.skyblocker.skyblock.shortcut.Shortcuts;
 import de.hysky.skyblocker.skyblock.special.SpecialEffects;
-import de.hysky.skyblocker.skyblock.spidersden.Relics;
+import de.hysky.skyblocker.skyblock.waypoint.Relics;
 import de.hysky.skyblocker.skyblock.tabhud.TabHud;
 import de.hysky.skyblocker.skyblock.tabhud.screenbuilder.ScreenMaster;
 import de.hysky.skyblocker.skyblock.tabhud.util.PlayerListMgr;
+import de.hysky.skyblocker.skyblock.waypoint.FairySouls;
 import de.hysky.skyblocker.utils.ApiUtils;
 import de.hysky.skyblocker.utils.NEURepoManager;
 import de.hysky.skyblocker.utils.Utils;
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index 6f3a8e4a..59203269 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -189,6 +189,9 @@ public class SkyblockerConfig {
 		public Shortcuts shortcuts = new Shortcuts();
 
 		@SerialEntry
+		public Waypoints waypoints = new Waypoints();
+
+		@SerialEntry
 		public QuiverWarning quiverWarning = new QuiverWarning();
 
 		@SerialEntry
@@ -254,8 +257,8 @@ public class SkyblockerConfig {
 		@Override
 		public String toString() {
 			return switch (this) {
-			case DEFAULT -> "Default";
-			case ALPHABETICAL -> "Alphabetical";
+				case DEFAULT -> "Default";
+				case ALPHABETICAL -> "Alphabetical";
 			};
 		}
 	}
@@ -293,10 +296,10 @@ public class SkyblockerConfig {
 
 		public int toInt() {
 			return switch (this) {
-			case LAYER1 -> 0;
-			case LAYER2 -> 1;
-			case RIGHT -> 2;
-			case NONE -> -1;
+				case LAYER1 -> 0;
+				case LAYER2 -> 1;
+				case RIGHT -> 2;
+				case NONE -> -1;
 			};
 		}
 	}
@@ -349,6 +352,14 @@ public class SkyblockerConfig {
 		public boolean enableCommandArgShortcuts = true;
 	}
 
+	public static class Waypoints {
+		@SerialEntry
+		public boolean enableWaypoints = true;
+
+		@SerialEntry
+		public Waypoint.Type waypointType = Waypoint.Type.WAYPOINT;
+	}
+
 	public static class QuiverWarning {
 		@SerialEntry
 		public boolean enableQuiverWarning = true;
@@ -419,8 +430,8 @@ public class SkyblockerConfig {
 		@Override
 		public String toString() {
 			return switch (this) {
-			case HORIZONTAL -> "Horizontal";
-			case VERTICAL -> "Vertical";
+				case HORIZONTAL -> "Horizontal";
+				case VERTICAL -> "Vertical";
 			};
 		}
 	}
@@ -431,9 +442,9 @@ public class SkyblockerConfig {
 		@Override
 		public String toString() {
 			return switch (this) {
-			case LEFT -> "Left";
-			case RIGHT -> "Right";
-			case MIDDLE -> "Middle";
+				case LEFT -> "Left";
+				case RIGHT -> "Right";
+				case MIDDLE -> "Middle";
 			};
 		}
 	}
@@ -515,7 +526,7 @@ public class SkyblockerConfig {
 
 		public final Identifier tex;
 
-		private RarityBackgroundStyle(Identifier tex) {
+		RarityBackgroundStyle(Identifier tex) {
 			this.tex = tex;
 		}
 
@@ -743,9 +754,9 @@ public class SkyblockerConfig {
 		@Override
 		public String toString() {
 			return switch (this) {
-			case SIMPLE -> "Simple";
-			case FANCY -> "Fancy";
-			case CLASSIC -> "Classic";
+				case SIMPLE -> "Simple";
+				case FANCY -> "Fancy";
+				case CLASSIC -> "Classic";
 			};
 		}
 	}
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
index 007d974c..7bb6414c 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
@@ -45,8 +45,8 @@ public class DungeonsCategory {
 								.flag(OptionFlag.GAME_RESTART)
 								.build())
 						.option(Option.<Type>createBuilder()
-								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.waypointType"))
-								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.waypointType.@Tooltip")))
+								.name(Text.translatable("text.autoconfig.skyblocker.option.general.waypoints.waypointType"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.waypoints.waypointType.@Tooltip")))
 								.binding(defaults.locations.dungeons.secretWaypoints.waypointType,
 										() -> config.locations.dungeons.secretWaypoints.waypointType,
 										newValue -> config.locations.dungeons.secretWaypoints.waypointType = newValue)
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
index 7e7a91fd..be5f0665 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
@@ -4,6 +4,7 @@ import de.hysky.skyblocker.config.ConfigUtils;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.skyblock.shortcut.ShortcutsConfigScreen;
 import de.hysky.skyblocker.utils.render.title.TitleContainerConfigScreen;
+import de.hysky.skyblocker.utils.waypoint.Waypoint;
 import dev.isxander.yacl3.api.*;
 import dev.isxander.yacl3.api.controller.FloatFieldControllerBuilder;
 import dev.isxander.yacl3.api.controller.FloatSliderControllerBuilder;
@@ -261,6 +262,27 @@ public class GeneralCategory {
 								.build())
 						.build())
 
+				//Waypoints
+				.group(OptionGroup.createBuilder()
+						.name(Text.translatable("text.autoconfig.skyblocker.option.general.waypoints"))
+						.collapsed(true)
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("text.autoconfig.skyblocker.option.general.waypoints.enableWaypoints"))
+								.binding(defaults.general.waypoints.enableWaypoints,
+										() -> config.general.waypoints.enableWaypoints,
+										newValue -> config.general.waypoints.enableWaypoints = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+						.option(Option.<Waypoint.Type>createBuilder()
+								.name(Text.translatable("text.autoconfig.skyblocker.option.general.waypoints.waypointType"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.waypoints.waypointType.@Tooltip"), Text.translatable("text.autoconfig.skyblocker.option.general.waypoints.waypointType.generalNote")))
+								.binding(defaults.general.waypoints.waypointType,
+										() -> config.general.waypoints.waypointType,
+										newValue -> config.general.waypoints.waypointType = newValue)
+								.controller(ConfigUtils::createEnumCyclingListController)
+								.build())
+						.build())
+
 				//Quiver Warning
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.general.quiverWarning"))
diff --git a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
index f68a4e94..384986ae 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
@@ -3,7 +3,7 @@ package de.hysky.skyblocker.mixin;
 import com.llamalad7.mixinextras.injector.WrapWithCondition;
 import com.llamalad7.mixinextras.sugar.Local;
 import de.hysky.skyblocker.skyblock.FishingHelper;
-import de.hysky.skyblocker.skyblock.diana.MythologicalRitual;
+import de.hysky.skyblocker.skyblock.waypoint.MythologicalRitual;
 import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonSecrets;
 import de.hysky.skyblocker.utils.Utils;
 import dev.cbyrne.betterinject.annotations.Inject;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java b/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java
index c290e5b8..e572d9dc 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java
@@ -102,7 +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()) {
-            RenderHelper.renderFilledIfVisible(wrc, pos, COLOR_COMPONENTS, 0.5f);
+            RenderHelper.renderFilled(wrc, pos, COLOR_COMPONENTS, 0.5f, false);
         }
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Trivia.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Trivia.java
index 262d4a4e..53368c14 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Trivia.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Trivia.java
@@ -1,7 +1,7 @@
 package de.hysky.skyblocker.skyblock.dungeon;
 
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
-import de.hysky.skyblocker.skyblock.FairySouls;
+import de.hysky.skyblocker.skyblock.waypoint.FairySouls;
 import de.hysky.skyblocker.utils.chat.ChatFilterResult;
 import de.hysky.skyblocker.utils.chat.ChatPatternListener;
 import net.minecraft.client.MinecraftClient;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java
index 7ebf44b0..95e08c80 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java
@@ -58,11 +58,11 @@ public class EffigyWaypoints {
             for (BlockPos effigy : UNBROKEN_EFFIGIES) {
                 float[] colorComponents = DyeColor.RED.getColorComponents();
                 if (SkyblockerConfigManager.get().slayer.vampireSlayer.compactEffigyWaypoints) {
-                    RenderHelper.renderFilledThroughWallsWithBeaconBeam(context, effigy.down(6), colorComponents, 0.5F);
+                    RenderHelper.renderFilledWithBeaconBeam(context, effigy.down(6), colorComponents, 0.5F, true);
                 } else {
-                    RenderHelper.renderFilledThroughWallsWithBeaconBeam(context, effigy, colorComponents, 0.5F);
+                    RenderHelper.renderFilledWithBeaconBeam(context, effigy, colorComponents, 0.5F, true);
                     for (int i = 1; i < 6; i++) {
-                        RenderHelper.renderFilledThroughWalls(context, effigy.down(i), colorComponents, 0.5F - (0.075F * i));
+                        RenderHelper.renderFilled(context, effigy.down(i), colorComponents, 0.5F - (0.075F * i), true);
                     }
                 }
             }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/EnigmaSouls.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/EnigmaSouls.java
index 744edd4c..aa55a4e3 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/rift/EnigmaSouls.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/EnigmaSouls.java
@@ -1,38 +1,19 @@
 package de.hysky.skyblocker.skyblock.rift;
 
-import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.mojang.brigadier.Command;
 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.Constants;
 import de.hysky.skyblocker.utils.PosUtils;
 import de.hysky.skyblocker.utils.Utils;
-import de.hysky.skyblocker.utils.render.RenderHelper;
-import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
+import de.hysky.skyblocker.utils.waypoint.ProfileAwareWaypoint;
+import de.hysky.skyblocker.utils.waypoint.Waypoint;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
 import net.minecraft.client.MinecraftClient;
@@ -43,13 +24,27 @@ import net.minecraft.util.DyeColor;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
+
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 
 public class EnigmaSouls {
 	private static final Logger LOGGER = LoggerFactory.getLogger(EnigmaSouls.class);
+	private static final Supplier<Waypoint.Type> TYPE_SUPPLIER = () -> SkyblockerConfigManager.get().general.waypoints.waypointType;
 	private static final Identifier WAYPOINTS_JSON = new Identifier(SkyblockerMod.NAMESPACE, "rift/enigma_soul_waypoints.json");
-	private static final BlockPos[] SOUL_WAYPOINTS = new BlockPos[42];
+	private static final Map<BlockPos, ProfileAwareWaypoint> SOUL_WAYPOINTS = new HashMap<>(42);
 	private static final Path FOUND_SOULS_FILE = SkyblockerMod.CONFIG_DIR.resolve("found_enigma_souls.json");
-	private static final Object2ObjectOpenHashMap<String, ObjectOpenHashSet<BlockPos>> FOUND_SOULS = new Object2ObjectOpenHashMap<>();
 	private static final float[] GREEN = DyeColor.GREEN.getColorComponents();
 	private static final float[] RED = DyeColor.RED.getColorComponents();
 
@@ -64,7 +59,8 @@ public class EnigmaSouls {
 
 				for (int i = 0; i < waypoints.size(); i++) {
 					JsonObject waypoint = waypoints.get(i).getAsJsonObject();
-					SOUL_WAYPOINTS[i] = new BlockPos(waypoint.get("x").getAsInt(), waypoint.get("y").getAsInt(), waypoint.get("z").getAsInt());
+					BlockPos pos = new BlockPos(waypoint.get("x").getAsInt(), waypoint.get("y").getAsInt(), waypoint.get("z").getAsInt());
+					SOUL_WAYPOINTS.put(pos, new ProfileAwareWaypoint(pos, TYPE_SUPPLIER, GREEN, RED));
 				}
 
 			} catch (IOException e) {
@@ -74,13 +70,9 @@ public class EnigmaSouls {
 			//Load found souls
 			try (BufferedReader reader = Files.newBufferedReader(FOUND_SOULS_FILE)) {
 				for (Map.Entry<String, JsonElement> profile : JsonParser.parseReader(reader).getAsJsonObject().asMap().entrySet()) {
-					ObjectOpenHashSet<BlockPos> foundSoulsOnProfile = new ObjectOpenHashSet<>();
-
 					for (JsonElement foundSoul : profile.getValue().getAsJsonArray().asList()) {
-						foundSoulsOnProfile.add(PosUtils.parsePosString(foundSoul.getAsString()));
+						SOUL_WAYPOINTS.get(PosUtils.parsePosString(foundSoul.getAsString())).setFound();
 					}
-
-					FOUND_SOULS.put(profile.getKey(), foundSoulsOnProfile);
 				}
 			} catch (NoSuchFileException ignored) {
 			} catch (IOException e) {
@@ -90,9 +82,16 @@ public class EnigmaSouls {
 	}
 
 	static void save(MinecraftClient client) {
-		JsonObject json = new JsonObject();
+		Map<String, Set<BlockPos>> foundSouls = new HashMap<>();
+		for (ProfileAwareWaypoint soul : SOUL_WAYPOINTS.values()) {
+			for (String profile : soul.foundProfiles) {
+				foundSouls.computeIfAbsent(profile, profile_ -> new HashSet<>());
+				foundSouls.get(profile).add(soul.pos);
+			}
+		}
 
-		for (Map.Entry<String, ObjectOpenHashSet<BlockPos>> foundSoulsForProfile : FOUND_SOULS.entrySet()) {
+		JsonObject json = new JsonObject();
+		for (Map.Entry<String, Set<BlockPos>> foundSoulsForProfile : foundSouls.entrySet()) {
 			JsonArray foundSoulsJson = new JsonArray();
 
 			for (BlockPos foundSoul : foundSoulsForProfile.getValue()) {
@@ -109,15 +108,15 @@ public class EnigmaSouls {
 		}
 	}
 
-	static void render(WorldRenderContext wrc) {
+	static void render(WorldRenderContext context) {
 		SkyblockerConfig.Rift config = SkyblockerConfigManager.get().locations.rift;
 
 		if (Utils.isInTheRift() && config.enigmaSoulWaypoints && soulsLoaded.isDone()) {
-			for (BlockPos pos : SOUL_WAYPOINTS) {
-				if (isSoulMissing(pos)) {
-					RenderHelper.renderFilledThroughWallsWithBeaconBeam(wrc, pos, GREEN, 0.5f);
+			for (Waypoint soul : SOUL_WAYPOINTS.values()) {
+				if (soul.shouldRender()) {
+					soul.render(context);
 				} else if (config.highlightFoundEnigmaSouls) {
-					RenderHelper.renderFilledThroughWallsWithBeaconBeam(wrc, pos, RED, 0.5f);
+					soul.render(context);
 				}
 			}
 		}
@@ -127,7 +126,8 @@ public class EnigmaSouls {
 		if (Utils.isInTheRift() && !overlay) {
 			String message = text.getString();
 
-			if (message.equals("You have already found that Enigma Soul!") || Formatting.strip(message).equals("SOUL! You unlocked an Enigma Soul!")) markClosestSoulAsFound();
+			if (message.equals("You have already found that Enigma Soul!") || Formatting.strip(message).equals("SOUL! You unlocked an Enigma Soul!"))
+				markClosestSoulAsFound();
 		}
 	}
 
@@ -136,13 +136,13 @@ public class EnigmaSouls {
 				.then(literal("rift")
 						.then(literal("enigmaSouls")
 								.then(literal("markAllFound").executes(context -> {
-									markAllFound();
+									SOUL_WAYPOINTS.values().forEach(Waypoint::setFound);
 									context.getSource().sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.rift.enigmaSouls.markAllFound")));
 
 									return Command.SINGLE_SUCCESS;
 								}))
 								.then(literal("markAllMissing").executes(context -> {
-									markAllMissing();
+									SOUL_WAYPOINTS.values().forEach(Waypoint::setMissing);
 									context.getSource().sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.rift.enigmaSouls.markAllMissing")));
 
 									return Command.SINGLE_SUCCESS;
@@ -154,30 +154,10 @@ public class EnigmaSouls {
 
 		if (!soulsLoaded.isDone() || player == null) return;
 
-		Arrays.stream(SOUL_WAYPOINTS)
-		.filter(EnigmaSouls::isSoulMissing)
-		.min(Comparator.comparingDouble(soulPos -> soulPos.getSquaredDistance(player.getPos())))
-		.filter(soulPos -> soulPos.getSquaredDistance(player.getPos()) <= 16)
-		.ifPresent(soulPos -> {
-			FOUND_SOULS.computeIfAbsent(Utils.getProfile(), profile -> new ObjectOpenHashSet<>());
-			FOUND_SOULS.get(Utils.getProfile()).add(soulPos);
-		});
-	}
-
-	private static boolean isSoulMissing(BlockPos soulPos) {
-		ObjectOpenHashSet<BlockPos> foundSoulsOnProfile = FOUND_SOULS.get(Utils.getProfile());
-
-		return foundSoulsOnProfile == null || !foundSoulsOnProfile.contains(soulPos);
-	}
-
-	private static void markAllFound() {
-		FOUND_SOULS.computeIfAbsent(Utils.getProfile(), profile -> new ObjectOpenHashSet<>());
-		FOUND_SOULS.get(Utils.getProfile()).addAll(List.of(SOUL_WAYPOINTS));
-	}
-
-	private static void markAllMissing() {
-		ObjectOpenHashSet<BlockPos> foundSoulsOnProfile = FOUND_SOULS.get(Utils.getProfile());
-
-		if (foundSoulsOnProfile != null) foundSoulsOnProfile.clear();
+		SOUL_WAYPOINTS.values().stream()
+				.filter(Waypoint::shouldRender)
+				.min(Comparator.comparingDouble(soul -> soul.pos.getSquaredDistance(player.getPos())))
+				.filter(soul -> soul.pos.getSquaredDistance(player.getPos()) <= 16)
+				.ifPresent(Waypoint::setFound);
 	}
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/MirrorverseWaypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/MirrorverseWaypoints.java
index 7dda741f..83199e99 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/rift/MirrorverseWaypoints.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/MirrorverseWaypoints.java
@@ -6,7 +6,7 @@ import com.google.gson.JsonParser;
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 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.rendering.v1.WorldRenderContext;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.DyeColor;
@@ -18,13 +18,15 @@ import org.slf4j.LoggerFactory;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
 
 public class MirrorverseWaypoints {
 	private static final Logger LOGGER = LoggerFactory.getLogger("skyblocker");
+	private static final Supplier<Waypoint.Type> WAYPOINT_TYPE = () -> Waypoint.Type.HIGHLIGHT;
 	private static final Identifier WAYPOINTS_JSON = new Identifier(SkyblockerMod.NAMESPACE, "rift/mirrorverse_waypoints.json");
-	private static final BlockPos[] LAVA_PATH_WAYPOINTS = new BlockPos[107];
-	private static final BlockPos[] UPSIDE_DOWN_WAYPOINTS = new BlockPos[66];
-	private static final BlockPos[] TURBULATOR_WAYPOINTS = new BlockPos[27];
+	private static Waypoint[] LAVA_PATH_WAYPOINTS;
+	private static Waypoint[] UPSIDE_DOWN_WAYPOINTS;
+	private static Waypoint[] TURBULATOR_WAYPOINTS;
 	private static final float[] COLOR_COMPONENTS = DyeColor.RED.getColorComponents();
 
 	private static CompletableFuture<Void> waypointsLoaded;
@@ -35,51 +37,44 @@ public class MirrorverseWaypoints {
 	static void load(MinecraftClient client) {
 		waypointsLoaded = CompletableFuture.runAsync(() -> {
 			try (BufferedReader reader = client.getResourceManager().openAsReader(WAYPOINTS_JSON)) {
-				JsonObject file = JsonParser.parseReader(reader).getAsJsonObject();
-				JsonArray sections = file.get("sections").getAsJsonArray();
+				JsonArray sections = JsonParser.parseReader(reader).getAsJsonObject().get("sections").getAsJsonArray();
 
 				/// Lava Path
-				JsonArray lavaPathWaypoints = sections.get(0).getAsJsonObject().get("waypoints").getAsJsonArray();
-
-				for (int i = 0; i < lavaPathWaypoints.size(); i++) {
-					JsonObject point = lavaPathWaypoints.get(i).getAsJsonObject();
-					LAVA_PATH_WAYPOINTS[i] = new BlockPos(point.get("x").getAsInt(), point.get("y").getAsInt(), point.get("z").getAsInt());
-				}
+				LAVA_PATH_WAYPOINTS = loadWaypoints(sections.get(0).getAsJsonObject().get("waypoints").getAsJsonArray());
 
 				/// Upside Down Parkour
-				JsonArray upsideDownParkourWaypoints = sections.get(1).getAsJsonObject().get("waypoints").getAsJsonArray();
-
-				for (int i = 0; i < upsideDownParkourWaypoints.size(); i++) {
-					JsonObject point = upsideDownParkourWaypoints.get(i).getAsJsonObject();
-					UPSIDE_DOWN_WAYPOINTS[i] = new BlockPos(point.get("x").getAsInt(), point.get("y").getAsInt(), point.get("z").getAsInt());
-				}
+				UPSIDE_DOWN_WAYPOINTS = loadWaypoints(sections.get(1).getAsJsonObject().get("waypoints").getAsJsonArray());
 
 				/// Turbulator Parkour
-				JsonArray turbulatorParkourWaypoints = sections.get(2).getAsJsonObject().get("waypoints").getAsJsonArray();
-
-				for (int i = 0; i < turbulatorParkourWaypoints.size(); i++) {
-					JsonObject point = turbulatorParkourWaypoints.get(i).getAsJsonObject();
-					TURBULATOR_WAYPOINTS[i] = new BlockPos(point.get("x").getAsInt(), point.get("y").getAsInt(), point.get("z").getAsInt());
-				}
+				TURBULATOR_WAYPOINTS = loadWaypoints(sections.get(2).getAsJsonObject().get("waypoints").getAsJsonArray());
 			} catch (IOException e) {
 				LOGGER.error("[Skyblocker] Mirrorverse Waypoints failed to load ;(", e);
 			}
 		});
 	}
 
+	private static Waypoint[] loadWaypoints(JsonArray waypointsJson) {
+		Waypoint[] waypoints = new Waypoint[waypointsJson.size()];
+		for (int i = 0; i < waypointsJson.size(); i++) {
+			JsonObject point = waypointsJson.get(i).getAsJsonObject();
+			waypoints[i] = new Waypoint(new BlockPos(point.get("x").getAsInt(), point.get("y").getAsInt(), point.get("z").getAsInt()), WAYPOINT_TYPE, COLOR_COMPONENTS, false);
+		}
+		return waypoints;
+	}
+
 	protected static void render(WorldRenderContext wrc) {
 		//I would also check for the mirrorverse location but the scoreboard stuff is not performant at all...
 		if (Utils.isInTheRift() && SkyblockerConfigManager.get().locations.rift.mirrorverseWaypoints && waypointsLoaded.isDone()) {
-			for (BlockPos pos : LAVA_PATH_WAYPOINTS) {
-				RenderHelper.renderFilledIfVisible(wrc, pos, COLOR_COMPONENTS, 0.5f);
+			for (Waypoint waypoint : LAVA_PATH_WAYPOINTS) {
+				waypoint.render(wrc);
 			}
 
-			for (BlockPos pos : UPSIDE_DOWN_WAYPOINTS) {
-				RenderHelper.renderFilledIfVisible(wrc, pos, COLOR_COMPONENTS, 0.5f);
+			for (Waypoint waypoint : UPSIDE_DOWN_WAYPOINTS) {
+				waypoint.render(wrc);
 			}
 
-			for (BlockPos pos : TURBULATOR_WAYPOINTS) {
-				RenderHelper.renderFilledIfVisible(wrc, pos, COLOR_COMPONENTS, 0.5f);
+			for (Waypoint waypoint : TURBULATOR_WAYPOINTS) {
+				waypoint.render(wrc);
 			}
 		}
 	}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/FairySouls.java b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/FairySouls.java
index e9bc3ebd..f0e94770 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/FairySouls.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/FairySouls.java
@@ -1,4 +1,4 @@
-package de.hysky.skyblocker.skyblock;
+package de.hysky.skyblocker.skyblock.waypoint;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -12,7 +12,8 @@ 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;
+import de.hysky.skyblocker.utils.waypoint.ProfileAwareWaypoint;
+import de.hysky.skyblocker.utils.waypoint.Waypoint;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
@@ -29,21 +30,24 @@ import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 
 public class FairySouls {
     private static final Logger LOGGER = LoggerFactory.getLogger(FairySouls.class);
+    private static final Supplier<Waypoint.Type> TYPE_SUPPLIER = () -> SkyblockerConfigManager.get().general.waypoints.waypointType;
     private static CompletableFuture<Void> fairySoulsLoaded;
     private static int maxSouls = 0;
-    private static final Map<String, Set<BlockPos>> fairySouls = new HashMap<>();
-    private static final Map<String, Map<String, Set<BlockPos>>> foundFairies = new HashMap<>();
+    private static final Map<String, Map<BlockPos, ProfileAwareWaypoint>> fairySouls = new HashMap<>();
 
     @SuppressWarnings("UnusedReturnValue")
     public static CompletableFuture<Void> runAsyncAfterFairySoulsLoad(Runnable runnable) {
@@ -69,31 +73,40 @@ public class FairySouls {
     private static void loadFairySouls() {
         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());
+            NEURepoManager.NEU_REPO.getConstants().getFairySouls().getSoulLocations().forEach((location, fairiesForLocation) -> fairySouls.put(location, fairiesForLocation.stream().map(coordinate -> new BlockPos(coordinate.getX(), coordinate.getY(), coordinate.getZ())).collect(Collectors.toUnmodifiableMap(pos -> pos, pos -> new ProfileAwareWaypoint(pos, TYPE_SUPPLIER, DyeColor.GREEN.getColorComponents(), DyeColor.RED.getColorComponents())))));
+            LOGGER.debug("[Skyblocker] Loaded {} fairy souls across {} locations", fairySouls.values().stream().mapToInt(Map::size).sum(), fairySouls.size());
 
             try (BufferedReader reader = Files.newBufferedReader(SkyblockerMod.CONFIG_DIR.resolve("found_fairy_souls.json"))) {
                 for (Map.Entry<String, JsonElement> foundFairiesForProfileJson : JsonParser.parseReader(reader).getAsJsonObject().asMap().entrySet()) {
-                    Map<String, Set<BlockPos>> foundFairiesForProfile = new HashMap<>();
                     for (Map.Entry<String, JsonElement> foundFairiesForLocationJson : foundFairiesForProfileJson.getValue().getAsJsonObject().asMap().entrySet()) {
-                        Set<BlockPos> foundFairiesForLocation = new HashSet<>();
+                        String profile = foundFairiesForLocationJson.getKey();
+                        Map<BlockPos, ProfileAwareWaypoint> fairiesForLocation = fairySouls.get(profile);
                         for (JsonElement foundFairy : foundFairiesForLocationJson.getValue().getAsJsonArray().asList()) {
-                            foundFairiesForLocation.add(PosUtils.parsePosString(foundFairy.getAsString()));
+                            fairiesForLocation.get(PosUtils.parsePosString(foundFairy.getAsString())).setFound(profile);
                         }
-                        foundFairiesForProfile.put(foundFairiesForLocationJson.getKey(), foundFairiesForLocation);
                     }
-                    foundFairies.put(foundFairiesForProfileJson.getKey(), foundFairiesForProfile);
                 }
                 LOGGER.debug("[Skyblocker] Loaded found fairy souls");
             } catch (NoSuchFileException ignored) {
             } 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());
+            LOGGER.info("[Skyblocker] Loaded {} fairy souls across {} locations", fairySouls.values().stream().mapToInt(Map::size).sum(), fairySouls.size());
         });
     }