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

Cleanup

Browse Source
This commit is contained in:
Anuken
2022-01-10 23:49:58 -05:00
parent d09039f6e6
commit b597978a33
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,8 @@ import java.util.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class Mods implements Loadable{ public class Mods implements Loadable{
private static final String[] metaFiles = {"mod.json", "mod.hjson", "plugin.json", "plugin.hjson"};
private AsyncExecutor async = new AsyncExecutor(); private AsyncExecutor async = new AsyncExecutor();
private Json json = new Json(); private Json json = new Json();
private @Nullable Scripts scripts; private @Nullable Scripts scripts;
@@ -356,7 +358,7 @@ public class Mods implements Loadable{
/** Loads all mods from the folder, but does not call any methods on them.*/ /** Loads all mods from the folder, but does not call any methods on them.*/
public void load(){ public void load(){
var files = resolveDependencies(Seq.with(modDirectory.list()).filter(f -> var files = resolveDependencies(Seq.with(modDirectory.list()).filter(f ->
f.extension().equals("jar") || f.extension().equals("zip") || (f.isDirectory() && (f.child("mod.json").exists() || f.child("mod.hjson").exists())) f.extEquals("jar") || f.extEquals("zip") || (f.isDirectory() && (f.child("mod.json").exists() || f.child("mod.hjson").exists()))
)); ));
for(Fi file : files){ for(Fi file : files){
@@ -714,11 +716,12 @@ public class Mods implements Loadable{
/** Tries to find the config file of a mod/plugin. */ /** Tries to find the config file of a mod/plugin. */
@Nullable @Nullable
public ModMeta findMeta(Fi file){ public ModMeta findMeta(Fi file){
Fi metaFile = Fi metaFile = null;
file.child("mod.json").exists() ? file.child("mod.json") : for(String name : metaFiles){
file.child("mod.hjson").exists() ? file.child("mod.hjson") : if((metaFile = file.child(name)).exists()){
file.child("plugin.json").exists() ? file.child("plugin.json") : break;
file.child("plugin.hjson"); }
}
if(!metaFile.exists()){ if(!metaFile.exists()){
return null; return null;