Updated World Border Settings

Author: cev-api

README.md

@@ -22,7 +22,14 @@ You can adjust your own maximum zoom (I recommend 6000) using the command ```/sm
 ### World Border Limit
 Limit the SeedMap and Minimap to a server's world border size so the map only shows that area (centered at 0,0).
 
-Set it with ```/sm:config WorldBorder set 8000``` to show a border from -8000 to +8000 on both axes. Use 0 to disable.
+Set it with ```/sm:config WorldBorder set 8000``` to show a border from -8000 to +8000 on both axes for all dimensions. Use 0 to disable.
+
+You can also override per dimension:
+- ```/sm:config WorldBorderOverworld set 8000```
+- ```/sm:config WorldBorderNether set 8000```
+- ```/sm:config WorldBorderEnd set 8000```
+
+Per-dimension values take priority when set; use 0 to fall back to the global border.
 
 ### Double Click Recenter
 Double clicking anywhere on the map will recenter the map to the players location.

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

@@ -4,6 +4,7 @@
 import dev.xpple.betterconfig.api.BetterConfigAPI;
 import dev.xpple.betterconfig.api.Config;
 import dev.xpple.betterconfig.api.ModConfig;
+import com.github.cubiomes.Cubiomes;
 import dev.xpple.seedmapper.SeedMapper;
 import dev.xpple.seedmapper.command.arguments.SeedResolutionArgument;
 import dev.xpple.seedmapper.render.RenderManager;
@@ -151,6 +152,51 @@ private static void setWorldBorder(int worldBorder) {
         WorldBorder = Math.max(0, worldBorder);
     }
 
+    @Config(comment = "getWorldBorderOverworldComment", setter = @Config.Setter("setWorldBorderOverworld"))
+    public static int WorldBorderOverworld = 0;
+
+    private static Component getWorldBorderOverworldComment() {
+        return Component.translatable("config.worldBorder.overworld.comment");
+    }
+
+    private static void setWorldBorderOverworld(int worldBorder) {
+        WorldBorderOverworld = Math.max(0, worldBorder);
+    }
+
+    @Config(comment = "getWorldBorderNetherComment", setter = @Config.Setter("setWorldBorderNether"))
+    public static int WorldBorderNether = 0;
+
+    private static Component getWorldBorderNetherComment() {
+        return Component.translatable("config.worldBorder.nether.comment");
+    }
+
+    private static void setWorldBorderNether(int worldBorder) {
+        WorldBorderNether = Math.max(0, worldBorder);
+    }
+
+    @Config(comment = "getWorldBorderEndComment", setter = @Config.Setter("setWorldBorderEnd"))
+    public static int WorldBorderEnd = 0;
+
+    private static Component getWorldBorderEndComment() {
+        return Component.translatable("config.worldBorder.end.comment");
+    }
+
+    private static void setWorldBorderEnd(int worldBorder) {
+        WorldBorderEnd = Math.max(0, worldBorder);
+    }
+
+    public static int getWorldBorderForDimension(int dimension) {
+        int globalDimension = 0;
+        if (dimension == Cubiomes.DIM_OVERWORLD()) {
+            globalDimension = WorldBorderOverworld;
+        } else if (dimension == Cubiomes.DIM_NETHER()) {
+            globalDimension = WorldBorderNether;
+        } else if (dimension == Cubiomes.DIM_END()) {
+            globalDimension = WorldBorderEnd;
+        }
+        return globalDimension > 0 ? globalDimension : WorldBorder;
+    }
+
     private static double clampSeedMapZoom(double pixelsPerBiome) {
         double min = Math.max(SeedMapScreen.MIN_PIXELS_PER_BIOME, SeedMapMinPixelsPerBiome);
         return Math.clamp(pixelsPerBiome, min, SeedMapScreen.MAX_PIXELS_PER_BIOME);

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

@@ -109,6 +109,14 @@ public static void refreshIfOpenWithGeneratorFlags(int generatorFlags) {
         refreshIfOpenInternal(generatorFlags);
     }
 
+    public static void refreshCompletedStructuresIfOpen() {
+        Minecraft minecraft = Minecraft.getInstance();
+        minecraft.execute(() -> {
+            if (INSTANCE.minimapScreen == null) return;
+            INSTANCE.minimapScreen.refreshCompletedStructuresFromConfig();
+        });
+    }
+
     private static void refreshIfOpenInternal(@Nullable Integer generatorFlagsOverride) {
         Minecraft minecraft = Minecraft.getInstance();
         minecraft.execute(() -> {

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

@@ -207,15 +207,15 @@ private static double tileSizePixels() {
     }
 
     private boolean isWorldBorderEnabled() {
-        return Configs.WorldBorder > 0;
+        return this.worldBorderHalfBlocks() > 0;
     }
 
     private double worldBorderHalfBlocks() {
-        return Configs.WorldBorder;
+        return Configs.getWorldBorderForDimension(this.dimension);
     }
 
     private double worldBorderHalfQuart() {
-        return Configs.WorldBorder / 4.0D;
+        return this.worldBorderHalfBlocks() / 4.0D;
     }
 
     private boolean isWithinWorldBorder(BlockPos pos) {
@@ -2189,6 +2189,15 @@ private void setStructureCompleted(MapFeature feature, BlockPos pos, boolean com
         }
         Configs.setSeedMapCompletedStructures(this.structureCompletionKey, this.completedStructures);
         Configs.save();
+        try {
+            SeedMapMinimapManager.refreshCompletedStructuresIfOpen();
+        } catch (Throwable ignored) {
+        }
+    }
+
+    void refreshCompletedStructuresFromConfig() {
+        this.completedStructures.clear();
+        this.completedStructures.addAll(Configs.getSeedMapCompletedStructures(this.structureCompletionKey));
     }
 
     protected void drawCompletionOverlay(GuiGraphics guiGraphics, FeatureWidget widget, int x, int y, int width, int height) {

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

@@ -98,7 +98,10 @@
   "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.manualWaypointCompassOverlay.comment": "Set the waypoint compass overlay to be manually toggled instead of automatic.",
-  "config.worldBorder.comment": "Limits the seed map to a square world border radius in blocks. Use 0 to disable.",
+  "config.worldBorder.comment": "Limits the seed map to a square world border radius in blocks for all dimensions unless overridden. Use 0 to disable.",
+  "config.worldBorder.overworld.comment": "Overrides the world border radius in the Overworld. Use 0 to use the global border.",
+  "config.worldBorder.nether.comment": "Overrides the world border radius in the Nether. Use 0 to use the global border.",
+  "config.worldBorder.end.comment": "Overrides the world border radius in the End. Use 0 to use the global border.",
 
   "key.category.seedmapper.seedmapper": "SeedMapper",
   "key.seedMap": "Seed map",