Merge branch 'master' into mc1.21.1

Author: TBlueF

api

@@ -26,7 +26,6 @@
 
 import com.flowpowered.math.vector.Vector2i;
 import com.flowpowered.math.vector.Vector3d;
-import com.flowpowered.math.vector.Vector3i;
 import de.bluecolored.bluecommands.annotations.Argument;
 import de.bluecolored.bluecommands.annotations.Command;
 import de.bluecolored.bluemap.common.BlueMapService;
@@ -103,7 +102,6 @@ public Component block(CommandSource source, World world, @Argument("x") int x,
 
         Chunk chunk = world.getChunkAtBlock(x, z);
         LightData lightData = chunk.getLightData(x, y, z, new LightData(0, 0));
-        Vector3i spawnPoint = world.getSpawnPoint();
 
         return paragraph("World-Info (debug)", lines(
                 item("position", format("( x: % | y: % | z: % )",
@@ -138,12 +136,7 @@ public Component block(CommandSource source, World world, @Argument("x") int x,
                         .append(details(BASE_COLOR,
                                 item("name", world.getName()),
                                 item("min-y", world.getDimensionType().getMinY()),
-                                item("height", world.getDimensionType().getHeight()),
-                                item("spawn", format("( x: % | y: % | z: % )",
-                                        text(spawnPoint.getX()).color(HIGHLIGHT_COLOR),
-                                        text(spawnPoint.getY()).color(HIGHLIGHT_COLOR),
-                                        text(spawnPoint.getZ()).color(HIGHLIGHT_COLOR)
-                                ))
+                                item("height", world.getDimensionType().getHeight())
                         ))
                 )
         ));

common/src/main/java/de/bluecolored/bluemap/common/commands/commands/DebugCommand.java

@@ -60,7 +60,7 @@ public class MapConfig implements MapSettings {
 
     private int sorting = 0;
 
-    @Nullable private Vector2i startPos = null;
+    private Vector2i startPos = Vector2i.ZERO;
 
     private String skyColor = "#7dabff";
     private String voidColor = "#000000";

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

@@ -112,14 +112,8 @@ private Collection<RenderTask> createTasks(Collection<Vector2i> regions) {
         ArrayList<WorldRegionRenderTask> regionTasks = new ArrayList<>(regions.size());
         regions.forEach(region -> regionTasks.add(new WorldRegionRenderTask(map, region, force)));
 
-        // get spawn region
-        World world = map.getWorld();
-        Vector2i spawnPoint = world.getSpawnPoint().toVector2(true);
-        Grid regionGrid = world.getRegionGrid();
-        Vector2i spawnRegion = regionGrid.getCell(spawnPoint);
-
-        // sort tasks by distance to the spawn region
-        regionTasks.sort(WorldRegionRenderTask.defaultComparator(spawnRegion));
+        // sort tasks by distance to 0/0
+        regionTasks.sort(WorldRegionRenderTask.defaultComparator(Vector2i.ZERO));
 
         // save map before and after the whole update
         ArrayList<RenderTask> tasks = new ArrayList<>(regionTasks.size() + 2);

common/src/main/java/de/bluecolored/bluemap/common/rendermanager/MapUpdatePreparationTask.java

@@ -329,6 +329,7 @@ private BoundsSituation checkTileBounds(Vector2i tile) {
     }
 
     private @Nullable TileState checkTileRenderPreconditions(Vector2i tile) {
+        boolean chunksAreGenerated = false;
         boolean chunksAreInhabited = false;
 
         long minInhabitedTime = map.getMapSettings().getMinInhabitedTime();
@@ -344,12 +345,17 @@ private BoundsSituation checkTileBounds(Vector2i tile) {
             for (int chunkZ = minZ; chunkZ <= maxZ; chunkZ++) {
                 Chunk chunk = map.getWorld().getChunk(chunkX, chunkZ);
                 if (chunk == Chunk.ERRORED_CHUNK) return TileState.CHUNK_ERROR;
-                if (!chunk.isGenerated()) return TileState.NOT_GENERATED;
-                if (requireLight && !chunk.hasLightData()) return TileState.MISSING_LIGHT;
+                if (requireLight) {
+                    if (!chunk.isGenerated()) return TileState.NOT_GENERATED;
+                    if (!chunk.hasLightData()) return TileState.MISSING_LIGHT;
+                }
+                if (chunk.isGenerated()) chunksAreGenerated = true;
                 if (chunk.getInhabitedTime() >= minInhabitedTime) chunksAreInhabited = true;
             }
         }
 
+        if (!chunksAreGenerated) return TileState.NOT_GENERATED;
+
         // second pass for increased inhabited-time-radius
         if (!chunksAreInhabited && minInhabitedTimeRadius > 0) {
             inhabitedRadiusCheck:

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

@@ -57,7 +57,7 @@ public LoggingRequestHandler(HttpRequestHandler delegate, String format) {
     public HttpResponse handle(HttpRequest request) {
 
         // gather format parameters from request
-        String source = request.getSource().toString();
+        String source = request.getSource().getHostAddress();
         String xffSource = source;
         HttpHeader xffHeader = request.getHeader("X-Forwarded-For");
         if (xffHeader != null && !xffHeader.getValues().isEmpty()) {

common/src/main/java/de/bluecolored/bluemap/common/web/LoggingRequestHandler.java

@@ -25,8 +25,8 @@ sorting: ${sorting}
 
 # The position on the world where the map will be centered if you open it.
 # You can change this at any time.
-# This defaults to the world-spawn if you don't set it.
-#start-pos: {x:500, z:-820}
+# Default is { x: 0, z: 0 }
+start-pos: { x: 0, z: 0 }
 
 # The color of the sky as a hex-color
 # You can change this at any time.
@@ -151,9 +151,9 @@ storage: "file"
 # If this is set to true BlueMap will render Chunks even if there is no light-data!
 # This can be useful for example if some mod prevents light-data from being saved correctly.
 # However, this also has a few drawbacks:
-# - For those chunks, every block will always be fully lit
+# - Cave rendering will always be enabled (BlueMap is using the sky-light data to detect "caves")
+# - Everything will be rendered fully lit (sky-light value of 15, looks similar to having night vision)
 # - Night-mode might not work correctly
-# - Caves will always be rendered (ignoring the 'renderCaves' setting)
 # Default is false
 ignore-missing-light-data: false
 

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

@@ -32,7 +32,7 @@ public interface MapSettings extends RenderSettings {
 
     int getSorting();
 
-    @Nullable Vector2i getStartPos();
+    Vector2i getStartPos();
 
     String getSkyColor();
 

common/webapp/package-lock.json

@@ -33,7 +33,6 @@
 import de.bluecolored.bluemap.core.util.math.Color;
 
 import java.lang.reflect.Type;
-import java.util.Optional;
 
 public class MapSettingsSerializer implements JsonSerializer<BmMap> {
 
@@ -67,9 +66,7 @@ public JsonElement serialize(BmMap map, Type typeOfSrc, JsonSerializationContext
         root.add("lowres", lowres);
 
         // startPos
-        Vector2i startPos = Optional.ofNullable(map.getMapSettings().getStartPos())
-                .orElse(map.getWorld().getSpawnPoint().toVector2(true));
-        root.add("startPos", context.serialize(startPos));
+        root.add("startPos", context.serialize(map.getMapSettings().getStartPos()));
 
         // skyColor
         Color skyColor = new Color().parse(map.getMapSettings().getSkyColor());