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

it works sorta!

Browse Source
This commit is contained in:
DeltaNedas
2020-01-31 23:51:33 +00:00
committed by GitHub
parent 9da505119b
commit d872656bc5
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,8 +5,9 @@ import arc.files.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*; import arc.util.*;
import arc.util.Log.*; import arc.util.Log.*;
import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.util.Arrays; import java.net.URISyntaxException;
import mindustry.*; import mindustry.*;
import mindustry.mod.Mods.*; import mindustry.mod.Mods.*;
import org.mozilla.javascript.*; import org.mozilla.javascript.*;
@@ -22,6 +23,7 @@ public class Scripts implements Disposable{
private final String wrapper; private final String wrapper;
private Scriptable scope; private Scriptable scope;
private boolean errored; private boolean errored;
public static LoadedMod loadedMod = null;
public Scripts(){ public Scripts(){
Time.mark(); Time.mark();
@@ -31,6 +33,10 @@ public class Scripts implements Disposable{
context.getWrapFactory().setJavaPrimitiveWrap(false); context.getWrapFactory().setJavaPrimitiveWrap(false);
scope = new ImporterTopLevel(context); scope = new ImporterTopLevel(context);
new RequireBuilder()
.setModuleScriptProvider(new SoftCachingModuleScriptProvider(new ScriptModuleProvider()))
.setSandboxed(true).createRequire(context, scope).install(scope);
wrapper = Core.files.internal("scripts/wrapper.js").readString(); wrapper = Core.files.internal("scripts/wrapper.js").readString();
if(!run(Core.files.internal("scripts/global.js").readString(), "global.js")){ if(!run(Core.files.internal("scripts/global.js").readString(), "global.js")){
@@ -72,10 +78,7 @@ public class Scripts implements Disposable{
} }
public void run(LoadedMod mod, Fi file){ public void run(LoadedMod mod, Fi file){
new RequireBuilder() loadedMod = mod;
.setModuleScriptProvider(new SoftCachingModuleScriptProvider(
new UrlModuleSourceProvider(Arrays.asList(new URI[] {file.child("scripts").file().toURI()}), null)))
.setSandboxed(true).createRequire(context, scope).install(scope);
run(wrapper.replace("$SCRIPT_NAME$", mod.name + "/" + file.nameWithoutExtension()).replace("$CODE$", file.readString()).replace("$MOD_NAME$", mod.name), file.name()); run(wrapper.replace("$SCRIPT_NAME$", mod.name + "/" + file.nameWithoutExtension()).replace("$CODE$", file.readString()).replace("$MOD_NAME$", mod.name), file.name());
} }
@@ -93,4 +96,18 @@ public class Scripts implements Disposable{
public void dispose(){ public void dispose(){
Context.exit(); Context.exit();
} }
private class ScriptModuleProvider extends UrlModuleSourceProvider{
public ScriptModuleProvider(){
super(null, null);
}
@Override
public ModuleSource loadSource(String moduleId, Scriptable paths, Object validator) throws IOException, URISyntaxException{
if(loadedMod == null) return null;
Fi module = Scripts.loadedMod.root.child("scripts").child(moduleId + ".js");
if(!module.exists() || module.isDirectory()) return null;
return new ModuleSource(module.reader(), null, module.file().toURI(), null, validator);
}
}
} }