Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Organized map files by planet

Browse Source
This commit is contained in:
Anuken
2026-01-14 20:18:45 -05:00
parent a0a06c450b
commit 475b8d4f15
112 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/src/mindustry/maps/generators/FileMapGenerator.java
View File

@@ -1,6 +1,7 @@
package mindustry.maps.generators;
import arc.math.geom.*;
import arc.struct.*;
import mindustry.*;
import mindustry.content.*;
import mindustry.game.*;
@@ -18,12 +19,33 @@ public class FileMapGenerator implements WorldGenerator{
public final SectorPreset preset;
public FileMapGenerator(String mapName, SectorPreset preset){
//try to look for the prefixed map first, then the mod-specific one
this.map = maps != null ? maps.loadInternalMap(
preset.minfo.mod == null || Vars.tree.get("maps/" + mapName + "." + mapExtension).exists() ?
mapName :
mapName.substring(1 + preset.minfo.mod.name.length())
) : null;
if(maps == null){
this.map = null;
}else{
Seq<String> candidates = new Seq<>(4);
//<planetname>/<mapname>.msav
candidates.add(preset.planet.name + "/" + mapName);
//<mapname>.msav (directly in maps folder)
candidates.add(mapName);
//for modded maps, try loading without the mod prefix
if(preset.minfo.mod != null){
String baseName = mapName.substring(1 + preset.minfo.mod.name.length());
//<planetname>/<mapname>.msav
candidates.add(preset.planet.name + "/" + baseName);
//<mapname>.msav (directly in maps folder)
candidates.add(baseName);
}
//find the first matching candidate to load
String fileName = candidates.find(name -> Vars.tree.get("maps/" + name + "." + mapExtension).exists());
this.map = maps.loadInternalMap(fileName == null ? candidates.first() : fileName);
}
this.preset = preset;
}