Upstream
/
BlueMap
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'mc/1.13'

This commit is contained in:
Blue (Lukas Rieger) 2020-03-14 18:22:57 +01:00
parent 1455a5ae01 d21f6baf68
commit eb6fe1164f
7 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BlueMapBukkit/src/main/resources/bluemap-bukkit.conf
View File

@ -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

2
BlueMapBukkit/src/main/resources/plugin.yml
View File

@ -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
version: 0.5.0
author: "Blue (TBlueF / Lukas Rieger)"
authors: [Blue (TBlueF / Lukas Rieger)]
website: "https://github.com/BlueMap-Minecraft"

5
BlueMapCLI/src/main/resources/bluemap-cli.conf
View File

@ -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

2
BlueMapCommon/src/main/resources/mcmod.info
View File

@ -2,7 +2,7 @@
{
"modid": "bluemap",
"name": "BlueMap",
"version": "0.4.0",
"version": "0.5.0",
"description": "A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL)",
"url": "https://github.com/BlueMap-Minecraft",
"authorList": [

2
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/BlueMap.java
View File

@ -2,6 +2,6 @@ package de.bluecolored.bluemap.core;
public class BlueMap {
public static final String VERSION = "0.4.0";
public static final String VERSION = "0.5.0";
}

4
BlueMapCore/src/main/webroot/js/libs/BlueMap.js
View File

@ -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]);
}
}

5
BlueMapSponge/src/main/resources/bluemap-sponge.conf
View File

@ -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