Skip to content

Commit 8f99241

Browse files
committed
Change render-data-folder structure to have only one folder per world
1 parent 1af2a8c commit 8f99241

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ BlueMap.prototype.loadLowresMaterial = function (callback) {
391391
BlueMap.prototype.loadHiresTile = function (tileX, tileZ, callback, onError) {
392392
let scope = this;
393393

394-
let path = this.dataRoot + "hires/" + this.map + "/";
394+
let path = this.dataRoot + this.map + "/hires/";
395395
path += BlueMap.utils.pathFromCoords(tileX, tileZ);
396396
path += ".json";
397397

@@ -416,7 +416,7 @@ BlueMap.prototype.loadHiresTile = function (tileX, tileZ, callback, onError) {
416416
BlueMap.prototype.loadLowresTile = function (tileX, tileZ, callback, onError) {
417417
let scope = this;
418418

419-
let path = this.dataRoot + "lowres/" + this.map + "/";
419+
let path = this.dataRoot + this.map + "/lowres/";
420420
path += BlueMap.utils.pathFromCoords(tileX, tileZ);
421421
path += ".json";
422422

@@ -979,6 +979,7 @@ BlueMap.Module.MapMenu = function (blueMap) {
979979

980980
for (mapId in maps) {
981981
if (!maps.hasOwnProperty(mapId)) continue;
982+
if (!maps.enabled) continue;
982983

983984
let map = maps[mapId];
984985
$('<li map="' + mapId + '">' + map.name + '</li>').appendTo(this.maplist);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,15 +217,15 @@ public synchronized void load() throws ExecutionException, IOException, Interrup
217217
}
218218

219219
HiresModelManager hiresModelManager = new HiresModelManager(
220-
config.getWebDataPath().resolve("hires").resolve(id),
220+
config.getWebDataPath().resolve(id).resolve("hires"),
221221
resourcePack,
222222
mapConfig,
223223
new Vector2i(mapConfig.getHiresTileSize(), mapConfig.getHiresTileSize()),
224224
getAsyncExecutor()
225225
);
226226

227227
LowresModelManager lowresModelManager = new LowresModelManager(
228-
config.getWebDataPath().resolve("lowres").resolve(id),
228+
config.getWebDataPath().resolve(id).resolve("lowres"),
229229
new Vector2i(mapConfig.getLowresPointsPerLowresTile(), mapConfig.getLowresPointsPerLowresTile()),
230230
new Vector2i(mapConfig.getLowresPointsPerHiresTile(), mapConfig.getLowresPointsPerHiresTile())
231231
);

0 commit comments

Comments
 (0)