Merge branch 'mc/1.13' into mc/1.12

BlueMap-Minecraft · Mar 14, 2020 · 772397f · 772397f
2 parents 962d733 + d21f6ba
commit 772397f
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 4 deletions.
diff --git a/BlueMapBukkit/src/main/resources/bluemap-bukkit.conf b/BlueMapBukkit/src/main/resources/bluemap-bukkit.conf
@@ -136,6 +136,9 @@ maps: [
 		name: "End"
 		world: "world_the_end"
 
+		# We dont want a blue sky in the end
+		skyColor: "#080010"
+
 		# In the end is no sky-light, so we need to enable this or we won't see anything.
 		renderCaves: true
 
@@ -149,6 +152,8 @@ maps: [
 		name: "Nether"
 		world: "world_nether"
 
+		skyColor: "#290000"
+
 		renderCaves: true
 		ambientLight: 0.6
 

diff --git a/BlueMapBukkit/src/main/resources/plugin.yml b/BlueMapBukkit/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: BlueMap
 description: "A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL)"
 main: de.bluecolored.bluemap.bukkit.BukkitPlugin
-version: "0.4.0-mc1.12"
+version: "0.5.0-mc1.12"
 author: "Blue (TBlueF / Lukas Rieger)"
 authors: [Blue (TBlueF / Lukas Rieger)]
 website: "https://github.com/BlueMap-Minecraft"

diff --git a/BlueMapCLI/src/main/resources/bluemap-cli.conf b/BlueMapCLI/src/main/resources/bluemap-cli.conf
@@ -135,6 +135,9 @@ maps: [
 		name: "End"
 		world: "world/DIM1"
 
+		# We dont want a blue sky in the end
+		skyColor: "#080010"
+
 		# In the end is no sky-light, so we need to enable this or we won't see anything.
 		renderCaves: true
 
@@ -148,6 +151,8 @@ maps: [
 		name: "Nether"
 		world: "world/DIM-1"
 
+		skyColor: "#290000"
+
 		renderCaves: true
 		ambientLight: 0.6
 

diff --git a/BlueMapCommon/src/main/resources/mcmod.info b/BlueMapCommon/src/main/resources/mcmod.info
@@ -2,7 +2,7 @@
     {
         "modid": "bluemap",
         "name": "BlueMap",
-        "version": "0.4.0-mc1.12",
+        "version": "0.5.0-mc1.12",
         "description": "A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL)",
         "url": "https://github.com/BlueMap-Minecraft",
         "authorList": [

diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/BlueMap.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/BlueMap.java
@@ -2,6 +2,6 @@
 
 public class BlueMap {
 
-	public static final String VERSION = "0.4.0-mc1.12";
+	public static final String VERSION = "0.5.0-mc1.12";
 
 }
diff --git a/BlueMapCore/src/main/webroot/js/libs/BlueMap.js b/BlueMapCore/src/main/webroot/js/libs/BlueMap.js
@@ -110,6 +110,8 @@ export default class BlueMap {
 	}
 
 	changeMap(map) {
+		if (this.debugInfo) console.debug("changing map: ", map);
+
 		if (this.map === map) return;
 
 		if (this.hiresTileManager !== undefined) this.hiresTileManager.close();
@@ -163,7 +165,7 @@ export default class BlueMap {
 	loadLocationHash() {
 		let hashVars = window.location.hash.substring(1).split(':');
 		if (hashVars.length >= 1){
-			if (this.settings[hashVars[0]] !== undefined && this.map !== hashVars[0]){
+			if (this.settings.maps[hashVars[0]] !== undefined && this.map !== hashVars[0]){
 				this.changeMap(hashVars[0]);
 			}
 		}

diff --git a/BlueMapSponge/src/main/resources/bluemap-sponge.conf b/BlueMapSponge/src/main/resources/bluemap-sponge.conf
@@ -131,6 +131,9 @@ maps: [
 		name: "End"
 		world: "world/DIM1"
 
+		# We dont want a blue sky in the end
+		skyColor: "#080010"
+
 		# In the end is no sky-light, so we need to enable this or we won't see anything.
 		renderCaves: true
 
@@ -144,6 +147,8 @@ maps: [
 		name: "Nether"
 		world: "world/DIM-1"
 
+		skyColor: "#290000"
+
 		renderCaves: true
 		ambientLight: 0.6