Merge branch 'mc/1.13' into mc/1.12

Author: TBlueF

BlueMapBukkit/src/main/resources/bluemap-bukkit-defaults.conf

@@ -3,6 +3,7 @@ metrics: true
 renderThreadCount: -2
 data: "bluemap"
 webroot: "bluemap/web"
+useCookies: true
 webserver {
 	enabled: true
 	port: 8100

BlueMapBukkit/src/main/resources/bluemap-bukkit.conf

@@ -37,6 +37,9 @@ webroot: "bluemap/web"
 # Default is "<webroot>/data"
 #webdata: "path/to/data/folder"
 
+# If the web-application should use cookies to save the configurations of a user.
+useCookies: true
+
 webserver {
 	# With this setting you can disable the integrated web-server.
 	# This is usefull if you want to only render the map-data for later use, or if you setup your own webserver.
@@ -65,40 +68,43 @@ maps: [
 	{
 		# The id of this map
 		# Should only contain word-charactes: [a-zA-Z0-9_]
+		# Changing this value breaks your existing renders.
 		id: "world"
 
 		# The name of this map
-		# This defines the display name of this map, you can change this at any time
+		# This defines the display name of this map, you can change this at any time.
 		# Default is the id of this map
 		name: "World"
 
-		# The path to the save-folder of the world to render
+		# The path to the save-folder of the world to render.
 		world: "world"
 
 		# 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.
 		#startPos: [500, -820]
+		
+		# The color of thy sky as a hex-color
+		# You can change this at any time.
+		# Default is "#7dabff"
+		skyColor: "#7dabff"
+
+		# Defines the ambient light-strength that every block is recieving, regardless of the sunlight/blocklight.
+		# 0 is no ambient light, 1 is fully lighted.
+		# You can change this at any time.
+		# Default is 0
+		ambientLight: 0
 
 		# If this is false, BlueMap tries to omit all blocks that are not visible from above-ground.
 		# More specific: Block-Faces that have a sunlight/skylight value of 0 are removed.
 		# This improves the performance of the map on slower devices by a lot, but might cause some blocks to disappear that should normally be visible.
+		# Changing this value requires a re-render of the map.
 		# Default is false
 		renderCaves: false
 
-		# AmbientOcclusion adds soft shadows into corners, which gives the map a much better look.
-		# This has only a small impact on render-time and has no impact on the web-performance of the map.
-		# The value defines the strength of the shading, a value of 0 disables ambientOcclusion.
-		# Default is 0.25
-		ambientOcclusion: 0.25
-
-		# Lighting uses the light-data in minecraft to shade each block-face.
-		# If this is enabled, caves and inside buildings without torches will be darker.
-		# The value defines the strength of the shading and a value of 0 disables lighting (every block will be fully lit).
-		# Default is 0.8
-		lighting: 0.8
-		
 		# With the below values you can limit the map-render.
 		# This can be used to ignore the nethers ceiling or render only a certain part of a world.
+		# Changing this values might require a re-render of the map, already rendered tiles outside the limits will not be deleted.
 		# Default is no min or max value (= infinite bounds)
 		#minX: -4000
 		#maxX: 4000
@@ -110,67 +116,41 @@ maps: [
 		# 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.
-		# Default is enabled
+		# Changing this value requires a re-render of the map.
+		# Default is true
 		renderEdges: true
 
 		# With this set to true, the generated files for this world are compressed using gzip to save A LOT of space.
 		# Files will be only 5% as big with compression!
 		# Note: If you are using NGINX or Apache to host your map, you can configure them to serve the compressed files directly.
 		# This is much better than disabling the compression.
+		# Changing this value requires a re-render of the map.
+		# Default is true
 		useCompression: true
-		
-		# HIRES is the high-resolution render of the map. Where you see every block.
-		hires {
-			# Defines the size of one map-tile in blocks.
-			# If you change this value, the lowres values might need adjustment as well!
-			# Default is 32
-			tileSize: 32
-			
-			# The View-Distance for hires tiles on the web-map (the value is the radius in tiles)
-			# Default is 4.5
-			viewDistance: 4.5
-		}
-		
-		# LOWRES is the low-resolution render of the map. Thats the model that you see if you zoom far out to get an overview.
-		lowres {
-			# Defines resolution of the lowres model. E.g. If the hires.tileSize is 32, a value of 4 means that every 8*8 blocks will be summarized by one point on the lowres map.
-			# Calculation: 32 / 4 = 8
-			# You can only use values that result in an integer if you use the above calculation!
-			# Default is 4
-			pointsPerHiresTile: 4
-			
-			# Defines the size of one lowres-map-tile in points.
-			# Default is 50
-			pointsPerLowresTile: 50
-			
-			# The View-Distance for lowres tiles on the web-map (the value is the radius in tiles)
-			# Default is 7
-			viewDistance: 7
-		}
 	}
 
 	# Here another example for the End-Map
 	# Things we don't want to change from default we can just omit
 	{
 		id: "end"
 		name: "End"
-		world: "world/DIM1"
+		world: "world_the_end"
 
 		# In the end is no sky-light, so we need to enable this or we won't see anything.
 		renderCaves: true
 
-		# Same here, we don't want a dark map. But not completely disabled, so we see the effect of e.g torches.
-		lighting: 0.4
+		# Same here, we don't want a dark map. But not completely lighted, so we see the effect of e.g torches.
+		ambientLight: 0.6
 	}
 
 	# Here another example for the Nether-Map
 	{
 		id: "nether"
 		name: "Nether"
-		world: "world/DIM-1"
+		world: "world_nether"
 
 		renderCaves: true
-		lighting: 0.6
+		ambientLight: 0.6
 
 		# We slice the whole world at y:90 so every block above 90 will be air.
 		# This way we don't render the nethers ceiling.

BlueMapCLI/src/main/java/de/bluecolored/bluemap/cli/BlueMapCLI.java

@@ -40,8 +40,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.TimeUnit;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
@@ -122,8 +120,7 @@ public void renderMaps() throws IOException {
 					config.getWebDataPath().resolve(mapConfig.getId()).resolve("hires"),
 					resourcePack,
 					mapConfig,
-					new Vector2i(mapConfig.getHiresTileSize(), mapConfig.getHiresTileSize()),
-					ForkJoinPool.commonPool()
+					new Vector2i(mapConfig.getHiresTileSize(), mapConfig.getHiresTileSize())
 					);
 
 			LowresModelManager lowresModelManager = new LowresModelManager(
@@ -141,9 +138,10 @@ public void renderMaps() throws IOException {
 
 		Logger.global.logInfo("Writing settings.json ...");
 		WebSettings webSettings = new WebSettings(config.getWebDataPath().resolve("settings.json").toFile());
-		webSettings.setAllEnabled(false);
+		webSettings.set(config.isUseCookies(), "useCookies");
+		webSettings.setAllMapsEnabled(false);
 		for (MapType map : maps.values()) {
-			webSettings.setEnabled(true, map.getId());
+			webSettings.setMapEnabled(true, map.getId());
 			webSettings.setFrom(map.getTileRenderer(), map.getId());
 			webSettings.setFrom(map.getWorld(), map.getId());
 		}
@@ -180,7 +178,7 @@ public void renderMaps() throws IOException {
 
 				Collection<Vector2i> chunks;
 				if (!forceRender) {
-					long lastRender = webSettings.getLong(map.getId(), "last-render");
+					long lastRender = webSettings.getLong("maps", map.getId(), "last-render");
 					chunks = map.getWorld().getChunkList(lastRender);
 				} else {
 					chunks = map.getWorld().getChunkList();
@@ -223,6 +221,8 @@ public void renderMaps() throws IOException {
 
 			if (lastLogUpdate < now - 10000) { // print update all 10 seconds
 				RenderTask currentTask = renderManager.getCurrentRenderTask();
+				if (currentTask == null) continue;
+				
 				lastLogUpdate = now;
 				long time = currentTask.getActiveTime();
 
@@ -242,6 +242,7 @@ public void renderMaps() throws IOException {
 
 			if (lastSave < now - 1 * 60000) { // save every minute
 				RenderTask currentTask = renderManager.getCurrentRenderTask();
+				if (currentTask == null) continue;
 
 				lastSave = now;
 				currentTask.getMapType().getTileRenderer().save();
@@ -263,19 +264,14 @@ public void renderMaps() throws IOException {
 		rmstate.delete();
 
 		for (MapType map : maps.values()) {
-			webSettings.set(startTime, map.getId(), "last-render");
+			webSettings.set(startTime, "maps", map.getId(), "last-render");
 		}
 
 		try {
 			webSettings.save();
 		} catch (IOException e) {
 			Logger.global.logError("Failed to update web-settings!", e);
 		}
-		
-		Logger.global.logInfo("Waiting for all threads to quit ...");
-		if (!ForkJoinPool.commonPool().awaitQuiescence(30, TimeUnit.SECONDS)) {
-			Logger.global.logWarning("Some save-threads are taking very long to exit (>30s), they will be ignored.");
-		}
 
 		Logger.global.logInfo("Render finished!");
 	}

BlueMapCLI/src/main/resources/bluemap-cli-defaults.conf

@@ -2,7 +2,8 @@ accept-download: false
 metrics: true
 renderThreadCount: 0
 data: "."
-webroot: "web"
+webroot: "web"	
+useCookies: true
 webserver {
 	enabled: false
 	port: 8100

BlueMapCLI/src/main/resources/bluemap-cli.conf

@@ -37,6 +37,9 @@ webroot: "web"
 # Default is "<webroot>/data"
 #webdata: "path/to/data/folder"
 
+# If the web-application should use cookies to save the configurations of a user.
+useCookies: true
+
 webserver {
 	# With this setting you can enable the integrated web-server.
 	# Default is disabled
@@ -64,40 +67,43 @@ maps: [
 	{
 		# The id of this map
 		# Should only contain word-charactes: [a-zA-Z0-9_]
+		# Changing this value breaks your existing renders.
 		id: "world"
 
 		# The name of this map
-		# This defines the display name of this map, you can change this at any time
+		# This defines the display name of this map, you can change this at any time.
 		# Default is the id of this map
 		name: "World"
 
-		# The path to the save-folder of the world to render
+		# The path to the save-folder of the world to render.
 		world: "world"
 
 		# 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.
 		#startPos: [500, -820]
+		
+		# The color of thy sky as a hex-color
+		# You can change this at any time.
+		# Default is "#7dabff"
+		skyColor: "#7dabff"
+
+		# Defines the ambient light-strength that every block is recieving, regardless of the sunlight/blocklight.
+		# 0 is no ambient light, 1 is fully lighted.
+		# You can change this at any time.
+		# Default is 0
+		ambientLight: 0
 
 		# If this is false, BlueMap tries to omit all blocks that are not visible from above-ground.
 		# More specific: Block-Faces that have a sunlight/skylight value of 0 are removed.
 		# This improves the performance of the map on slower devices by a lot, but might cause some blocks to disappear that should normally be visible.
+		# Changing this value requires a re-render of the map.
 		# Default is false
 		renderCaves: false
 
-		# AmbientOcclusion adds soft shadows into corners, which gives the map a much better look.
-		# This has only a small impact on render-time and has no impact on the web-performance of the map.
-		# The value defines the strength of the shading, a value of 0 disables ambientOcclusion.
-		# Default is 0.25
-		ambientOcclusion: 0.25
-
-		# Lighting uses the light-data in minecraft to shade each block-face.
-		# If this is enabled, caves and inside buildings without torches will be darker.
-		# The value defines the strength of the shading and a value of 0 disables lighting (every block will be fully lit).
-		# Default is 0.8
-		lighting: 0.8
-		
 		# With the below values you can limit the map-render.
 		# This can be used to ignore the nethers ceiling or render only a certain part of a world.
+		# Changing this values might require a re-render of the map, already rendered tiles outside the limits will not be deleted.
 		# Default is no min or max value (= infinite bounds)
 		#minX: -4000
 		#maxX: 4000
@@ -109,43 +115,17 @@ maps: [
 		# 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.
-		# Default is enabled
+		# Changing this value requires a re-render of the map.
+		# Default is true
 		renderEdges: true
 
 		# With this set to true, the generated files for this world are compressed using gzip to save A LOT of space.
 		# Files will be only 5% as big with compression!
 		# Note: If you are using NGINX or Apache to host your map, you can configure them to serve the compressed files directly.
 		# This is much better than disabling the compression.
+		# Changing this value requires a re-render of the map.
+		# Default is true
 		useCompression: true
-		
-		# HIRES is the high-resolution render of the map. Where you see every block.
-		hires {
-			# Defines the size of one map-tile in blocks.
-			# If you change this value, the lowres values might need adjustment as well!
-			# Default is 32
-			tileSize: 32
-			
-			# The View-Distance for hires tiles on the web-map (the value is the radius in tiles)
-			# Default is 4.5
-			viewDistance: 4.5
-		}
-		
-		# LOWRES is the low-resolution render of the map. Thats the model that you see if you zoom far out to get an overview.
-		lowres {
-			# Defines resolution of the lowres model. E.g. If the hires.tileSize is 32, a value of 4 means that every 8*8 blocks will be summarized by one point on the lowres map.
-			# Calculation: 32 / 4 = 8
-			# You can only use values that result in an integer if you use the above calculation!
-			# Default is 4
-			pointsPerHiresTile: 4
-			
-			# Defines the size of one lowres-map-tile in points.
-			# Default is 50
-			pointsPerLowresTile: 50
-			
-			# The View-Distance for lowres tiles on the web-map (the value is the radius in tiles)
-			# Default is 7
-			viewDistance: 7
-		}
 	}
 
 	# Here another example for the End-Map
@@ -158,8 +138,8 @@ maps: [
 		# In the end is no sky-light, so we need to enable this or we won't see anything.
 		renderCaves: true
 
-		# Same here, we don't want a dark map. But not completely disabled, so we see the effect of e.g torches.
-		lighting: 0.4
+		# Same here, we don't want a dark map. But not completely lighted, so we see the effect of e.g torches.
+		ambientLight: 0.6
 	}
 
 	# Here another example for the Nether-Map
@@ -169,7 +149,7 @@ maps: [
 		world: "world/DIM-1"
 
 		renderCaves: true
-		lighting: 0.6
+		ambientLight: 0.6
 
 		# We slice the whole world at y:90 so every block above 90 will be air.
 		# This way we don't render the nethers ceiling.

BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/RenderManager.java

@@ -41,7 +41,6 @@ public synchronized void start() {
 
 		for (int i = 0; i < renderThreads.length; i++) {
 			renderThreads[i] = new Thread(this::renderThread);
-			renderThreads[i].setDaemon(true);
 			renderThreads[i].setPriority(Thread.MIN_PRIORITY);
 			renderThreads[i].start();
 		}