Merged with upstream and ensured compatibility with JDK21

Author: cev-api

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

@@ -91,24 +91,44 @@ private static Component getEspTimeoutComment() {
     }
 
     @Config(comment = "getClearSeedMapCachesOnCloseComment")
-    public static boolean ClearSeedMapCachesOnClose = true;
+    public static boolean ClearSeedMapCachesOnClose = false;
 
     private static Component getClearSeedMapCachesOnCloseComment() {
         return Component.translatable("config.clearSeedMapCachesOnClose.comment");
     }
 
-    @Config
+    @Config(comment = "getBlockHighlightEspComment")
     public static EspStyle BlockHighlightESP = EspStyle.useCommandColorDefaults();
 
-    @Config
+    private static Component getBlockHighlightEspComment() {
+        return Component.translatable("config.blockHighlightEsp.comment");
+    }
+
+    @Config(comment = "getOreVeinEspComment")
     public static EspStyle OreVeinESP = EspStyle.useCommandColorDefaults();
 
-    @Config
+    private static Component getOreVeinEspComment() {
+        return Component.translatable("config.oreVeinEsp.comment");
+    }
+
+    @Config(comment = "getTerrainEspComment")
     public static EspStyle TerrainESP = EspStyle.useCommandColorDefaults();
 
-    @Config
+    private static Component getTerrainEspComment() {
+        return Component.translatable("config.terrainEsp.comment");
+    }
+
+    @Config(comment = "getCanyonEspComment")
     public static EspStyle CanyonESP = EspStyle.useCommandColorDefaults();
 
-    @Config
+    private static Component getCanyonEspComment() {
+        return Component.translatable("config.canyonEsp.comment");
+    }
+
+    @Config(comment = "getCaveEspComment")
     public static EspStyle CaveESP = EspStyle.useCommandColorDefaults();
+
+    private static Component getCaveEspComment() {
+        return Component.translatable("config.caveEsp.comment");
+    }
 }

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

@@ -391,8 +391,10 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia
 
         guiGraphics.nextStratum();
 
-        int horChunkRadius = Math.ceilDiv(this.seedMapWidth / 2, SCALED_CHUNK_SIZE * Configs.PixelsPerBiome);
-        int verChunkRadius = Math.ceilDiv(this.seedMapHeight / 2, SCALED_CHUNK_SIZE * Configs.PixelsPerBiome);
+        double pixelsPerBiome = Math.max(MIN_PIXELS_PER_BIOME, Configs.PixelsPerBiome);
+        double chunkSizePixels = SCALED_CHUNK_SIZE * pixelsPerBiome;
+        int horChunkRadius = (int) Math.ceil((this.seedMapWidth / 2.0D) / chunkSizePixels);
+        int verChunkRadius = (int) Math.ceil((this.seedMapHeight / 2.0D) / chunkSizePixels);
 
         // compute structures
         Configs.ToggledFeatures.stream()
@@ -532,7 +534,10 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia
         MutableComponent coordinates = accent("x: %d, z: %d".formatted(QuartPos.toBlock(this.mouseQuart.x()), QuartPos.toBlock(this.mouseQuart.z())));
         OptionalInt optionalBiome = getBiome(this.mouseQuart);
         if (optionalBiome.isPresent()) {
-            coordinates = coordinates.append(" [%s]".formatted(Cubiomes.biome2str(this.version, optionalBiome.getAsInt()).getString(0)));
+            String biomeName = NativeAccess.readString(Cubiomes.biome2str(this.version, optionalBiome.getAsInt()));
+            if (biomeName != null) {
+                coordinates = coordinates.append(" [%s]".formatted(biomeName));
+            }
         }
         if (this.displayCoordinatesCopiedTicks > 0) {
             coordinates = Component.translatable("seedMap.coordinatesCopied", coordinates);
@@ -545,11 +550,11 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia
     private void drawTile(GuiGraphics guiGraphics, Tile tile) {
         TilePos tilePos = tile.pos();
         QuartPos2f relTileQuart = QuartPos2f.fromQuartPos(QuartPos2.fromTilePos(tilePos)).subtract(this.centerQuart);
-        int tileSizePixels = TILE_SIZE_PIXELS.getAsInt();
-        int minX = this.centerX + Mth.floor(Configs.PixelsPerBiome * relTileQuart.x());
-        int minY = this.centerY + Mth.floor(Configs.PixelsPerBiome * relTileQuart.z());
-        int maxX = minX + tileSizePixels;
-        int maxY = minY + tileSizePixels;
+        int tileSizePixels = tileSizePixels();
+        double minXDouble = this.centerX + Configs.PixelsPerBiome * relTileQuart.x();
+        double minYDouble = this.centerY + Configs.PixelsPerBiome * relTileQuart.z();
+        double maxXDouble = minXDouble + tileSizePixels;
+        double maxYDouble = minYDouble + tileSizePixels;
 
         if (maxXDouble <= HORIZONTAL_PADDING || minXDouble >= HORIZONTAL_PADDING + this.seedMapWidth) {
             return;

src/main/resources/assets/seedmapper/lang/en_us.json

@@ -95,6 +95,12 @@
 
   "config.oreAirCheck.comment": "Whether or not SeedMapper should use in-game air checks to invalidate ore positions.",
   "config.devMode.comment": "Enables certain debug commands.",
+  "config.clearSeedMapCachesOnClose.comment": "If enabled, closing the seed map frees all cached tiles and structures immediately instead of keeping them for faster re-open.",
+  "config.blockHighlightEsp.comment": "Controls the ESP colors used for highlighted block clusters.",
+  "config.oreVeinEsp.comment": "Controls the ESP colors used for ore vein highlights.",
+  "config.terrainEsp.comment": "Controls the ESP colors used for terrain outlines.",
+  "config.canyonEsp.comment": "Controls the ESP colors used for canyon/ravine outlines.",
+  "config.caveEsp.comment": "Controls the ESP colors used for cave highlights.",
 
   "key.seedMap": "Seed map",