Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #8582

Browse Source
This commit is contained in:
Anuken
2023-05-11 17:05:18 -04:00
parent 3b8f789955
commit 06e63dad45
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/mindustry/core/UI.java
View File

@@ -85,6 +85,14 @@ public class UI implements ApplicationListener, Loadable{
Fonts.loadFonts(); 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 @Override
public void loadAsync(){ public void loadAsync(){
@@ -92,6 +100,8 @@ public class UI implements ApplicationListener, Loadable{
@Override @Override
public void loadSync(){ public void loadSync(){
loadColors();
Fonts.outline.getData().markupEnabled = true; Fonts.outline.getData().markupEnabled = true;
Fonts.def.getData().markupEnabled = true; Fonts.def.getData().markupEnabled = true;
Fonts.def.setOwnsTexture(false); Fonts.def.setOwnsTexture(false);
@@ -125,12 +135,6 @@ public class UI implements ApplicationListener, Loadable{
ClickListener.clicked = () -> Sounds.press.play(); 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()); drillCursor = Core.graphics.newCursor("drill", Fonts.cursorScale());
unloadCursor = Core.graphics.newCursor("unload", Fonts.cursorScale()); unloadCursor = Core.graphics.newCursor("unload", Fonts.cursorScale());
targetCursor = Core.graphics.newCursor("target", Fonts.cursorScale()); targetCursor = Core.graphics.newCursor("target", Fonts.cursorScale());

1
server/src/mindustry/server/ServerLauncher.java
View File

@@ -45,6 +45,7 @@ public class ServerLauncher implements ApplicationListener{
Vars.loadSettings(); Vars.loadSettings();
Vars.init(); Vars.init();
UI.loadColors();
content.createBaseContent(); content.createBaseContent();
mods.loadScripts(); mods.loadScripts();
content.createModContent(); content.createModContent();