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

wrapper works now

Browse Source
This commit is contained in:
DeltaNedas
2020-02-01 01:18:18 +00:00
committed by GitHub
parent d872656bc5
commit e1a215ae0b
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,8 @@ 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.io.*;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import mindustry.*; import mindustry.*;
@@ -23,7 +24,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; private LoadedMod loadedMod = null;
public Scripts(){ public Scripts(){
Time.mark(); Time.mark();
@@ -79,7 +80,7 @@ public class Scripts implements Disposable{
public void run(LoadedMod mod, Fi file){ public void run(LoadedMod mod, Fi file){
loadedMod = mod; loadedMod = mod;
run(wrapper.replace("$SCRIPT_NAME$", mod.name + "/" + file.nameWithoutExtension()).replace("$CODE$", file.readString()).replace("$MOD_NAME$", mod.name), file.name()); run(fillWrapper(file), file.name());
} }
private boolean run(String script, String file){ private boolean run(String script, String file){
@@ -92,6 +93,12 @@ public class Scripts implements Disposable{
} }
} }
private String fillWrapper(Fi file){
return wrapper.replace("$SCRIPT_NAME$", loadedMod.name + "/" + file.nameWithoutExtension())
.replace("$CODE$", file.readString())
.replace("$MOD_NAME$", loadedMod.name);
}
@Override @Override
public void dispose(){ public void dispose(){
Context.exit(); Context.exit();
@@ -105,9 +112,11 @@ public class Scripts implements Disposable{
@Override @Override
public ModuleSource loadSource(String moduleId, Scriptable paths, Object validator) throws IOException, URISyntaxException{ public ModuleSource loadSource(String moduleId, Scriptable paths, Object validator) throws IOException, URISyntaxException{
if(loadedMod == null) return null; if(loadedMod == null) return null;
Fi module = Scripts.loadedMod.root.child("scripts").child(moduleId + ".js"); Fi module = loadedMod.root.child("scripts").child(moduleId + ".js");
if(!module.exists() || module.isDirectory()) return null; if(!module.exists() || module.isDirectory()) return null;
return new ModuleSource(module.reader(), null, module.file().toURI(), null, validator); return new ModuleSource(
new InputStreamReader(new ByteArrayInputStream((fillWrapper(module)).getBytes())),
null, module.file().toURI(), null, validator);
} }
} }
} }