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

Java mod import support / Moved mod browser button

Browse Source
This commit is contained in:
Anuken
2021-02-05 11:21:27 -05:00
parent 9b3360d932
commit fc3352bcb1
6 changed files with 210 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -667,16 +667,22 @@ public class Mods implements Loadable{
Mod mainMod;
Fi mainFile = zip;
String[] path = (mainClass.replace('.', '/') + ".class").split("/");
for(String str : path){
if(!str.isEmpty()){
mainFile = mainFile.child(str);
if(android){
mainFile = mainFile.child("classes.dex");
}else{
String[] path = (mainClass.replace('.', '/') + ".class").split("/");
for(String str : path){
if(!str.isEmpty()){
mainFile = mainFile.child(str);
}
}
}
//make sure the main class exists before loading it; if it doesn't just don't put it there
if(mainFile.exists() && Core.settings.getBool("mod-" + baseName + "-enabled", true) && Version.isAtLeast(meta.minGameVersion) && meta.getMinMajor() >= 105){
//mobile versions don't support class mods
//if the mod is explicitly marked as java, try loading it anyway
if((mainFile.exists() || meta.java) &&
Core.settings.getBool("mod-" + baseName + "-enabled", true) && Version.isAtLeast(meta.minGameVersion) && meta.getMinMajor() >= 105){
if(ios){
throw new IllegalArgumentException("Java class mods are not supported on iOS.");
}
@@ -746,6 +752,11 @@ public class Mods implements Loadable{
this.name = meta.name.toLowerCase().replace(" ", "-");
}
/** @return whether this is a java class mod. */
public boolean isJava(){
return meta.java || main != null;
}
@Nullable
public String getRepo(){
return Core.settings.getString("mod-" + name + "-repo", meta.repo);
@@ -867,6 +878,8 @@ public class Mods implements Loadable{
public Seq<String> dependencies = Seq.with();
/** Hidden mods are only server-side or client-side, and do not support adding new content. */
public boolean hidden;
/** If true, this mod should be loaded as a Java class mod. This is technically optional, but highly recommended. */
public boolean java;
public String displayName(){
return displayName == null ? Strings.stripColors(name) : displayName;