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

first part of what cat wants

Browse Source
This commit is contained in:
DeltaNedas
2020-02-02 02:49:47 +00:00
parent 51bc5c3b74
commit 4c45716149
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,7 +317,7 @@ public class Mods implements Loadable{
return result;
}
private LoadedMod locateMod(String name){
public LoadedMod locateMod(String name){
return mods.find(mod -> mod.enabled() && mod.name.equals(name));
}

22
core/src/mindustry/mod/Scripts.java
View File

@@ -9,6 +9,7 @@ import arc.util.Log.*;
import java.io.*;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.regex.*;
import mindustry.*;
import mindustry.mod.Mods.*;
import org.mozilla.javascript.*;
@@ -106,6 +107,7 @@ public class Scripts implements Disposable{
}
private class ScriptModuleProvider extends UrlModuleSourceProvider{
private Pattern directory = Pattern.compile("^(.+?)/(.+)");
public ScriptModuleProvider(){
super(null, null);
}
@@ -113,11 +115,27 @@ public class Scripts implements Disposable{
@Override
public ModuleSource loadSource(String moduleId, Scriptable paths, Object validator) throws IOException, URISyntaxException{
if(loadedMod == null) return null;
Fi module = loadedMod.root.child("scripts").child(moduleId + ".js");
return loadSource(loadedMod, moduleId, loadedMod.root.child("scripts"), validator);
}
private ModuleSource loadSource(LoadedMod mod, String moduleId, Fi root, Object validator) throws IOException, URISyntaxException{
Matcher matched = directory.matcher(moduleId);
if(matched.find()){
LoadedMod required = Vars.mods.locateMod(matched.group(1));
String script = matched.group(2);
if(required == null || root == required.root.child("scripts")){ // Mod not found, or already using a mod
Fi dir = root.child(matched.group(1));
if(dir == null) return null; // Mod and folder not found
return loadSource(mod, script, dir, validator);
}
return loadSource(required, script, required.root.child("scripts"), validator);
}
Fi module = root.child(moduleId + ".js");
if(!module.exists() || module.isDirectory()) return null;
return new ModuleSource(
new InputStreamReader(new ByteArrayInputStream((fillWrapper(module)).getBytes())),
null, new URI(moduleId), module.parent().file().toURI(), validator);
null, new URI(moduleId), root.file().toURI(), validator);
}
}
}