diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java index 4dd8aa9c74..8a0f81610f 100644 --- a/core/src/mindustry/core/UI.java +++ b/core/src/mindustry/core/UI.java @@ -85,6 +85,14 @@ public class UI implements ApplicationListener, Loadable{ Fonts.loadFonts(); } + public static void loadColors(){ + Colors.put("accent", Pal.accent); + Colors.put("unlaunched", Color.valueOf("8982ed")); + Colors.put("highlight", Pal.accent.cpy().lerp(Color.white, 0.3f)); + Colors.put("stat", Pal.stat); + Colors.put("negstat", Pal.negativeStat); + } + @Override public void loadAsync(){ @@ -92,6 +100,8 @@ public class UI implements ApplicationListener, Loadable{ @Override public void loadSync(){ + loadColors(); + Fonts.outline.getData().markupEnabled = true; Fonts.def.getData().markupEnabled = true; Fonts.def.setOwnsTexture(false); @@ -125,12 +135,6 @@ public class UI implements ApplicationListener, Loadable{ ClickListener.clicked = () -> Sounds.press.play(); - Colors.put("accent", Pal.accent); - Colors.put("unlaunched", Color.valueOf("8982ed")); - Colors.put("highlight", Pal.accent.cpy().lerp(Color.white, 0.3f)); - Colors.put("stat", Pal.stat); - Colors.put("negstat", Pal.negativeStat); - drillCursor = Core.graphics.newCursor("drill", Fonts.cursorScale()); unloadCursor = Core.graphics.newCursor("unload", Fonts.cursorScale()); targetCursor = Core.graphics.newCursor("target", Fonts.cursorScale()); diff --git a/server/src/mindustry/server/ServerLauncher.java b/server/src/mindustry/server/ServerLauncher.java index 4d4d3d9aa1..413ee39e91 100644 --- a/server/src/mindustry/server/ServerLauncher.java +++ b/server/src/mindustry/server/ServerLauncher.java @@ -45,6 +45,7 @@ public class ServerLauncher implements ApplicationListener{ Vars.loadSettings(); Vars.init(); + UI.loadColors(); content.createBaseContent(); mods.loadScripts(); content.createModContent();