mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-21 05:07:41 +07:00
Code Issues Packages Projects Releases Wiki Activity

Security / Android compat / Functional extension

Browse Source
This commit is contained in:
Anuken
2019-12-06 21:57:47 -05:00
parent c85847567d
commit 2b49c300f8
15 changed files with 106 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/build.gradle
View File

@ -28,6 +28,7 @@ dependencies{
implementation project(":core")
implementation arcModule("backends:backend-android")
implementation 'com.faendir.rhino:rhino-android:1.5.2'
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"

8
android/src/io/anuke/mindustry/AndroidLauncher.java
View File

@ -9,10 +9,11 @@ import android.os.Build.*;
import android.os.*;
import android.provider.Settings.*;
import android.telephony.*;
import com.faendir.rhino_android.*;
import io.anuke.arc.*;
import io.anuke.arc.backends.android.surfaceview.*;
import io.anuke.arc.files.*;
import io.anuke.arc.func.Cons;
import io.anuke.arc.func.*;
import io.anuke.arc.scene.ui.layout.*;
import io.anuke.arc.util.*;
import io.anuke.arc.util.serialization.*;
@ -65,6 +66,11 @@ public class AndroidLauncher extends AndroidApplication{
}
}
@Override
public org.mozilla.javascript.Context getScriptContext(){
return new RhinoAndroidHelper(Core.files.local("script-output").file()).enterContext();
}
@Override
public void shareFile(FileHandle file){
}

1
build.gradle
View File

