Merge branch 'master' into mc/1.12

Author: TBlueF

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

@@ -109,15 +109,15 @@ public void renderMaps() throws IOException {
 			}
 
 			HiresModelManager hiresModelManager = new HiresModelManager(
-					config.getWebDataPath().resolve("hires").resolve(mapConfig.getId()),
+					config.getWebDataPath().resolve(mapConfig.getId()).resolve("hires"),
 					resourcePack,
 					mapConfig,
 					new Vector2i(mapConfig.getHiresTileSize(), mapConfig.getHiresTileSize()),
 					ForkJoinPool.commonPool()
 					);
 
 			LowresModelManager lowresModelManager = new LowresModelManager(
-					config.getWebDataPath().resolve("lowres").resolve(mapConfig.getId()), 
+					config.getWebDataPath().resolve(mapConfig.getId()).resolve("lowres"), 
 					new Vector2i(mapConfig.getLowresPointsPerLowresTile(), mapConfig.getLowresPointsPerLowresTile()),
 					new Vector2i(mapConfig.getLowresPointsPerHiresTile(), mapConfig.getLowresPointsPerHiresTile())
 					);

BlueMapCore/src/main/webroot/js/libs/bluemap.js

@@ -391,7 +391,7 @@ BlueMap.prototype.loadLowresMaterial = function (callback) {
 BlueMap.prototype.loadHiresTile = function (tileX, tileZ, callback, onError) {
 	let scope = this;
 
-	let path = this.dataRoot + "hires/" + this.map + "/";
+	let path = this.dataRoot + this.map + "/hires/";
 	path += BlueMap.utils.pathFromCoords(tileX, tileZ);
 	path += ".json";
 
@@ -416,7 +416,7 @@ BlueMap.prototype.loadHiresTile = function (tileX, tileZ, callback, onError) {
 BlueMap.prototype.loadLowresTile = function (tileX, tileZ, callback, onError) {
 	let scope = this;
 
-	let path = this.dataRoot + "lowres/" + this.map + "/";
+	let path = this.dataRoot + this.map + "/lowres/";
 	path += BlueMap.utils.pathFromCoords(tileX, tileZ);
 	path += ".json";
 
@@ -979,6 +979,7 @@ BlueMap.Module.MapMenu = function (blueMap) {
 
 	for (mapId in maps) {
 		if (!maps.hasOwnProperty(mapId)) continue;
+		if (!maps.enabled) continue;
 
 		let map = maps[mapId];
 		$('<li map="' + mapId + '">' + map.name + '</li>').appendTo(this.maplist);

BlueMapSponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java

@@ -217,15 +217,15 @@ public synchronized void load() throws ExecutionException, IOException, Interrup
 			}
 
 			HiresModelManager hiresModelManager = new HiresModelManager(
-					config.getWebDataPath().resolve("hires").resolve(id),
+					config.getWebDataPath().resolve(id).resolve("hires"),
 					resourcePack,
 					mapConfig,
 					new Vector2i(mapConfig.getHiresTileSize(), mapConfig.getHiresTileSize()),
 					getAsyncExecutor()
 					);
 
 			LowresModelManager lowresModelManager = new LowresModelManager(
-					config.getWebDataPath().resolve("lowres").resolve(id), 
+					config.getWebDataPath().resolve(id).resolve("lowres"), 
 					new Vector2i(mapConfig.getLowresPointsPerLowresTile(), mapConfig.getLowresPointsPerLowresTile()),
 					new Vector2i(mapConfig.getLowresPointsPerHiresTile(), mapConfig.getLowresPointsPerHiresTile())
 					);