Minimap Fix

Author: cev-api

src/main/java/dev/xpple/seedmapper/SeedMapper.java

@@ -83,10 +83,14 @@ public void onInitializeClient() {
         SeedDatabaseHelper.fetchSeeds();
 
         KeyMapping keyMapping = KeyBindingHelper.registerKeyBinding(new KeyMapping("key.seedMap", InputConstants.KEY_M, KeyMapping.Category.GAMEPLAY));
+        KeyMapping minimapKeyMapping = KeyBindingHelper.registerKeyBinding(new KeyMapping("key.seedMapMinimap", InputConstants.KEY_COMMA, KeyMapping.Category.GAMEPLAY));
         ClientTickEvents.END_CLIENT_TICK.register(minecraft -> {
             while (keyMapping.consumeClick()) {
                 minecraft.player.connection.sendCommand("sm:seedmap");
             }
+            while (minimapKeyMapping.consumeClick()) {
+                minecraft.player.connection.sendCommand("sm:minimap");
+            }
         });
 
         ClientCommandRegistrationCallback.EVENT.register(SeedMapper::registerCommands);

src/main/java/dev/xpple/seedmapper/config/Configs.java

@@ -64,14 +64,14 @@ private static void setPixelsPerBiome(double pixelsPerBiome) {
     }
 
     @Config(setter = @Config.Setter("setMinimapOffsetX"))
-    public static int SeedMapMinimapOffsetX = 5;
+    public static int SeedMapMinimapOffsetX = 4;
 
     private static void setMinimapOffsetX(int offsetX) {
         SeedMapMinimapOffsetX = Math.max(0, offsetX);
     }
 
     @Config(setter = @Config.Setter("setMinimapOffsetY"))
-    public static int SeedMapMinimapOffsetY = 5;
+    public static int SeedMapMinimapOffsetY = 4;
 
     private static void setMinimapOffsetY(int offsetY) {
         SeedMapMinimapOffsetY = Math.max(0, offsetY);
@@ -92,10 +92,10 @@ private static void setMinimapHeight(int height) {
     }
 
     @Config
-    public static boolean SeedMapMinimapRotateWithPlayer = false;
+    public static boolean SeedMapMinimapRotateWithPlayer = true;
 
     @Config(setter = @Config.Setter("setMinimapPixelsPerBiome"))
-    public static double SeedMapMinimapPixelsPerBiome = 2.0D;
+    public static double SeedMapMinimapPixelsPerBiome = 1.5D;
 
     private static void setMinimapPixelsPerBiome(double pixelsPerBiome) {
         SeedMapMinimapPixelsPerBiome = Math.clamp(pixelsPerBiome, SeedMapScreen.MIN_PIXELS_PER_BIOME, SeedMapScreen.MAX_PIXELS_PER_BIOME);

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

@@ -9,6 +9,7 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
 import net.minecraft.world.phys.Vec3;
+import org.joml.Matrix3x2fStack;
 
 public class SeedMapMinimapScreen extends SeedMapScreen {
 
@@ -62,7 +63,7 @@ public void renderToHud(GuiGraphics guiGraphics, LocalPlayer player, float parti
 
         this.setFeatureIconRenderingEnabled(false);
         this.setMarkerRenderingEnabled(false);
-        this.setPlayerIconRenderingEnabled(!rotateWithPlayer);
+        this.setPlayerIconRenderingEnabled(false);
 
         var pose = guiGraphics.pose();
         pose.pushMatrix();
@@ -72,6 +73,7 @@ public void renderToHud(GuiGraphics guiGraphics, LocalPlayer player, float parti
             pose.translate((float) -centerX, (float) -centerY);
         }
         pose.translate((float) translateX, (float) translateY);
+        this.featureWidgets.clear();
         this.renderSeedMap(guiGraphics, Integer.MIN_VALUE, Integer.MIN_VALUE, partialTick);
         pose.popMatrix();
 
@@ -82,6 +84,8 @@ public void renderToHud(GuiGraphics guiGraphics, LocalPlayer player, float parti
         this.renderMinimapIcons(guiGraphics, translateX, translateY, centerX, centerY, rotationRadians);
         if (rotateWithPlayer) {
             this.drawCenterCross(guiGraphics, centerX, centerY);
+        } else {
+            this.drawCenteredPlayerDirectionArrow(guiGraphics, centerX, centerY, 6.0D, partialTick);
         }
 
         guiGraphics.disableScissor();

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

@@ -1572,7 +1572,7 @@ private boolean handleMapFeatureLeftClicked(MouseButtonEvent mouseButtonEvent, b
         return true;
     }
 
-    private void drawPlayerDirectionArrow(GuiGraphics guiGraphics, int playerMinX, int playerMinY, float partialTick) {
+    protected void drawPlayerDirectionArrow(GuiGraphics guiGraphics, int playerMinX, int playerMinY, float partialTick) {
         LocalPlayer player = this.minecraft.player;
         if (player == null) {
             return;
@@ -1613,6 +1613,37 @@ private void drawPlayerDirectionArrow(GuiGraphics guiGraphics, int playerMinX, i
         poseStack.popMatrix();
     }
 
+    protected void drawCenteredPlayerDirectionArrow(GuiGraphics guiGraphics, double centerX, double centerY, double iconHalf, float partialTick) {
+        LocalPlayer player = this.minecraft.player;
+        if (player == null) {
+            return;
+        }
+        Vec3 look = player.getViewVector(partialTick);
+        double dirX = look.x;
+        double dirZ = look.z;
+        double length = Math.hypot(dirX, dirZ);
+        if (length < 1.0E-4D) {
+            return;
+        }
+        double normX = dirX / length;
+        double normZ = dirZ / length;
+
+        double arrowScale = (PLAYER_DIRECTION_ARROW_DRAW_HEIGHT / PLAYER_DIRECTION_ARROW_TEXTURE_HEIGHT) * (iconHalf / 10.0D);
+        float angle = (float) Math.atan2(normX, -normZ);
+
+        Matrix3x2fStack poseStack = guiGraphics.pose();
+        poseStack.pushMatrix();
+        poseStack.translate((float) centerX, (float) centerY);
+        poseStack.rotate(angle);
+        poseStack.scale((float) arrowScale, (float) arrowScale);
+        poseStack.translate(-PLAYER_DIRECTION_ARROW_TEXTURE_WIDTH / 2.0F, -PLAYER_DIRECTION_ARROW_TEXTURE_HEIGHT / 2.0F);
+
+        GpuTextureView gpuTextureView = Minecraft.getInstance().getTextureManager().getTexture(PLAYER_DIRECTION_ARROW_TEXTURE).getTextureView();
+        BlitRenderState renderState = new BlitRenderState(RenderPipelines.GUI_TEXTURED, TextureSetup.singleTexture(gpuTextureView), new Matrix3x2f(poseStack), 0, 0, PLAYER_DIRECTION_ARROW_TEXTURE_WIDTH, PLAYER_DIRECTION_ARROW_TEXTURE_HEIGHT, 0, 1, 0, 1, -1, guiGraphics.scissorStack.peek());
+        guiGraphics.guiRenderState.submitBlitToCurrentLayer(renderState);
+        poseStack.popMatrix();
+    }
+
     private boolean hasEndCityShip(BlockPos pos) {
         int biome = Cubiomes.getBiomeAt(this.biomeGenerator, BIOME_SCALE, QuartPos.fromBlock(pos.getX()), QuartPos.fromBlock(320), QuartPos.fromBlock(pos.getZ()));
         try (Arena tempArena = Arena.ofConfined()) {