JS console / Scripting tweaks

2019-12-07 14:10:39 -05:00
parent 06abc43aea
commit dd5e3b2aba
22 changed files with 365 additions and 101 deletions
--- a/core/src/io/anuke/mindustry/ClientLauncher.java
+++ b/core/src/io/anuke/mindustry/ClientLauncher.java
@@ -69,14 +69,12 @@ 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.createBaseContent();
            content.loadColors();
+        }, () -> {
+            mods.loadScripts();
+            content.createModContent();
        });

        add(logic = new Logic());