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

Map listing improvements

Browse Source
This commit is contained in:
Anuken
2021-07-04 21:30:47 -04:00
parent 789e354400
commit 3d8d84177b
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server/src/mindustry/server/ServerControl.java
View File

@@ -345,16 +345,28 @@ public class ServerControl implements ApplicationListener{
} }
}); });
handler.register("maps", "[all]", "Display available maps. 'all' to include default maps.", arg -> { handler.register("maps", "[all/custom/default]", "Display available maps. Displays only custom maps by default.", arg -> {
boolean all = arg.length > 0 && arg[0].equalsIgnoreCase("all"); boolean custom = arg.length == 0 || arg[0].equals("custom") || arg[0].equals("all");
boolean def = arg.length > 0 && (arg[0].equals("default") || arg[0].equals("all"));
if(!maps.all().isEmpty()){ if(!maps.all().isEmpty()){
info("Maps:"); Seq<Map> all = new Seq<>();
for(Map map : all ? maps.all() : maps.customMaps()){
String mapName = Strings.stripColors(map.name()).replace(' ', '_'); if(custom) all.addAll(maps.customMaps());
if(map.custom){ if(def) all.addAll(maps.defaultMaps());
info(" @ (@): &fiCustom / @x@", mapName, map.file.name(), map.width, map.height);
}else{ if(all.isEmpty()){
info(" @: &fiDefault / @x@", mapName, map.width, map.height); info("No custom maps loaded. &fiTo display built-in maps, use the \"@\" argument.", "all");
}else{
info("Maps:");
for(Map map : all){
String mapName = Strings.stripColors(map.name()).replace(' ', '_');
if(map.custom){
info(" @ (@): &fiCustom / @x@", mapName, map.file.name(), map.width, map.height);
}else{
info(" @: &fiDefault / @x@", mapName, map.width, map.height);
}
} }
} }
}else{ }else{