Add minimum inhabitedTime configuration to maps

Author: TBlueF

BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/config/MapConfig.java

@@ -44,6 +44,8 @@ public class MapConfig implements MapSettings {
     private transient Vector3i min = null;
     private transient Vector3i max = null;
 
+    private long minInhabitedTime = 0;
+
     private boolean renderEdges = true;
 
     private boolean saveHiresLayer = true;
@@ -108,6 +110,10 @@ public Vector3i getMaxPos() {
         return max;
     }
 
+    public long getMinInhabitedTime() {
+        return minInhabitedTime;
+    }
+
     public boolean isRenderEdges() {
         return renderEdges;
     }

BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/rendermanager/WorldRegionRenderTask.java

@@ -28,6 +28,7 @@
 import com.flowpowered.math.vector.Vector2l;
 import de.bluecolored.bluemap.api.debug.DebugDump;
 import de.bluecolored.bluemap.core.map.BmMap;
+import de.bluecolored.bluemap.core.world.Chunk;
 import de.bluecolored.bluemap.core.world.Grid;
 import de.bluecolored.bluemap.core.world.Region;
 
@@ -151,7 +152,9 @@ private boolean isAllChunksInTileGenerated(Vector2i tile) {
 
         for (int x = minChunk.getX(); x <= maxChunk.getX(); x++) {
             for (int z = minChunk.getY(); z <= maxChunk.getY(); z++) {
-                if (!map.getWorld().getChunk(x, z).isGenerated()) return false;
+                Chunk chunk = map.getWorld().getChunk(x, z);
+                if (!chunk.isGenerated()) return false;
+                if (chunk.getInhabitedTime() < map.getMapSettings().getMinInhabitedTime()) return false;
             }
         }
 

BlueMapCommon/src/main/resources/de/bluecolored/bluemap/config/maps/map.conf

@@ -69,6 +69,11 @@ cave-detection-uses-block-light: false
 #min-y: 50
 ${max-y-comment<<#>>}max-y: ${max-y}
 
+# The minimum "inhabitedTime" value that a chunk must have to be rendered.
+# If you set this to a value greater than 0, bluemap will only render chunks that players have visited already.
+# Default is 0
+min-inhabited-time: 0
+
 # Using this, BlueMap pretends that every Block out of the defined render-bounds is AIR,
 # this means you can see the blocks where the world is cut (instead of having a see-through/xray view).
 # This has only an effect if you set some render-bounds above.

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/MapSettings.java

@@ -37,6 +37,8 @@ public interface MapSettings extends RenderSettings {
 
     String getSkyColor();
 
+    long getMinInhabitedTime();
+
     int getHiresTileSize();
 
     int getLowresTileSize();

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil113.java

@@ -38,6 +38,7 @@
 public class ChunkAnvil113 extends MCAChunk {
     private boolean isGenerated;
     private boolean hasLight;
+    private long inhabitedTime;
     private Section[] sections;
     private int[] biomes;
 
@@ -51,6 +52,8 @@ public ChunkAnvil113(MCAWorld world, CompoundTag chunkTag) {
         this.isGenerated = status.equals("full");
         this.hasLight = isGenerated;
 
+        this.inhabitedTime = levelData.getLong("InhabitedTime");
+
         if (!isGenerated && getWorld().isIgnoreMissingLightData()) {
             isGenerated = !status.equals("empty");
         }
@@ -92,6 +95,11 @@ public boolean isGenerated() {
         return isGenerated;
     }
 
+    @Override
+    public long getInhabitedTime() {
+        return inhabitedTime;
+    }
+
     @Override
     public BlockState getBlockState(int x, int y, int z) {
         int sectionY = y >> 4;

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil115.java

@@ -38,6 +38,7 @@
 public class ChunkAnvil115 extends MCAChunk {
     private boolean isGenerated;
     private boolean hasLight;
+    private long inhabitedTime;
     private Section[] sections;
     private int[] biomes;
 
@@ -51,6 +52,8 @@ public ChunkAnvil115(MCAWorld world, CompoundTag chunkTag) {
         this.isGenerated = status.equals("full");
         this.hasLight = isGenerated;
 
+        this.inhabitedTime = levelData.getLong("InhabitedTime");
+
         if (!isGenerated && getWorld().isIgnoreMissingLightData()) {
             isGenerated = !status.equals("empty");
         }
@@ -92,6 +95,11 @@ public boolean isGenerated() {
         return isGenerated;
     }
 
+    @Override
+    public long getInhabitedTime() {
+        return inhabitedTime;
+    }
+
     @Override
     public BlockState getBlockState(int x, int y, int z) {
         int sectionY = y >> 4;

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil116.java

@@ -40,6 +40,8 @@ public class ChunkAnvil116 extends MCAChunk {
     private boolean isGenerated;
     private boolean hasLight;
 
+    private long inhabitedTime;
+
     private int sectionMin, sectionMax;
     private Section[] sections;
 
@@ -55,6 +57,8 @@ public ChunkAnvil116(MCAWorld world, CompoundTag chunkTag) {
         this.isGenerated = status.equals("full");
         this.hasLight = isGenerated;
 
+        this.inhabitedTime = levelData.getLong("InhabitedTime");
+
         if (!isGenerated && getWorld().isIgnoreMissingLightData()) {
             isGenerated = !status.equals("empty");
         }
@@ -109,6 +113,11 @@ public boolean isGenerated() {
         return isGenerated;
     }
 
+    @Override
+    public long getInhabitedTime() {
+        return inhabitedTime;
+    }
+
     @Override
     public BlockState getBlockState(int x, int y, int z) {
         int sectionY = y >> 4;

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil118.java

@@ -40,6 +40,8 @@ public class ChunkAnvil118 extends MCAChunk {
     private boolean isGenerated;
     private boolean hasLight;
 
+    private long inhabitedTime;
+
     private int sectionMin, sectionMax;
     private Section[] sections;
 
@@ -51,6 +53,8 @@ public ChunkAnvil118(MCAWorld world, CompoundTag chunkTag) {
         this.isGenerated = status.equals("full");
         this.hasLight = isGenerated;
 
+        this.inhabitedTime = chunkTag.getLong("InhabitedTime");
+
         if (!isGenerated && getWorld().isIgnoreMissingLightData()) {
             isGenerated = !status.equals("empty");
         }
@@ -95,6 +99,11 @@ public boolean isGenerated() {
         return isGenerated;
     }
 
+    @Override
+    public long getInhabitedTime() {
+        return inhabitedTime;
+    }
+
     @Override
     public BlockState getBlockState(int x, int y, int z) {
         int sectionY = y >> 4;

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/EmptyChunk.java

@@ -37,6 +37,11 @@ public boolean isGenerated() {
         return false;
     }
 
+    @Override
+    public long getInhabitedTime() {
+        return 0;
+    }
+
     @Override
     public BlockState getBlockState(int x, int y, int z) {
         return BlockState.AIR;

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/MCAChunk.java

@@ -59,6 +59,9 @@ public int getDataVersion() {
         return dataVersion;
     }
 
+    @Override
+    public abstract long getInhabitedTime();
+
     @Override
     public abstract BlockState getBlockState(int x, int y, int z);