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

hmmm

Browse Source
This commit is contained in:
Anuken
2019-12-03 01:01:18 -05:00
parent 9cb55b9745
commit 5788c27aaa
5 changed files with 31 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
View File

@@ -19,10 +19,9 @@ import io.anuke.arc.util.io.*;
import io.anuke.arc.util.serialization.*;
import io.anuke.mindustry.*;
import io.anuke.mindustry.core.GameState.*;
import io.anuke.mindustry.core.Version;
import io.anuke.mindustry.core.*;
import io.anuke.mindustry.desktop.steam.*;
import io.anuke.mindustry.game.EventType.*;
import io.anuke.mindustry.mod.*;
import io.anuke.mindustry.mod.Mods.*;
import io.anuke.mindustry.net.*;
import io.anuke.mindustry.net.Net.*;
@@ -265,11 +264,6 @@ public class DesktopLauncher extends ClientLauncher{
});
}
@Override
public Scripts createScripts(){
return new GraalScripts();
}
@Override
public Array<FileHandle> getWorkshopContent(Class<? extends Publishable> type){
return !steam ? super.getWorkshopContent(type) : SVars.workshop.getWorkshopFiles(type);

54
desktop/src/io/anuke/mindustry/desktop/GraalScripts.java
View File

@@ -1,54 +0,0 @@
package io.anuke.mindustry.desktop;
import io.anuke.arc.*;
import io.anuke.arc.files.*;
import io.anuke.arc.util.*;
import io.anuke.mindustry.mod.*;
import io.anuke.mindustry.mod.Mods.*;
import org.graalvm.polyglot.*;
import java.io.*;
public class GraalScripts extends Scripts{
private static final Class[] denied = {FileHandle.class, InputStream.class, File.class, Scripts.class, Files.class, ClassAccess.class};
private final Context context;
private final String wrapper;
private final Context.Builder builder;
private Context console;
public GraalScripts(){
Time.mark();
builder = Context.newBuilder("js").allowHostClassLookup(ClassAccess.allowedClassNames::contains);
HostAccess.Builder hb = HostAccess.newBuilder();
hb.allowPublicAccess(true);
for(Class c : denied){
hb.denyAccess(c);
}
builder.allowHostAccess(hb.build());
builder.allowExperimentalOptions(true);
context = builder.build();
wrapper = Core.files.internal("scripts/wrapper.js").readString();
run(Core.files.internal("scripts/global.js").readString());
Log.info("Time to load script engine: {0}", Time.elapsed());
}
@Override
public void run(LoadedMod mod, FileHandle file){
run(wrapper.replace("$SCRIPT_NAME$", mod.name + "_" +file.nameWithoutExtension().replace("-", "_").replace(" ", "_")).replace("$CODE$", file.readString()));
}
@Override
public String runConsole(String text){
if(console == null){
console = builder.build();
}
return console.eval("js", text).toString();
}
private void run(String script){
context.eval("js", script);
}
}