add waypoints for current commision

still need to get locations in the mines

7 files changed, 285 insertions, 13 deletions

diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
index 3336cefb..7d7acfbf 100644
--- a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
+++ b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
@@ -17,10 +17,7 @@ import de.hysky.skyblocker.skyblock.dungeon.puzzle.boulder.Boulder;
 import de.hysky.skyblocker.skyblock.dungeon.puzzle.waterboard.Waterboard;
 import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonManager;
 import de.hysky.skyblocker.skyblock.dungeon.secrets.SecretsTracker;
-import de.hysky.skyblocker.skyblock.dwarven.CrystalsHud;
-import de.hysky.skyblocker.skyblock.dwarven.CrystalsLocationsManager;
-import de.hysky.skyblocker.skyblock.dwarven.DwarvenHud;
-import de.hysky.skyblocker.skyblock.dwarven.MetalDetector;
+import de.hysky.skyblocker.skyblock.dwarven.*;
 import de.hysky.skyblocker.skyblock.end.BeaconHighlighter;
 import de.hysky.skyblocker.skyblock.end.EnderNodes;
 import de.hysky.skyblocker.skyblock.end.TheEnd;
@@ -123,6 +120,7 @@ public class SkyblockerMod implements ClientModInitializer {
         ItemCooldowns.init();
         TabHud.init();
         DwarvenHud.init();
+        CommissionWaypoints.init();
         CrystalsHud.init();
         FarmingHud.init();
         LowerSensitivity.init();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionWaypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionWaypoints.java
new file mode 100644
index 00000000..a73e89b9
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionWaypoints.java
@@ -0,0 +1,69 @@
+package de.hysky.skyblocker.skyblock.dwarven;
+
+import de.hysky.skyblocker.utils.Utils;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
+import net.minecraft.text.Text;
+import net.minecraft.util.math.BlockPos;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class CommissionWaypoints {
+
+    private static final Map<String, MiningWaypoints.dwarvenCategory> DWARVEN_LOCATIONS = Arrays.stream(MiningWaypoints.dwarvenCategory.values()).collect(Collectors.toMap(MiningWaypoints.dwarvenCategory::toString, Function.identity()));
+    private static final Map<String, MiningWaypoints.glaciteCategory> GLACITE_LOCATIONS = Arrays.stream(MiningWaypoints.glaciteCategory.values()).collect(Collectors.toMap(MiningWaypoints.glaciteCategory::toString, Function.identity()));
+
+
+    protected static List<MiningWaypoints> activeWaypoints = new ArrayList<>();
+
+    public static void init() {
+        WorldRenderEvents.AFTER_TRANSLUCENT.register(CommissionWaypoints::render);
+        ClientPlayConnectionEvents.JOIN.register((_handler, _sender, _client) -> reset());
+    }
+
+    protected static void update(List<DwarvenHud.Commission> newCommissions) {
+        activeWaypoints.clear();
+        String location = Utils.getIslandArea().substring(2);
+        //find commission locations in glacite
+        if (location.equals("Dwarven Base Camp") || location.equals("Glacite Tunnels")) {
+            for (DwarvenHud.Commission commission : newCommissions) {
+                String commissionName = commission.commission();
+                for (Map.Entry<String, MiningWaypoints.glaciteCategory> glaciteLocation : GLACITE_LOCATIONS.entrySet()) {
+                    if (commissionName.contains(glaciteLocation.getKey())) {
+                        MiningWaypoints.glaciteCategory category = glaciteLocation.getValue();
+                        for (BlockPos gemstoneLocation : category.getLocations()) {
+                            activeWaypoints.add(new MiningWaypoints(category, Text.of(category.getName()), gemstoneLocation));
+                        }
+                    }
+                }
+            }
+            return;
+        }
+        //find commission locations in dwarven mines
+        for (DwarvenHud.Commission commission : newCommissions) {
+            String commissionName = commission.commission();
+            for (Map.Entry<String, MiningWaypoints.dwarvenCategory> dwarvenLocation : DWARVEN_LOCATIONS.entrySet()) {
+                if (commissionName.contains(dwarvenLocation.getKey())) {
+                    MiningWaypoints.dwarvenCategory category = dwarvenLocation.getValue();
+                    activeWaypoints.add(new MiningWaypoints(category, Text.of(category.getName()), category.getLocation()));
+                }
+            }
+        }
+    }
+
+    private static void render(WorldRenderContext context) {
+        for (MiningWaypoints miningWaypoints : activeWaypoints) {
+            if (miningWaypoints.shouldRender()) {
+                miningWaypoints.render(context);
+            }
+        }
+        
+    }
+
+    private static void reset() {
+        activeWaypoints.clear();
+    }
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java
index a74dbc5e..34667d12 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java
@@ -75,8 +75,8 @@ public class CrystalsHud {
         if (SkyblockerConfigManager.get().mining.crystalsHud.showLocations) {
             Map<String,CrystalsWaypoint> ActiveWaypoints = CrystalsLocationsManager.activeWaypoints;
 
-            for (CrystalsWaypoint waypoint : ActiveWaypoints.values()) {
-                Color waypointColor = waypoint.category.color;
+            for (MiningWaypoints waypoint : ActiveWaypoints.values()) {
+                Color waypointColor = waypoint.category.getColor();
                 Vector2ic renderPos = transformLocation(waypoint.pos.getX(), waypoint.pos.getZ());
                 int locationSize = SkyblockerConfigManager.get().mining.crystalsHud.locationSize;
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java
index 6f4c86a7..d9889b37 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java
@@ -47,12 +47,12 @@ public class CrystalsLocationsManager {
     private static final MinecraftClient CLIENT = MinecraftClient.getInstance();
 
     /**
-     * A look-up table to convert between location names and waypoint in the {@link CrystalsWaypoint.Category} values.
+     * A look-up table to convert between location names and waypoint in the {@link MiningWaypoints.crystalCategory} values.
      */
-    private static final Map<String, CrystalsWaypoint.Category> WAYPOINT_LOCATIONS = Arrays.stream(CrystalsWaypoint.Category.values()).collect(Collectors.toMap(CrystalsWaypoint.Category::toString, Function.identity()));
+    private static final Map<String, MiningWaypoints.crystalCategory> WAYPOINT_LOCATIONS = Arrays.stream(MiningWaypoints.crystalCategory.values()).collect(Collectors.toMap(MiningWaypoints.crystalCategory::toString, Function.identity()));
     private static final Pattern TEXT_CWORDS_PATTERN = Pattern.compile("([0-9][0-9][0-9]) ([0-9][0-9][0-9]?) ([0-9][0-9][0-9])");
 
-    protected static Map<String, CrystalsWaypoint> activeWaypoints = new HashMap<>();
+    protected static Map<String, MiningWaypoints> activeWaypoints = new HashMap<>();
 
     public static void init() {
         Scheduler.INSTANCE.scheduleCyclic(CrystalsLocationsManager::update, 40);
@@ -185,8 +185,8 @@ public class CrystalsLocationsManager {
 
 
     private static void addCustomWaypoint(String waypointName, BlockPos pos) {
-        CrystalsWaypoint.Category category = WAYPOINT_LOCATIONS.get(waypointName);
-        CrystalsWaypoint waypoint = new CrystalsWaypoint(category, Text.literal(waypointName), pos);
+        MiningWaypoints.crystalCategory category = WAYPOINT_LOCATIONS.get(waypointName);
+        MiningWaypoints waypoint = new MiningWaypoints(category, Text.literal(waypointName), pos);
         activeWaypoints.put(waypointName, waypoint);
     }
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java
index 242c513a..44e4535f 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java
@@ -25,7 +25,7 @@ import java.util.stream.Stream;
 public class DwarvenHud {
 
     private static final MinecraftClient CLIENT = MinecraftClient.getInstance();
-    private static List<Commission> commissionList = new ArrayList<>();
+    protected static List<Commission> commissionList = new ArrayList<>();
 
     public static String mithrilPowder = "0";
     public static String gemStonePowder = "0";
@@ -169,6 +169,7 @@ public class DwarvenHud {
             return;
         }
 
+        List<Commission> oldCommissionList =  commissionList;
         commissionList = new ArrayList<>();
 
         for (PlayerListEntry playerListEntry : CLIENT.getNetworkHandler().getPlayerList().stream().sorted(PlayerListHudAccessor.getOrdering()).toList()) {
@@ -197,6 +198,9 @@ public class DwarvenHud {
                 glacitePowder = glaciteMatcher.group(0).split(": ")[1];
             }
         }
+        if (!oldCommissionList.equals(commissionList)) {
+            CommissionWaypoints.update(commissionList);
+        }
     }
 
     // steamroller tactics to get visibility from outside classes (HudCommsWidget)
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java
index dd97e5d1..1d7a4db8 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java
@@ -249,7 +249,7 @@ public class MetalDetector {
         }
 
         for (Vec3i block : possibleBlocks) {
-            CrystalsWaypoint waypoint = new CrystalsWaypoint(CrystalsWaypoint.Category.CORLEONE, Text.translatable("skyblocker.dwarvenMines.metalDetectorHelper.possible"), new BlockPos(block.getX(), block.getY(), block.getZ()));
+            MiningWaypoints waypoint = new MiningWaypoints(MiningWaypoints.crystalCategory.CORLEONE, Text.translatable("skyblocker.dwarvenMines.metalDetectorHelper.possible"), new BlockPos(block.getX(), block.getY(), block.getZ()));
             waypoint.render(context);
         }
     }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningWaypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningWaypoints.java
new file mode 100644
index 00000000..7b09e51d
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningWaypoints.java
@@ -0,0 +1,201 @@
+package de.hysky.skyblocker.skyblock.dwarven;
+
+import de.hysky.skyblocker.config.SkyblockerConfig;
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
+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.text.Text;
+import net.minecraft.util.DyeColor;
+import net.minecraft.util.Formatting;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+
+import java.util.List;
+import java.awt.*;
+import java.util.function.Supplier;
+
+public class MiningWaypoints extends Waypoint {
+    private static final Supplier<SkyblockerConfig.Waypoints> CONFIG = () -> SkyblockerConfigManager.get().general.waypoints;
+    private static final Supplier<Type> TYPE_SUPPLIER = () -> CONFIG.get().waypointType;
+    final Text name;
+    final Category category;
+    private final Vec3d centerPos;
+
+    MiningWaypoints(Category category, Text name, BlockPos pos) {
+        super(pos, TYPE_SUPPLIER, category.getColorComponents());
+        this.name = name;
+        this.category = category;
+        this.centerPos = pos.toCenterPos();
+    }
+
+    @Override
+    public boolean shouldRender() {
+        return super.shouldRender();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return super.equals(obj) || obj instanceof MiningWaypoints other && name.equals(other.name) && pos.equals(other.pos);
+    }
+
+    /**
+     * Renders the secret waypoint, including a waypoint through {@link Waypoint#render(WorldRenderContext)}, the name, and the distance from the player.
+     */
+    @Override
+    public void render(WorldRenderContext context) {
+        super.render(context);
+
+        Vec3d posUp = centerPos.add(0, 1, 0);
+        RenderHelper.renderText(context, name, posUp, true);
+        double distance = context.camera().getPos().distanceTo(centerPos);
+        RenderHelper.renderText(context, Text.literal(Math.round(distance) + "m").formatted(Formatting.YELLOW), posUp, 1, MinecraftClient.getInstance().textRenderer.fontHeight + 1, true);
+
+    }
+
+    interface Category {
+        Color getColor();
+
+        String getName();
+
+        float[] getColorComponents();
+
+    }
+
+    /**
+     * enum for the different waypoints used int the crystals hud each with a {@link crystalCategory#name} and associated {@link crystalCategory#color}
+     */
+
+    enum crystalCategory implements Category {
+        JUNGLE_TEMPLE("Jungle Temple", new Color(DyeColor.PURPLE.getSignColor())),
+        MINES_OF_DIVAN("Mines of Divan", Color.GREEN),
+        GOBLIN_QUEENS_DEN("Goblin Queen's Den", new Color(DyeColor.ORANGE.getSignColor())),
+        LOST_PRECURSOR_CITY("Lost Precursor City", Color.CYAN),
+        KHAZAD_DUM("Khazad-dûm", Color.YELLOW),
+        FAIRY_GROTTO("Fairy Grotto", Color.PINK),
+        DRAGONS_LAIR("Dragon's Lair", Color.BLACK),
+        CORLEONE("Corleone", Color.WHITE),
+        KING_YOLKAR("King Yolkar", Color.RED),
+        ODAWA("Odawa", Color.MAGENTA),
+        KEY_GUARDIAN("Key Guardian", Color.LIGHT_GRAY);
+
+        public final Color color;
+        private final String name;
+        private final float[] colorComponents;
+
+        crystalCategory(String name, Color color) {
+            this.name = name;
+            this.color = color;
+            this.colorComponents = color.getColorComponents(null);
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+
+        @Override
+        public Color getColor() {
+            return color;
+        }
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        @Override
+        public float[] getColorComponents() {
+            return colorComponents;
+        }
+    }
+
+
+    enum dwarvenCategory implements Category {
+        SOMTHING("s", Color.BLACK, new BlockPos(0, 0, 0));
+
+        public final Color color;
+        private final String name;
+        private final float[] colorComponents;
+        private final BlockPos location;
+
+        dwarvenCategory(String name, Color color, BlockPos location) {
+            this.name = name;
+            this.color = color;
+            this.colorComponents = color.getColorComponents(null);
+            this.location = location;
+
+        }
+
+        public BlockPos getLocation() {
+            return location;
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+
+        @Override
+        public Color getColor() {
+            return color;
+        }
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        @Override
+        public float[] getColorComponents() {
+            return colorComponents;
+        }
+
+    }
+
+    enum glaciteCategory implements Category {
+        AQUAMARINE("Aquamarine", Color.CYAN, new BlockPos[]{new BlockPos(-1, 139, 437), new BlockPos(90, 151, 229), new BlockPos(56, 151, 400), new BlockPos(51, 117, 303)}),
+        ONYX("Onyx", Color.BLACK, new BlockPos[]{new BlockPos(79, 119, 411), new BlockPos(-14, 132, 386), new BlockPos(18, 136, 370), new BlockPos(16, 138, 411), new BlockPos(-68, 130, 408)}),
+        PERIDOT("Peridot", Color.GREEN, new BlockPos[]{new BlockPos(-61, 147, 302), new BlockPos(91, 122, 397),new BlockPos(-73, 122, 458), new BlockPos(-77, 120, 282)}),
+        CITRINE("Citrine", Color.YELLOW, new BlockPos[]{new BlockPos(-104, 144, 244), new BlockPos(39, 119, 386), new BlockPos(-57, 144, 421), new BlockPos(-47, 126, 418) });
+
+        public final Color color;
+        private final String name;
+        private final float[] colorComponents;
+        private final BlockPos[] location;
+
+        glaciteCategory(String name, Color color, BlockPos[] location) {
+            this.name = name;
+            this.color = color;
+            this.colorComponents = color.getColorComponents(null);
+            this.location = location;
+
+        }
+
+        public BlockPos[] getLocations() {
+            return location;
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+
+        @Override
+        public Color getColor() {
+            return color;
+        }
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        @Override
+        public float[] getColorComponents() {
+            return colorComponents;
+        }
+
+    }
+}