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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-01-04 12:10:21 -05:00
parent 197769a9fe 439605f6e8
commit ea66d9a92f
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -512,15 +512,13 @@ public class Mods implements Loadable{
for(ContentType type : ContentType.all){ for(ContentType type : ContentType.all){
Fi folder = contentRoot.child(type.name().toLowerCase() + "s"); Fi folder = contentRoot.child(type.name().toLowerCase() + "s");
if(folder.exists()){ if(folder.exists()){
for(Fi file : folder.list()){ for(Fi file : folder.findAll(f -> f.extension().equals("json") || f.extension().equals("hjson"))){
if(file.extension().equals("json") || file.extension().equals("hjson")){
runs.add(new LoadRun(type, file, mod)); runs.add(new LoadRun(type, file, mod));
} }
} }
} }
} }
} }
}
//make sure mod content is in proper order //make sure mod content is in proper order
runs.sort(); runs.sort();