@ -254,6 +254,7 @@ project(":core"){
compileJava.dependsOn(preGen)
compile "org.lz4:lz4-java:1.4.1"
compile "org.javadelight:delight-rhino-sandbox:0.0.10"
compile arcModule("arc-core")
compile arcModule("extensions:freetype")
compile arcModule("extensions:arcnet")

1
core/assets/bundles/bundle.properties
View File

@ -26,6 +26,7 @@ load.image = Images
load.content = Content
load.system = System
load.mod = Mods
load.scripts = Scripts
schematic = Schematic
schematic.add = Save Schematic...

4
core/assets/scripts/base.js
View File

@ -2,6 +2,6 @@ const print = function(obj){
java.lang.System.out.println(obj ? String(obj) : "null")
}
const extend = function(classType, params){
return new JavaAdapter(classType, params)
const extend = function(classType, name, params){
return new JavaAdapter(classType, params, name)
}

11
core/assets/scripts/global.js
View File

@ -4,9 +4,10 @@ const print = function(obj){
java.lang.System.out.println(obj ? String(obj) : "null")
}
const extend = function(classType, params){
return new JavaAdapter(classType, params)
const extend = function(classType, name, params){
return new JavaAdapter(classType, params, name)
}
const Core = Packages.io.anuke.arc.Core
const Boolc = Packages.io.anuke.arc.func.Boolc
const Boolf = Packages.io.anuke.arc.func.Boolf
@ -387,7 +388,5 @@ const LiquidModule = Packages.io.anuke.mindustry.world.modules.LiquidModule
const PowerModule = Packages.io.anuke.mindustry.world.modules.PowerModule
const Produce = Packages.io.anuke.mindustry.world.producers.Produce
const ProduceItem = Packages.io.anuke.mindustry.world.producers.ProduceItem
var r = new JavaAdapter(Block, {});
print(r.update)
const PrintStream = Packages.java.io.PrintStream
const System = Packages.java.lang.System

9
core/assets/scripts/wrapper.js
View File

@ -1,9 +1,2 @@
this["$SCRIPT_NAME$"] = function(){
$CODE$
};
try{
this["$SCRIPT_NAME$"]();
}catch(e){
print(e)
}
$CODE$

8
core/src/io/anuke/mindustry/ClientLauncher.java
View File

@ -69,6 +69,11 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
Musics.load();
Sounds.load();
assets.loadRun("scriptinit", Scripts.class, () -> {}, () -> {
content.createContent(false);
mods.loadScripts();
});
assets.loadRun("contentcreate", Content.class, () -> {
content.createContent();
content.loadColors();
@ -193,7 +198,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
if(assets.getCurrentLoading() != null){
String name = assets.getCurrentLoading().fileName.toLowerCase();
String key = name.contains("content") ? "content" : name.contains("mod") ? "mods" : name.contains("msav") || name.contains("maps") ? "map" : name.contains("ogg") || name.contains("mp3") ? "sound" : name.contains("png") ? "image" : "system";
String key = name.contains("script") ? "scripts" : name.contains("content") ? "content" : name.contains("mod") ? "mods" : name.contains("msav") ||
name.contains("maps") ? "map" : name.contains("ogg") || name.contains("mp3") ? "sound" : name.contains("png") ? "image" : "system";
font.draw(bundle.get("load." + key, ""), graphics.getWidth() / 2f, graphics.getHeight() / 2f - height / 2f - Scl.scl(10f), Align.center);
}
}

10
core/src/io/anuke/mindustry/core/ContentLoader.java
View File

@ -53,15 +53,24 @@ public class ContentLoader{
/** Creates all content types. */
public void createContent(){
createContent(true);
}
/** Creates all content types. */
public void createContent(boolean load){
if(loaded){
Log.info("Content already loaded, skipping.");
return;
}
if(contentMap[0] == null){
for(ContentType type : ContentType.values()){
contentMap[type.ordinal()] = new Array<>();
contentNameMap[type.ordinal()] = new ObjectMap<>();
}
}
if(load){
for(ContentList list : content){
list.load();
@ -83,6 +92,7 @@ public class ContentLoader{
loaded = true;
}
}
/** Logs content statistics.*/
public void logContent(){

5
core/src/io/anuke/mindustry/core/Platform.java
View File

@ -13,6 +13,7 @@ import io.anuke.mindustry.net.*;
import io.anuke.mindustry.net.Net.*;
import io.anuke.mindustry.type.*;
import io.anuke.mindustry.ui.dialogs.*;
import org.mozilla.javascript.*;
import static io.anuke.mindustry.Vars.mobile;
@ -51,6 +52,10 @@ public interface Platform{
return new Scripts();
}
default Context getScriptContext(){
return Context.enter();
}
/** Add a text input dialog that should show up after the field is tapped. */
default void addDialog(TextField field){
addDialog(field, 16);

2
core/src/io/anuke/mindustry/mod/ClassAccess.java
View File

File diff suppressed because one or more lines are too long

17
core/src/io/anuke/mindustry/mod/Mods.java
View File

@ -30,7 +30,7 @@ import static io.anuke.mindustry.Vars.*;
public class Mods implements Loadable{
private Json json = new Json();
private Scripts scripts;
private @Nullable Scripts scripts;
private ContentParser parser = new ContentParser();
private ObjectMap<String, Array<FileHandle>> bundles = new ObjectMap<>();
private ObjectSet<String> specialFolders = ObjectSet.with("bundles", "sprites");
@ -348,6 +348,12 @@ public class Mods implements Loadable{
Sounds.dispose();
Sounds.load();
Core.assets.finishLoading();
if(scripts != null){
scripts.dispose();
scripts = null;
}
content.createContent(false);
loadScripts();
content.clear();
content.createContent();
loadAsync();
@ -361,9 +367,8 @@ public class Mods implements Loadable{
Events.fire(new ContentReloadEvent());
}
/** Creates all the content found in mod files. */
public void loadContent(){
/** This must be run on the main thread! */
public void loadScripts(){
Time.mark();
for(LoadedMod mod : loaded){
@ -390,6 +395,10 @@ public class Mods implements Loadable{
}
Log.info("Time to initialize modded scripts: {0}", Time.elapsed());
}
/** Creates all the content found in mod files. */
public void loadContent(){
class LoadRun implements Comparable<LoadRun>{
final ContentType type;

34
core/src/io/anuke/mindustry/mod/Scripts.java
View File

@ -7,10 +7,7 @@ import io.anuke.mindustry.*;
import io.anuke.mindustry.mod.Mods.*;
import org.mozilla.javascript.*;
import java.io.*;
public class Scripts{
private static final Class[] denied = {FileHandle.class, InputStream.class, File.class, Scripts.class, Files.class, ClassAccess.class};
public class Scripts implements Disposable{
private final Context context;
private final String wrapper;
private Scriptable scope;
@ -18,12 +15,26 @@ public class Scripts{
public Scripts(){
Time.mark();
context = Context.enter();
if(Vars.mobile){
context.setOptimizationLevel(-1);
context = Vars.platform.getScriptContext();
context.setClassShutter(type -> ClassAccess.allowedClassNames.contains(type) || type.startsWith("adapter") || type.contains("PrintStream"));
context.setErrorReporter(new ErrorReporter(){
@Override
public void warning(String message, String sourceName, int line, String lineSource, int lineOffset){
}
//context.setClassShutter(ClassAccess.allowedClassNames::contains);
@Override
public void error(String message, String sourceName, int line, String lineSource, int lineOffset){
Log.info(message + "@" + sourceName + ":" + line);
}
@Override
public EvaluatorException runtimeError(String message, String sourceName, int line, String lineSource, int lineOffset){
Log.info(message + "@" + sourceName + ":" + line);
return null;
}
});
scope = context.initStandardObjects();
wrapper = Core.files.internal("scripts/wrapper.js").readString();
@ -32,10 +43,15 @@ public class Scripts{
}
public void run(LoadedMod mod, FileHandle file){
run(wrapper.replace("$SCRIPT_NAME$", mod.name + "_" +file.nameWithoutExtension().replace("-", "_").replace(" ", "_")).replace("$CODE$", file.readString()), file.name());
run(wrapper.replace("$SCRIPT_NAME$", mod.name + "_" + file.nameWithoutExtension().replace("-", "_").replace(" ", "_")).replace("$CODE$", file.readString()), file.name());
}
private void run(String script, String file){
context.evaluateString(scope, script, file, 1, null);
}
@Override
public void dispose(){
Context.exit();
}
}

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=680d8dfc055a1336c06b32d7d4429661e6c6fddd
archash=7c853686fcf7fac56405919817d7f8caef00c0f2

3
tools/src/io/anuke/mindustry/tools/ScriptStubGenerator.java
View File

@ -9,6 +9,7 @@ import org.reflections.*;
import org.reflections.scanners.*;
import org.reflections.util.*;
import java.io.*;
import java.util.*;
public class ScriptStubGenerator{
@ -17,7 +18,7 @@ public class ScriptStubGenerator{
String base = "io.anuke.mindustry";
Array<String> blacklist = Array.with("plugin", "mod", "net", "io", "tools", "gen");
Array<String> nameBlacklist = Array.with("ClientLauncher", "NetClient", "NetServer");
Array<Class<?>> whitelist = Array.with(Draw.class, Core.class, TextureAtlas.class, TextureRegion.class, Time.class);
Array<Class<?>> whitelist = Array.with(Draw.class, Core.class, TextureAtlas.class, TextureRegion.class, Time.class, System.class, PrintStream.class);
String fileTemplate = "package io.anuke.mindustry.mod;\n" +
"\n" +