From 4cf5ff1a436b1b5ce30990bb67b816a241aae603 Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Thu, 25 Jan 2024 16:44:38 -0500
Subject: Kuudra Waypoints

---
 src/main/java/de/hysky/skyblocker/utils/PosUtils.java | 9 +++++++++
 src/main/java/de/hysky/skyblocker/utils/Utils.java    | 5 +++++
 2 files changed, 14 insertions(+)

(limited to 'src/main/java/de/hysky/skyblocker/utils')

diff --git a/src/main/java/de/hysky/skyblocker/utils/PosUtils.java b/src/main/java/de/hysky/skyblocker/utils/PosUtils.java
index 6a34b060..73ada889 100644
--- a/src/main/java/de/hysky/skyblocker/utils/PosUtils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/PosUtils.java
@@ -1,8 +1,17 @@
 package de.hysky.skyblocker.utils;
 
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+
 import net.minecraft.util.math.BlockPos;
 
 public final class PosUtils {
+    public static final Codec<BlockPos> ALT_BLOCK_POS_CODEC = RecordCodecBuilder.create(instance -> instance.group(
+            Codec.INT.fieldOf("x").forGetter(BlockPos::getX),
+            Codec.INT.fieldOf("y").forGetter(BlockPos::getY),
+            Codec.INT.fieldOf("z").forGetter(BlockPos::getZ))
+            .apply(instance, BlockPos::new));
+
     public static BlockPos parsePosString(String posData) {
         String[] posArray = posData.split(",");
         return new BlockPos(Integer.parseInt(posArray[0]), Integer.parseInt(posArray[1]), Integer.parseInt(posArray[2]));
diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java
index 3f07622c..b9c50561 100644
--- a/src/main/java/de/hysky/skyblocker/utils/Utils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java
@@ -3,6 +3,7 @@ package de.hysky.skyblocker.utils;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import de.hysky.skyblocker.events.SkyblockEvents;
+import de.hysky.skyblocker.skyblock.crimson.kuudra.Kuudra;
 import de.hysky.skyblocker.skyblock.item.MuseumItemCache;
 import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip;
 import de.hysky.skyblocker.skyblock.rift.TheRift;
@@ -98,6 +99,10 @@ public class Utils {
         return getLocationRaw().equals("combat_3");
     }
 
+    public static boolean isInKuudra() {
+        return getLocationRaw().equals(Kuudra.LOCATION);
+    }
+
     public static boolean isInjected() {
         return isInjected;
     }
-- 
cgit 


From 5c9eb5f77f85b221ee5c8ebedf44dd0a48bb8292 Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Fri, 26 Jan 2024 14:55:59 -0500
Subject: Tweak waypoints

Thanks to Fluboxer for the suggestions!
---
 src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/main/java/de/hysky/skyblocker/utils')

diff --git a/src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java b/src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java
index 2f9c9f63..7f3d4eda 100644
--- a/src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java
+++ b/src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java
@@ -1,13 +1,14 @@
 package de.hysky.skyblocker.utils.waypoint;
 
 import de.hysky.skyblocker.utils.render.RenderHelper;
+import de.hysky.skyblocker.utils.render.Renderable;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 
 import java.util.function.Supplier;
 
-public class Waypoint {
+public class Waypoint implements Renderable {
     protected static final float DEFAULT_HIGHLIGHT_ALPHA = 0.5f;
     protected static final float DEFAULT_LINE_WIDTH = 5f;
     public final BlockPos pos;
@@ -74,6 +75,7 @@ public class Waypoint {
         return colorComponents;
     }
 
+    @Override
     public void render(WorldRenderContext context) {
         switch (typeSupplier.get()) {
             case WAYPOINT -> RenderHelper.renderFilledWithBeaconBeam(context, pos, getColorComponents(), alpha, throughWalls);
-- 
cgit