diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js index b358cd9f25..7a094a8f25 100755 --- a/core/assets/scripts/global.js +++ b/core/assets/scripts/global.js @@ -41,12 +41,12 @@ function extend(/*Base, ..., def*/){ return instance } - importPackage(Packages.arc) importPackage(Packages.arc.audio) importPackage(Packages.arc.files) -importPackage(Packages.arc.func) importPackage(Packages.arc.flabel) +importPackage(Packages.arc.flabel.effects) +importPackage(Packages.arc.func) importPackage(Packages.arc.graphics) importPackage(Packages.arc.graphics.g2d) importPackage(Packages.arc.graphics.gl) @@ -62,7 +62,6 @@ importPackage(Packages.arc.scene.ui.layout) importPackage(Packages.arc.scene.utils) importPackage(Packages.arc.struct) importPackage(Packages.arc.util) -importPackage(Packages.arc.util.async) importPackage(Packages.arc.util.io) importPackage(Packages.arc.util.noise) importPackage(Packages.arc.util.pooling) @@ -90,6 +89,7 @@ importPackage(Packages.mindustry.graphics) importPackage(Packages.mindustry.graphics.g3d) importPackage(Packages.mindustry.input) importPackage(Packages.mindustry.io) +importPackage(Packages.mindustry.io.versions) importPackage(Packages.mindustry.logic) importPackage(Packages.mindustry.maps) importPackage(Packages.mindustry.maps.filters) diff --git a/tools/src/mindustry/tools/ScriptMainGenerator.java b/tools/src/mindustry/tools/ScriptMainGenerator.java index 3249e9c911..d57bc6123f 100644 --- a/tools/src/mindustry/tools/ScriptMainGenerator.java +++ b/tools/src/mindustry/tools/ScriptMainGenerator.java @@ -24,7 +24,7 @@ public class ScriptMainGenerator{ public static void main(String[] args) throws Exception{ String base = "mindustry"; - Seq blacklist = Seq.with("plugin", "mod", "net", "io", "tools"); + Seq blacklist = Seq.with("plugin", "mod", "net", "tools"); Seq nameBlacklist = Seq.with(); Seq> whitelist = Seq.with(Draw.class, Fill.class, Lines.class, Core.class, TextureAtlas.class, TextureRegion.class, Time.class, System.class, PrintStream.class, AtlasRegion.class, String.class, Mathf.class, Angles.class, Color.class, Runnable.class, Object.class, Icon.class, Tex.class, Shader.class, @@ -41,6 +41,8 @@ public class ScriptMainGenerator{ getClasses("arc.audio"), getClasses("arc.input"), getClasses("arc.util"), + getClasses("arc.files"), + getClasses("arc.flabel"), getClasses("arc.struct") ); classes.addAll(whitelist);