Make player icon toggleable + add arrow indicating player direction

Author: xpple

src/main/java/dev/xpple/seedmapper/command/commands/SeedMapCommand.java

@@ -20,7 +20,7 @@ private static int seedMap(CustomClientCommandSource source) throws CommandSynta
         long seed = source.getSeed().getSecond();
         int dimension = source.getDimension();
         int version = source.getVersion();
-        source.getClient().schedule(() -> source.getClient().setScreen(new SeedMapScreen(seed, dimension, version, BlockPos.containing(source.getPosition()))));
+        source.getClient().schedule(() -> source.getClient().setScreen(new SeedMapScreen(seed, dimension, version, BlockPos.containing(source.getPosition()), source.getRotation())));
         return Command.SINGLE_SUCCESS;
     }
 }

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

@@ -106,6 +106,7 @@ public Texture getVariantTexture(WorldIdentifier identifier, int posX, int posZ,
     SLIME_CHUNK("slime_chunk", -1, Cubiomes.DIM_OVERWORLD(), Cubiomes.MC_B1_7(), "feature_icons", 20, 20),
     WORLD_SPAWN("world_spawn", -1, Cubiomes.DIM_OVERWORLD(), Cubiomes.MC_B1_7(), "cubiomes_viewer_icons", 20, 20),
     WAYPOINT("waypoint", -1, Cubiomes.DIM_UNDEF(), Cubiomes.MC_B1_7(), "feature_icons", 20, 20),
+    PLAYER_ICON("player_icon", -1, Cubiomes.DIM_UNDEF(), Cubiomes.MC_B1_7(), "feature_icons", 20, 20),
     ;
 
     public static final Map<String, MapFeature> BY_NAME = Arrays.stream(values())

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

@@ -78,6 +78,7 @@
 import net.minecraft.world.level.levelgen.PositionalRandomFactory;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
 import net.minecraft.world.level.levelgen.XoroshiroRandomSource;
+import net.minecraft.world.phys.Vec2;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix3x2f;
 
@@ -194,6 +195,7 @@ public class SeedMapScreen extends Screen {
     private final SeedMapCache<TilePos, BitSet> slimeChunkCache;
 
     private final BlockPos playerPos;
+    private final Vec2 playerRotation;
 
     private QuartPos2f centerQuart;
 
@@ -219,9 +221,11 @@ public class SeedMapScreen extends Screen {
     private @Nullable FeatureWidget markerWidget = null;
     private @Nullable ChestLootWidget chestLootWidget = null;
 
+    private static final ResourceLocation DIRECTION_ARROW_TEXTURE = ResourceLocation.fromNamespaceAndPath(SeedMapper.MOD_ID, "textures/gui/arrow.png");
+
     private Registry<Enchantment> enchantmentsRegistry;
 
-    public SeedMapScreen(long seed, int dimension, int version, BlockPos playerPos) {
+    public SeedMapScreen(long seed, int dimension, int version, BlockPos playerPos, Vec2 playerRotation) {
         super(Component.empty());
         this.seed = seed;
         this.dimension = dimension;
@@ -292,6 +296,7 @@ public SeedMapScreen(long seed, int dimension, int version, BlockPos playerPos)
             .orElseThrow();
 
         this.playerPos = playerPos;
+        this.playerRotation = playerRotation;
 
         this.centerQuart = QuartPos2f.fromQuartPos(QuartPos2.fromBlockPos(this.playerPos));
         this.mouseQuart = QuartPos2.fromQuartPos2f(this.centerQuart);
@@ -453,13 +458,27 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia
         }
 
         // draw player position
-        QuartPos2f relPlayerQuart = QuartPos2f.fromQuartPos(QuartPos2.fromBlockPos(this.playerPos)).subtract(this.centerQuart);
-        int playerMinX = this.centerX + Mth.floor(Configs.PixelsPerBiome * relPlayerQuart.x()) - 10;
-        int playerMinY = this.centerY + Mth.floor(Configs.PixelsPerBiome * relPlayerQuart.z()) - 10;
-        int playerMaxX = playerMinX + 20;
-        int playerMaxY = playerMinY + 20;
-        if (playerMinX >= HORIZONTAL_PADDING && playerMaxX <= HORIZONTAL_PADDING + this.seedMapWidth && playerMinY >= VERTICAL_PADDING && playerMaxY <= VERTICAL_PADDING + this.seedMapHeight) {
-            PlayerFaceRenderer.draw(guiGraphics, this.minecraft.player.getSkin(), playerMinX, playerMinY, 20);
+        if (this.toggleableFeatures.contains(MapFeature.PLAYER_ICON) && Configs.ToggledFeatures.contains(MapFeature.PLAYER_ICON)) {
+            QuartPos2f relPlayerQuart = QuartPos2f.fromQuartPos(QuartPos2.fromBlockPos(this.playerPos)).subtract(this.centerQuart);
+            int playerMinX = this.centerX + Mth.floor(Configs.PixelsPerBiome * relPlayerQuart.x()) - 10;
+            int playerMinY = this.centerY + Mth.floor(Configs.PixelsPerBiome * relPlayerQuart.z()) - 10;
+            int playerMaxX = playerMinX + 20;
+            int playerMaxY = playerMinY + 20;
+            if (playerMinX >= HORIZONTAL_PADDING && playerMaxX <= HORIZONTAL_PADDING + this.seedMapWidth && playerMinY >= VERTICAL_PADDING && playerMaxY <= VERTICAL_PADDING + this.seedMapHeight) {
+                PlayerFaceRenderer.draw(guiGraphics, this.minecraft.player.getSkin(), playerMinX, playerMinY, 20);
+            }
+
+            // draw player direction arrow
+            guiGraphics.pose().pushMatrix();
+            guiGraphics.pose() // transformations are applied in reverse order
+                .translate(10, 10)
+                .translate(playerMinX, playerMinY)
+                .rotate((float) (Math.toRadians(this.playerRotation.y) + Math.PI))
+                .translate(-10, -10)
+                .translate(0, -30)
+            ;
+            drawIcon(guiGraphics, DIRECTION_ARROW_TEXTURE, 0, 0, 20, 20, 0xFF_FFFFFF);
+            guiGraphics.pose().popMatrix();
         }
 
         // calculate spawn point
@@ -1125,15 +1144,19 @@ static void drawFeatureIcon(GuiGraphics guiGraphics, MapFeature.Texture texture,
             int iconWidth = texture.width();
             int iconHeight = texture.height();
 
-            // Skip intersection checks (GuiRenderState.hasIntersection) you would otherwise get when calling
-            // GuiGraphics.blit(RenderPipeline, ResourceLocation, int, int, float, float, int, int, int, int, int)
-            // as these checks incur a significant performance hit
-            GpuTextureView gpuTextureView = Minecraft.getInstance().getTextureManager().getTexture(texture.resourceLocation()).getTextureView();
-            BlitRenderState renderState = new BlitRenderState(RenderPipelines.GUI_TEXTURED, TextureSetup.singleTexture(gpuTextureView), new Matrix3x2f(guiGraphics.pose()), minX, minY, minX + iconWidth, minY + iconHeight, 0, 1, 0, 1, colour, guiGraphics.scissorStack.peek());
-            guiGraphics.guiRenderState.submitBlitToCurrentLayer(renderState);
+            drawIcon(guiGraphics, texture.resourceLocation(), minX, minY, iconWidth, iconHeight, colour);
         }
     }
 
+    private static void drawIcon(GuiGraphics guiGraphics, ResourceLocation resourceLocation, int minX, int minY, int iconWidth, int iconHeight, int colour) {
+        // Skip intersection checks (GuiRenderState.hasIntersection) you would otherwise get when calling
+        // GuiGraphics.blit(RenderPipeline, ResourceLocation, int, int, float, float, int, int, int, int, int)
+        // as these checks incur a significant performance hit
+        GpuTextureView gpuTextureView = Minecraft.getInstance().getTextureManager().getTexture(resourceLocation).getTextureView();
+        BlitRenderState renderState = new BlitRenderState(RenderPipelines.GUI_TEXTURED, TextureSetup.singleTexture(gpuTextureView), new Matrix3x2f(guiGraphics.pose()), minX, minY, minX + iconWidth, minY + iconHeight, 0, 1, 0, 1, colour, guiGraphics.scissorStack.peek());
+        guiGraphics.guiRenderState.submitBlitToCurrentLayer(renderState);
+    }
+
     private static final BiMap<Integer, ResourceKey<Level>> DIM_ID_TO_MC = ImmutableBiMap.of(
         Cubiomes.DIM_OVERWORLD(), Level.OVERWORLD,
         Cubiomes.DIM_NETHER(), Level.NETHER,