Minimap Waypoint Fix

Author: cev-api

src/main/java/dev/xpple/seedmapper/seedmap/SeedMapMinimapScreen.java

@@ -12,11 +12,15 @@
 import net.minecraft.world.phys.Vec3;
 import org.joml.Matrix3x2fStack;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class SeedMapMinimapScreen extends SeedMapScreen {
 
     private boolean initialized = false;
     private int cachedWidth = -1;
     private int cachedHeight = -1;
+    private final List<WaypointLabel> waypointLabels = new ArrayList<>();
 
     public SeedMapMinimapScreen(long seed, int dimension, int version, BlockPos playerPos) {
         super(seed, dimension, version, playerPos, new Vec2(0.0F, 0.0F));
@@ -67,6 +71,7 @@ public void renderToHud(GuiGraphics guiGraphics, LocalPlayer player, float parti
         this.setFeatureIconRenderingEnabled(false);
         this.setMarkerRenderingEnabled(false);
         this.setPlayerIconRenderingEnabled(false);
+        this.waypointLabels.clear();
 
         var pose = guiGraphics.pose();
         pose.pushMatrix();
@@ -80,6 +85,8 @@ public void renderToHud(GuiGraphics guiGraphics, LocalPlayer player, float parti
         this.renderSeedMap(guiGraphics, Integer.MIN_VALUE, Integer.MIN_VALUE, partialTick);
         pose.popMatrix();
 
+        this.renderWaypointLabels(guiGraphics, translateX, translateY, centerX, centerY, rotationRadians);
+
         boolean drawIcons = true;
         this.setFeatureIconRenderingEnabled(drawIcons);
         this.setMarkerRenderingEnabled(drawIcons);
@@ -93,6 +100,7 @@ public void renderToHud(GuiGraphics guiGraphics, LocalPlayer player, float parti
                 this.drawCenteredPlayerDirectionArrow(guiGraphics, centerX, centerY, 6.0D, partialTick);
             }
         }
+        this.waypointLabels.clear();
 
         guiGraphics.disableScissor();
     }
@@ -137,6 +145,31 @@ private void renderMinimapIcons(GuiGraphics guiGraphics, double translateX, doub
         }
     }
 
+    private void renderWaypointLabels(GuiGraphics guiGraphics, double translateX, double translateY, double centerX, double centerY, float rotationRadians) {
+        if (this.waypointLabels.isEmpty()) {
+            return;
+        }
+        double cos = Math.cos(rotationRadians);
+        double sin = Math.sin(rotationRadians);
+        double iconScale = Configs.SeedMapMinimapIconScale;
+        for (WaypointLabel label : this.waypointLabels) {
+            FeatureWidget widget = label.widget();
+            MapFeature.Texture texture = widget.texture();
+            double baseCenterX = widget.drawX() + texture.width() / 2.0D;
+            double baseCenterY = widget.drawY() + texture.height() / 2.0D;
+            double shiftedX = baseCenterX + translateX;
+            double shiftedY = baseCenterY + translateY;
+            double dx = shiftedX - centerX;
+            double dy = shiftedY - centerY;
+            double rotatedX = centerX + dx * cos - dy * sin;
+            double rotatedY = centerY + dx * sin + dy * cos;
+            double scaledHeight = Math.max(1.0D, texture.height() * iconScale);
+            int textX = (int) Math.round(rotatedX);
+            int textY = (int) Math.round(rotatedY + scaledHeight / 2.0D + 1.0D);
+            guiGraphics.drawCenteredString(this.font, label.text(), textX, textY, label.colour());
+        }
+    }
+
     private void renderSingleIcon(GuiGraphics guiGraphics, FeatureWidget widget, double translateX, double translateY, double centerX, double centerY, double cos, double sin, int colour, double iconScale) {
         MapFeature.Texture texture = widget.texture();
         int scaledWidth = (int) Math.max(1, Math.round(texture.width() * iconScale));
@@ -220,4 +253,33 @@ protected boolean showFeatureToggleTooltips() {
     protected boolean showSeedLabel() {
         return false;
     }
+
+    @Override
+    protected void drawWaypointLabel(GuiGraphics guiGraphics, FeatureWidget widget, String name, int colour) {
+        this.waypointLabels.add(new WaypointLabel(widget, name, colour));
+    }
+
+    private static final class WaypointLabel {
+        private final FeatureWidget widget;
+        private final String text;
+        private final int colour;
+
+        private WaypointLabel(FeatureWidget widget, String text, int colour) {
+            this.widget = widget;
+            this.text = text;
+            this.colour = colour;
+        }
+
+        public FeatureWidget widget() {
+            return this.widget;
+        }
+
+        public String text() {
+            return this.text;
+        }
+
+        public int colour() {
+            return this.colour;
+        }
+    }
 }

src/main/java/dev/xpple/seedmapper/seedmap/SeedMapScreen.java

@@ -2415,7 +2415,8 @@ protected void renderSeedMap(GuiGraphics guiGraphics, int mouseX, int mouseY, fl
                 if (widget == null) {
                     return;
                 }
-                    guiGraphics.drawCenteredString(this.font, name, widget.x + widget.width() / 2, widget.y + widget.height(), ARGB.color(255, waypoint.color()));
+                int labelColour = ARGB.color(255, waypoint.color());
+                this.drawWaypointLabel(guiGraphics, widget, name, labelColour);
             });
         }
 
@@ -2516,6 +2517,12 @@ private void renderFeatureToggleTooltip(GuiGraphics guiGraphics, int mouseX, int
         }
     }
 
+    protected void drawWaypointLabel(GuiGraphics guiGraphics, FeatureWidget widget, String name, int colour) {
+        int textX = widget.x + widget.width() / 2;
+        int textY = widget.y + widget.height();
+        guiGraphics.drawCenteredString(this.font, name, textX, textY, colour);
+    }
+
     protected void drawCenteredPlayerDirectionArrow(GuiGraphics guiGraphics, double centerX, double centerY, double size, float partialTick) {
         LocalPlayer player = this.minecraft.player;
         if (player == null) return;
@@ -2588,4 +2595,4 @@ protected void updateAllFeatureWidgetPositions() {
     public static int computeSeedMapWidth(int screenWidth) {
         return Math.max(1, screenWidth - 2 * HORIZONTAL_PADDING);
     }
-}
+}