From 07a4b64b8ae0b580d32fdff1249e4caf03a0364e Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 4 May 2020 00:01:45 -0400 Subject: [PATCH] Removed unnecessary functional methods / Script cleanup --- core/assets/scripts/base.js | 7 -- core/assets/scripts/global.js | 112 ++++++++++++++-------------- core/src/mindustry/mod/Scripts.java | 2 +- core/src/mindustry/net/Net.java | 3 +- 4 files changed, 56 insertions(+), 68 deletions(-) diff --git a/core/assets/scripts/base.js b/core/assets/scripts/base.js index 4d8cad1710..ac684f6550 100755 --- a/core/assets/scripts/base.js +++ b/core/assets/scripts/base.js @@ -15,12 +15,5 @@ const extend = function(classType, params){ return new JavaAdapter(classType, params) } -const run = method => new java.lang.Runnable(){run: method} -const boolf = method => new Boolf(){get: method} -const boolp = method => new Boolp(){get: method} -const cons = method => new Cons(){get: method} -const cons2 = method => new Cons2(){get: method} -const prov = method => new Prov(){get: method} const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer})) Call = Packages.mindustry.gen.Call -const Calls = Call //backwards compat diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js index c70ee27455..1730c2c048 100755 --- a/core/assets/scripts/global.js +++ b/core/assets/scripts/global.js @@ -7,7 +7,7 @@ const log = function(context, obj){ var scriptName = "base.js" var modName = "none" -const print = text => log(scriptName, text); +const print = text => log(modName + "/" + scriptName, text); const extendContent = function(classType, name, params){ return new JavaAdapter(classType, params, name) @@ -17,74 +17,70 @@ const extend = function(classType, params){ return new JavaAdapter(classType, params) } -const run = method => new java.lang.Runnable(){run: method} -const boolf = method => new Boolf(){get: method} -const boolp = method => new Boolp(){get: method} -const floatf = method => new Floatf(){get: method} -const floatp = method => new Floatp(){get: method} -const cons = method => new Cons(){get: method} -const cons2 = method => new Cons2(){get: method} -const prov = method => new Prov(){get: method} -const func = method => new Func(){get: method} const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer})) Call = Packages.mindustry.gen.Call -const Calls = Call //backwards compat -importPackage(Packages.arc.math.geom) -importPackage(Packages.mindustry.graphics) -importPackage(Packages.mindustry.ui.dialogs) -importPackage(Packages.mindustry.world.blocks.liquid) -importPackage(Packages.mindustry.world.blocks) -importPackage(Packages.arc.scene.event) -importPackage(Packages.arc.scene.actions) -importPackage(Packages.mindustry.gen) -importPackage(Packages.arc.struct) -importPackage(Packages.mindustry.world.blocks.defense.turrets) -importPackage(Packages.mindustry.game) -importPackage(Packages.arc.graphics) -importPackage(Packages.mindustry.ui.fragments) -importPackage(Packages.mindustry.ui) -importPackage(Packages.mindustry.world.blocks.power) -importPackage(Packages.mindustry.entities.traits) -importPackage(Packages.mindustry.entities.effect) -importPackage(Packages.arc.math) -importPackage(Packages.arc.scene.ui) -importPackage(Packages.mindustry.world.blocks.defense) importPackage(Packages.mindustry.ctype) -importPackage(Packages.mindustry.entities.type) -importPackage(Packages.mindustry.world.meta) +importPackage(Packages.mindustry.gen) importPackage(Packages.arc.func) -importPackage(Packages.mindustry.editor) -importPackage(Packages.mindustry.entities.units) -importPackage(Packages.mindustry.maps.filters) -importPackage(Packages.mindustry.world) -importPackage(Packages.arc.scene.utils) -importPackage(Packages.mindustry.maps.generators) +importPackage(Packages.mindustry.type) +importPackage(Packages.mindustry.core) +importPackage(Packages.mindustry.world.blocks.sandbox) +importPackage(Packages.mindustry.ui.dialogs) +importPackage(Packages.arc.scene.ui) +importPackage(Packages.mindustry.input) +importPackage(Packages.mindustry.world.blocks.logic) +importPackage(Packages.mindustry.entities.def) +importPackage(Packages.mindustry.game) +importPackage(Packages.arc.math) importPackage(Packages.mindustry.world.blocks.distribution) -importPackage(Packages.mindustry.entities.bullet) +importPackage(Packages.mindustry.world.blocks.production) +importPackage(Packages.mindustry.ai) +importPackage(Packages.mindustry.ai.formations.patterns) importPackage(Packages.mindustry.content) importPackage(Packages.mindustry.world.meta.values) -importPackage(Packages.mindustry.world.blocks.production) -importPackage(Packages.arc) -importPackage(Packages.mindustry.world.blocks.units) -importPackage(Packages.mindustry.core) -importPackage(Packages.mindustry.world.consumers) -importPackage(Packages.mindustry.entities.type.base) -importPackage(Packages.arc.scene.ui.layout) -importPackage(Packages.mindustry.type) -importPackage(Packages.mindustry.input) -importPackage(Packages.mindustry.entities) +importPackage(Packages.mindustry.world) +importPackage(Packages.mindustry.world.meta) importPackage(Packages.arc.scene.style) -importPackage(Packages.mindustry.world.blocks.sandbox) -importPackage(Packages.mindustry.ui.layout) -importPackage(Packages.mindustry.maps.zonegen) +importPackage(Packages.arc.struct) importPackage(Packages.arc.graphics.g2d) -importPackage(Packages.mindustry.ai) -importPackage(Packages.mindustry.world.modules) +importPackage(Packages.mindustry.world.blocks) +importPackage(Packages.mindustry.world.blocks.legacy) +importPackage(Packages.mindustry.editor) +importPackage(Packages.mindustry.world.blocks.defense.turrets) +importPackage(Packages.arc) +importPackage(Packages.arc.scene.utils) +importPackage(Packages.arc.scene.actions) +importPackage(Packages.arc.scene.event) +importPackage(Packages.mindustry.ui) +importPackage(Packages.mindustry.entities.bullet) +importPackage(Packages.mindustry.graphics.g3d) +importPackage(Packages.arc.math.geom) +importPackage(Packages.arc.scene.ui.layout) +importPackage(Packages.mindustry.world.blocks.liquid) +importPackage(Packages.mindustry.world.blocks.defense) +importPackage(Packages.mindustry.world.blocks.environment) +importPackage(Packages.mindustry.world.blocks.experimental) +importPackage(Packages.mindustry.maps.filters) importPackage(Packages.mindustry.world.blocks.storage) +importPackage(Packages.mindustry.graphics) importPackage(Packages.arc.scene) -importPackage(Packages.mindustry.maps) -importPackage(Packages.mindustry.world.blocks.logic) -importPackage(Packages.arc.util) +importPackage(Packages.mindustry.world.blocks.power) +importPackage(Packages.mindustry.ui.fragments) +importPackage(Packages.mindustry.ai.formations) +importPackage(Packages.mindustry.world.modules) +importPackage(Packages.arc.graphics) +importPackage(Packages.mindustry.maps.generators) importPackage(Packages.mindustry.world.producers) +importPackage(Packages.mindustry.world.blocks.units) +importPackage(Packages.arc.util) +importPackage(Packages.mindustry.world.consumers) +importPackage(Packages.mindustry.maps) +importPackage(Packages.mindustry.ui.layout) +importPackage(Packages.mindustry.world.blocks.payloads) +importPackage(Packages.mindustry.entities) +importPackage(Packages.mindustry.async) importPackage(Packages.mindustry) +importPackage(Packages.mindustry.entities.units) +importPackage(Packages.mindustry.ai.types) +importPackage(Packages.mindustry.maps.planet) diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index da714ec3f5..5bfa61e8b0 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -19,7 +19,7 @@ public class Scripts implements Disposable{ private final Array blacklist = Array.with("net", "files", "reflect", "javax", "rhino", "file", "channels", "jdk", "runtime", "util.os", "rmi", "security", "org.", "sun.", "beans", "sql", "http", "exec", "compiler", "process", "system", ".awt", "socket", "classloader", "oracle", "invoke"); - private final Array whitelist = Array.with("mindustry.net"); + private final Array whitelist = Array.with("mindustry.net", "netserver", "netclient", "com.sun.proxy.$proxy"); private final Context context; private Scriptable scope; private boolean errored; diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java index 00ff718b5f..7096947e0b 100644 --- a/core/src/mindustry/net/Net.java +++ b/core/src/mindustry/net/Net.java @@ -21,8 +21,7 @@ public class Net{ private boolean server; private boolean active; private boolean clientLoaded; - private @Nullable - StreamBuilder currentStream; + private @Nullable StreamBuilder currentStream; private final Array packetQueue = new Array<>(); private final ObjectMap, Cons> clientListeners = new ObjectMap<>();