Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions 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

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);
}
}