Add SecretWaypoint text rendering

3 files changed, 53 insertions, 23 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/Room.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/Room.java
index da3ea5eb..e7ed7014 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/Room.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/Room.java
@@ -5,7 +5,6 @@ import com.google.gson.JsonObject;
 import it.unimi.dsi.fastutil.ints.IntRBTreeSet;
 import it.unimi.dsi.fastutil.ints.IntSortedSet;
 import it.unimi.dsi.fastutil.ints.IntSortedSets;
-import me.xmrvizzy.skyblocker.utils.RenderHelper;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
 import net.fabricmc.fabric.api.util.TriState;
 import net.minecraft.block.MapColor;
@@ -185,30 +184,15 @@ public class Room {
             JsonObject waypoint = waypointElement.getAsJsonObject();
             String secretName = waypoint.get("secretName").getAsString();
             int secretIndex = Integer.parseInt(secretName.substring(0, Character.isDigit(secretName.charAt(1)) ? 2 : 1));
-            secretWaypoints.add(new SecretWaypoint(secretIndex, getCategory(waypoint), DungeonMapUtils.relativeToActual(directionRooms.getMiddle(), directionRooms.getLeft(), waypoint), true));
+            secretWaypoints.add(new SecretWaypoint(secretIndex, waypoint, secretName, DungeonMapUtils.relativeToActual(directionRooms.getMiddle(), directionRooms.getLeft(), waypoint)));
         }
         DungeonSecrets.LOGGER.info("[Skyblocker] Room {} matched after checking {} block(s)", name, checkedBlocks.size()); // TODO change to debug
     }
 
