mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-08 01:43:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert 3 commits

Browse Source
This commit is contained in:
Leo-MathGuy 2024-04-25 20:03:38 +05:00
parent d9cc2ef9a4
commit 0a7a3dc295
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/mindustry/mod/Mods.java
View File

@ -738,14 +738,18 @@ public class Mods implements Loadable{
Fi folder = contentRoot.child(lower + (lower.endsWith("s") ? "" : "s"));
if(folder.exists()){
for(Fi file : folder.findAll(f -> f.extension().equals("json") || f.extension().equals("hjson"))){
currentRun.put(file.nameWithoutExtension(), new LoadRun(type, file, mod));
if(contentOrder == null){
runs.add(new LoadRun(type, file, mod));
}else{
currentRun.put(file.nameWithoutExtension(), new LoadRun(type, file, mod));
}
}
}
}
}
Seq<String> left = currentRun.keys().toSeq();
if(contentOrder != null){
Seq<String> left = currentRun.keys().toSeq();
for (String contentName : contentOrder){
LoadRun run = currentRun.get(contentName);
if(run != null){
@ -755,10 +759,9 @@ public class Mods implements Loadable{
Log.warn("Cannot find content defined in contentOrder: @", contentName);
}
}
runs.addAll(left.map(name -> currentRun.get(name)));
}else{
runs.addAll(currentRun.values().toSeq());
}
runs.addAll(left.map(name -> currentRun.get(name)).sort());
}
for(LoadRun l : runs){