Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-11-28 05:26:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mc/1.12

Browse Source
This commit is contained in:
Blue (Lukas Rieger) 2020-01-10 18:30:06 +01:00
commit 1a806757e9
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BlueMapCLI/src/main/java/de/bluecolored/bluemap/cli/BlueMapCLI.java
View File

@ -109,7 +109,7 @@ public void renderMaps() throws IOException {
} }
HiresModelManager hiresModelManager = new HiresModelManager( HiresModelManager hiresModelManager = new HiresModelManager(
config.getWebDataPath().resolve("hires").resolve(mapConfig.getId()), config.getWebDataPath().resolve(mapConfig.getId()).resolve("hires"),
resourcePack, resourcePack,
mapConfig, mapConfig,
new Vector2i(mapConfig.getHiresTileSize(), mapConfig.getHiresTileSize()), new Vector2i(mapConfig.getHiresTileSize(), mapConfig.getHiresTileSize()),
@ -117,7 +117,7 @@ public void renderMaps() throws IOException {
); );
LowresModelManager lowresModelManager = new LowresModelManager( 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.getLowresPointsPerLowresTile(), mapConfig.getLowresPointsPerLowresTile()),
new Vector2i(mapConfig.getLowresPointsPerHiresTile(), mapConfig.getLowresPointsPerHiresTile()) new Vector2i(mapConfig.getLowresPointsPerHiresTile(), mapConfig.getLowresPointsPerHiresTile())
); );

5
BlueMapCore/src/main/webroot/js/libs/bluemap.js
View File

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

4
BlueMapSponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java
View File

@ -217,7 +217,7 @@ public synchronized void load() throws ExecutionException, IOException, Interrup
} }
HiresModelManager hiresModelManager = new HiresModelManager( HiresModelManager hiresModelManager = new HiresModelManager(
config.getWebDataPath().resolve("hires").resolve(id), config.getWebDataPath().resolve(id).resolve("hires"),
resourcePack, resourcePack,
mapConfig, mapConfig,
new Vector2i(mapConfig.getHiresTileSize(), mapConfig.getHiresTileSize()), new Vector2i(mapConfig.getHiresTileSize(), mapConfig.getHiresTileSize()),
@ -225,7 +225,7 @@ public synchronized void load() throws ExecutionException, IOException, Interrup
); );
LowresModelManager lowresModelManager = new LowresModelManager( 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.getLowresPointsPerLowresTile(), mapConfig.getLowresPointsPerLowresTile()),
new Vector2i(mapConfig.getLowresPointsPerHiresTile(), mapConfig.getLowresPointsPerHiresTile()) new Vector2i(mapConfig.getLowresPointsPerHiresTile(), mapConfig.getLowresPointsPerHiresTile())
); );