Merge pull request #713 from kevinthegreat1/waypoint

Waypoints

5 files changed, 220 insertions, 6 deletions

diff --git a/src/main/java/de/hysky/skyblocker/utils/PosUtils.java b/src/main/java/de/hysky/skyblocker/utils/PosUtils.java
index 73ada889..4ca37a83 100644
--- a/src/main/java/de/hysky/skyblocker/utils/PosUtils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/PosUtils.java
@@ -1,5 +1,6 @@
 package de.hysky.skyblocker.utils;
 
+import com.google.gson.JsonObject;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 
@@ -17,6 +18,10 @@ public final class PosUtils {
         return new BlockPos(Integer.parseInt(posArray[0]), Integer.parseInt(posArray[1]), Integer.parseInt(posArray[2]));
     }
 
+    public static BlockPos parsePosJson(JsonObject posJson) {
+        return new BlockPos(posJson.get("x").getAsInt(), posJson.get("y").getAsInt(), posJson.get("z").getAsInt());
+    }
+
     public static String getPosString(BlockPos blockPos) {
         return blockPos.getX() + "," + blockPos.getY() + "," + blockPos.getZ();
     }
diff --git a/src/main/java/de/hysky/skyblocker/utils/waypoint/NamedWaypoint.java b/src/main/java/de/hysky/skyblocker/utils/waypoint/NamedWaypoint.java
new file mode 100644
index 00000000..2f02b51f
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/utils/waypoint/NamedWaypoint.java
@@ -0,0 +1,128 @@
+package de.hysky.skyblocker.utils.waypoint;
+
+import com.google.common.primitives.Floats;
+import com.mojang.datafixers.util.Either;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.utils.render.RenderHelper;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
+import net.minecraft.text.Text;
+import net.minecraft.text.TextCodecs;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+
+import java.util.Objects;
+import java.util.function.Supplier;
+
+public class NamedWaypoint extends Waypoint {
+    public static final Codec<NamedWaypoint> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+            BlockPos.CODEC.fieldOf("pos").forGetter(secretWaypoint -> secretWaypoint.pos),
+            TextCodecs.CODEC.fieldOf("name").forGetter(secretWaypoint -> secretWaypoint.name),
+            Codec.floatRange(0, 1).listOf().comapFlatMap(
+                    colorComponentsList -> colorComponentsList.size() == 3 ? DataResult.success(Floats.toArray(colorComponentsList)) : DataResult.error(() -> "Expected 3 color components, got " + colorComponentsList.size() + " instead"),
+                    Floats::asList
+            ).fieldOf("colorComponents").forGetter(secretWaypoint -> secretWaypoint.colorComponents),
+            Codec.FLOAT.fieldOf("alpha").forGetter(secretWaypoint -> secretWaypoint.alpha),
+            Codec.BOOL.fieldOf("shouldRender").forGetter(Waypoint::shouldRender)
+    ).apply(instance, NamedWaypoint::new));
+    public static final Codec<NamedWaypoint> SKYTILS_CODEC = RecordCodecBuilder.create(instance -> instance.group(
+            Codec.INT.fieldOf("x").forGetter(waypoint -> waypoint.pos.getX()),
+            Codec.INT.fieldOf("y").forGetter(waypoint -> waypoint.pos.getY()),
+            Codec.INT.fieldOf("z").forGetter(waypoint -> waypoint.pos.getZ()),
+            Codec.either(Codec.STRING, Codec.INT).xmap(either -> either.map(str -> str, Object::toString), Either::left).fieldOf("name").forGetter(waypoint -> waypoint.name.getString()),
+            Codec.INT.fieldOf("color").forGetter(waypoint -> (int) (waypoint.alpha * 255) << 24 | (int) (waypoint.colorComponents[0] * 255) << 16 | (int) (waypoint.colorComponents[1] * 255) << 8 | (int) (waypoint.colorComponents[2] * 255)),
+            Codec.BOOL.fieldOf("enabled").forGetter(Waypoint::shouldRender)
+    ).apply(instance, NamedWaypoint::fromSkytils));
+    public final Text name;
+    public final Vec3d centerPos;
+
+    public NamedWaypoint(BlockPos pos, String name, float[] colorComponents) {
+        this(pos, name, colorComponents, true);
+    }
+
+    public NamedWaypoint(BlockPos pos, String name, float[] colorComponents, boolean shouldRender) {
+        this(pos, name, colorComponents, DEFAULT_HIGHLIGHT_ALPHA, shouldRender);
+    }
+
+    public NamedWaypoint(BlockPos pos, String name, float[] colorComponents, float alpha, boolean shouldRender) {
+        this(pos, Text.of(name), colorComponents, alpha, shouldRender);
+    }
+
+    public NamedWaypoint(BlockPos pos, Text name, float[] colorComponents, float alpha, boolean shouldRender) {
+        this(pos, name, () -> SkyblockerConfigManager.get().uiAndVisuals.waypoints.waypointType, colorComponents, alpha, shouldRender);
+    }
+
+    public NamedWaypoint(BlockPos pos, Text name, Supplier<Type> typeSupplier, float[] colorComponents) {
+        this(pos, name, typeSupplier, colorComponents, DEFAULT_HIGHLIGHT_ALPHA, true);
+    }
+
+    public NamedWaypoint(BlockPos pos, Text name, Supplier<Type> typeSupplier, float[] colorComponents, float alpha, boolean shouldRender) {
+        super(pos, typeSupplier, colorComponents, alpha, DEFAULT_LINE_WIDTH, true, shouldRender);
+        this.name = name;
+        this.centerPos = pos.toCenterPos();
+    }
+
+    public static NamedWaypoint fromSkytils(int x, int y, int z, String name, int color, boolean enabled) {
+        float alpha = ((color & 0xFF000000) >>> 24) / 255f;
+        if (alpha == 0) {
+            alpha = DEFAULT_HIGHLIGHT_ALPHA;
+        }
+        return new NamedWaypoint(new BlockPos(x, y, z), name, new float[]{((color & 0x00FF0000) >> 16) / 255f, ((color & 0x0000FF00) >> 8) / 255f, (color & 0x000000FF) / 255f}, alpha, enabled);
+    }
+
+    public NamedWaypoint copy() {
+        return new NamedWaypoint(pos, name, typeSupplier, getColorComponents(), alpha, shouldRender());
+    }
+
+    @Override
+    public NamedWaypoint withX(int x) {
+        return new NamedWaypoint(new BlockPos(x, pos.getY(), pos.getZ()), name, typeSupplier, getColorComponents(), alpha, shouldRender());
+    }
+
+    @Override
+    public NamedWaypoint withY(int y) {
+        return new NamedWaypoint(pos.withY(y), name, typeSupplier, getColorComponents(), alpha, shouldRender());
+    }
+
+    @Override
+    public NamedWaypoint withZ(int z) {
+        return new NamedWaypoint(new BlockPos(pos.getX(), pos.getY(), z), name, typeSupplier, getColorComponents(), alpha, shouldRender());
+    }
+
+    @Override
+    public NamedWaypoint withColor(float[] colorComponents, float alpha) {
+        return new NamedWaypoint(pos, name, typeSupplier, colorComponents, alpha, shouldRender());
+    }
+
+    public Text getName() {
+        return name;
+    }
+
+    public NamedWaypoint withName(String name) {
+        return new NamedWaypoint(pos, Text.literal(name), typeSupplier, getColorComponents(), alpha, shouldRender());
+    }
+
+    protected boolean shouldRenderName() {
+        return true;
+    }
+
+    @Override
+    public void render(WorldRenderContext context) {
+        super.render(context);
+        if (shouldRenderName()) {
+            RenderHelper.renderText(context, name, centerPos.add(0, 1, 0), true);
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), name);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return this == obj || super.equals(obj) && obj instanceof NamedWaypoint waypoint && name.equals(waypoint.name);
+    }
+}
diff --git a/src/main/java/de/hysky/skyblocker/utils/waypoint/ProfileAwareWaypoint.java b/src/main/java/de/hysky/skyblocker/utils/waypoint/ProfileAwareWaypoint.java
index 7aa99d14..7369a2ef 100644
--- a/src/main/java/de/hysky/skyblocker/utils/waypoint/ProfileAwareWaypoint.java
+++ b/src/main/java/de/hysky/skyblocker/utils/waypoint/ProfileAwareWaypoint.java
@@ -38,7 +38,7 @@ public class ProfileAwareWaypoint extends Waypoint {
     }
 
     @Override