-    private SecretWaypoint.Category getCategory(JsonObject categoryJson) {
-        return switch (categoryJson.get("category").getAsString()) {
-            case "entrance" -> SecretWaypoint.Category.ENTRANCE;
-            case "superboom" -> SecretWaypoint.Category.SUPERBOOM;
-            case "chest" -> SecretWaypoint.Category.CHEST;
-            case "item" -> SecretWaypoint.Category.ITEM;
-            case "bat" -> SecretWaypoint.Category.BAT;
-            case "wither" -> SecretWaypoint.Category.WITHER;
-            case "lever" -> SecretWaypoint.Category.LEVER;
-            case "fairysoul" -> SecretWaypoint.Category.FAIRYSOUL;
-            case "stonk" -> SecretWaypoint.Category.STONK;
-            default -> SecretWaypoint.Category.DEFAULT;
-        };
-    }
-
     protected void render(WorldRenderContext context) {
         for (SecretWaypoint secretWaypoint : secretWaypoints) {
             if (secretWaypoint.missing()) {
-                RenderHelper.renderFilledThroughWallsWithBeaconBeam(context, secretWaypoint.pos(), secretWaypoint.category().colorComponents, 0.5F);
+                secretWaypoint.render(context);
             }
         }
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java
index 475229e0..08cba782 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java
@@ -1,9 +1,27 @@
 package me.xmrvizzy.skyblocker.skyblock.dungeon.secrets;
 
+import com.google.gson.JsonObject;
+import me.xmrvizzy.skyblocker.utils.RenderHelper;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 import net.minecraft.util.math.BlockPos;
 
-public record SecretWaypoint(int secretIndex, Category category, BlockPos pos, boolean missing) {
-    enum Category {
+public record SecretWaypoint(int secretIndex, Category category, Text name, BlockPos pos, PlayerEntity player, boolean missing) {
+    SecretWaypoint(int secretIndex, JsonObject waypoint, String name, BlockPos pos) {
+        this(secretIndex, Category.get(waypoint), Text.of(name), pos, MinecraftClient.getInstance().player, true);
+    }
+
+    void render(WorldRenderContext context) {
+        RenderHelper.renderFilledThroughWallsWithBeaconBeam(context, pos(), category().colorComponents, 0.5F);
+        RenderHelper.renderText(context, name(), pos().up().toCenterPos(), true);
+        double distance = player().getPos().distanceTo(pos().toCenterPos());
+        RenderHelper.renderText(context, Text.literal(Math.round(distance) + "m").formatted(Formatting.YELLOW), pos().up().toCenterPos(), 1, MinecraftClient.getInstance().textRenderer.fontHeight + 1, true);
+    }
+
+    private enum Category {
         ENTRANCE(0, 255, 0),
         SUPERBOOM(255, 0, 0),
         CHEST(2, 213, 250),
@@ -14,7 +32,7 @@ public record SecretWaypoint(int secretIndex, Category category, BlockPos pos, b
         FAIRYSOUL(255, 85, 255),
         STONK(146, 52, 235),
         DEFAULT(190, 255, 252);
-        final float[] colorComponents;
+        private final float[] colorComponents;
 
         Category(int... intColorComponents) {
             colorComponents = new float[intColorComponents.length];
@@ -22,5 +40,20 @@ public record SecretWaypoint(int secretIndex, Category category, BlockPos pos, b
                 colorComponents[i] = intColorComponents[i] / 255F;
             }
         }
+
+        private static Category get(JsonObject categoryJson) {
+            return switch (categoryJson.get("category").getAsString()) {
+                case "entrance" -> Category.ENTRANCE;
+                case "superboom" -> Category.SUPERBOOM;
+                case "chest" -> Category.CHEST;
+                case "item" -> Category.ITEM;
+                case "bat" -> Category.BAT;
+                case "wither" -> Category.WITHER;
+                case "lever" -> Category.LEVER;
+                case "fairysoul" -> Category.FAIRYSOUL;
+                case "stonk" -> Category.STONK;
+                default -> Category.DEFAULT;
+            };
+        }
     }
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderHelper.java b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderHelper.java
index 5de3ce77..a38f1ab8 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderHelper.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderHelper.java
@@ -16,6 +16,7 @@ import net.minecraft.client.render.VertexFormat.DrawMode;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.text.OrderedText;
+import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
@@ -73,6 +74,18 @@ public class RenderHelper {
         }
     }
 
+    public static void renderText(WorldRenderContext context, Text text, Vec3d pos, boolean seeThrough) {
+        renderText(context, text, pos, 1, seeThrough);
+    }
+
+    public static void renderText(WorldRenderContext context, Text text, Vec3d pos, float scale, boolean seeThrough) {
+        renderText(context, text, pos, scale, 0, seeThrough);
+    }
+
+    public static void renderText(WorldRenderContext context, Text text, Vec3d pos, float scale, float yOffset, boolean seeThrough) {
+        renderText(context, text.asOrderedText(), pos, scale, yOffset, seeThrough);
+    }
+
     /**
      * Draws lines from point to point.<br><br>
      * <p>
@@ -133,7 +146,7 @@ public class RenderHelper {
      *
      * @param seeThrough Whether the text should be able to be seen through walls or not.
      */
-    public static void renderText(WorldRenderContext context, Vec3d pos, OrderedText text, float scale, boolean seeThrough) {
+    public static void renderText(WorldRenderContext context, OrderedText text, Vec3d pos, float scale, float yOffset, boolean seeThrough) {
         MatrixStack matrices = context.matrixStack();
         Vec3d camera = context.camera().getPos();
         TextRenderer textRenderer = client.textRenderer;
@@ -155,7 +168,7 @@ public class RenderHelper {
 
         RenderSystem.depthFunc(seeThrough ? GL11.GL_ALWAYS : GL11.GL_LEQUAL);
 
-        textRenderer.draw(text, xOffset, 0, 0xFFFFFFFF, false, positionMatrix, consumers, TextRenderer.TextLayerType.SEE_THROUGH, 0, LightmapTextureManager.MAX_LIGHT_COORDINATE);
+        textRenderer.draw(text, xOffset, yOffset, 0xFFFFFFFF, false, positionMatrix, consumers, TextRenderer.TextLayerType.SEE_THROUGH, 0, LightmapTextureManager.MAX_LIGHT_COORDINATE);
         consumers.draw();
 
         RenderSystem.depthFunc(GL11.GL_LEQUAL);