-    protected float[] getColorComponents() {
+    public float[] getColorComponents() {
         return foundProfiles.contains(Utils.getProfile()) ? foundColor : missingColor;
     }
 }
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 622e1658..c991fb9c 100644
--- a/src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java
+++ b/src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java
@@ -3,9 +3,12 @@ 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.StringIdentifiable;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 
+import java.util.Arrays;
+import java.util.Objects;
 import java.util.function.Supplier;
 
 public class Waypoint implements Renderable {
@@ -15,9 +18,9 @@ public class Waypoint implements Renderable {
     final Box box;
     final Supplier<Type> typeSupplier;
     protected final float[] colorComponents;
-    final float alpha;
-    final float lineWidth;
-    final boolean throughWalls;
+    public final float alpha;
+    public final float lineWidth;
+    public final boolean throughWalls;
     private boolean shouldRender;
 
     public Waypoint(BlockPos pos, Type type, float[] colorComponents) {
@@ -55,6 +58,22 @@ public class Waypoint implements Renderable {
         this.shouldRender = shouldRender;
     }
 
+    public Waypoint withX(int x) {
+        return new Waypoint(new BlockPos(x, pos.getY(), pos.getZ()), typeSupplier, getColorComponents(), alpha, lineWidth, throughWalls, shouldRender());
+    }
+
+    public Waypoint withY(int y) {
+        return new Waypoint(pos.withY(y), typeSupplier, getColorComponents(), alpha, lineWidth, throughWalls, shouldRender());
+    }
+
+    public Waypoint withZ(int z) {
+        return new Waypoint(new BlockPos(pos.getX(), pos.getY(), z), typeSupplier, getColorComponents(), alpha, lineWidth, throughWalls, shouldRender());
+    }
+
+    public Waypoint withColor(float[] colorComponents, float alpha) {
+        return new Waypoint(pos, typeSupplier, colorComponents, alpha, lineWidth, throughWalls, shouldRender());
+    }
+
     public boolean shouldRender() {
         return shouldRender;
     }
@@ -71,7 +90,11 @@ public class Waypoint implements Renderable {
         this.shouldRender = !this.shouldRender;
     }
 
-    protected float[] getColorComponents() {
+    public void setShouldRender(boolean shouldRender) {
+        this.shouldRender = shouldRender;
+    }
+
+    public float[] getColorComponents() {
         return colorComponents;
     }
 
@@ -94,7 +117,17 @@ public class Waypoint implements Renderable {
         }
     }
 
-    public enum Type {
+    @Override
+    public int hashCode() {
+        return Objects.hash(pos, typeSupplier.get(), Arrays.hashCode(colorComponents), alpha, lineWidth, throughWalls, shouldRender);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return super.equals(obj) || obj instanceof Waypoint other && pos.equals(other.pos) && typeSupplier.get() == other.typeSupplier.get() && Arrays.equals(colorComponents, other.colorComponents) && alpha == other.alpha && lineWidth == other.lineWidth && throughWalls == other.throughWalls && shouldRender == other.shouldRender;
+    }
+
+    public enum Type implements StringIdentifiable {
         WAYPOINT,
         OUTLINED_WAYPOINT,
         HIGHLIGHT,
@@ -102,6 +135,11 @@ public class Waypoint implements Renderable {
         OUTLINE;
 
         @Override
+        public String asString() {
+            return name().toLowerCase();
+        }
+
+        @Override
         public String toString() {
             return switch (this) {
                 case WAYPOINT -> "Waypoint";
diff --git a/src/main/java/de/hysky/skyblocker/utils/waypoint/WaypointCategory.java b/src/main/java/de/hysky/skyblocker/utils/waypoint/WaypointCategory.java
new file mode 100644
index 00000000..db2a6d82
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/utils/waypoint/WaypointCategory.java
@@ -0,0 +1,43 @@
+package de.hysky.skyblocker.utils.waypoint;
+
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
+
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
+import java.util.stream.Collectors;
+
+public record WaypointCategory(String name, String island, List<NamedWaypoint> waypoints) {
+    public static final Codec<WaypointCategory> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+            Codec.STRING.fieldOf("name").forGetter(WaypointCategory::name),
+            Codec.STRING.fieldOf("island").forGetter(WaypointCategory::island),
+            NamedWaypoint.CODEC.listOf().fieldOf("waypoints").forGetter(WaypointCategory::waypoints)
+    ).apply(instance, WaypointCategory::new));
+    public static final Codec<WaypointCategory> SKYTILS_CODEC = RecordCodecBuilder.create(instance -> instance.group(
+            Codec.STRING.fieldOf("name").forGetter(WaypointCategory::name),
+            Codec.STRING.fieldOf("island").forGetter(WaypointCategory::island),
+            NamedWaypoint.SKYTILS_CODEC.listOf().fieldOf("waypoints").forGetter(WaypointCategory::waypoints)
+    ).apply(instance, WaypointCategory::new));
+
+    public static UnaryOperator<WaypointCategory> filter(Predicate<NamedWaypoint> predicate) {
+        return waypointCategory -> new WaypointCategory(waypointCategory.name(), waypointCategory.island(), waypointCategory.waypoints().stream().filter(predicate).toList());
+    }
+
+    public WaypointCategory withName(String name) {
+        return new WaypointCategory(name, island(), waypoints());
+    }
+
+    public WaypointCategory deepCopy() {
+        return new WaypointCategory(name(), island(), waypoints().stream().map(NamedWaypoint::copy).collect(Collectors.toList()));
+    }
+
+    public void render(WorldRenderContext context) {
+        for (NamedWaypoint waypoint : waypoints) {
+            if (waypoint.shouldRender()) {
+                waypoint.render(context);
+            }
+        }
+    }
+}