mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-22 20:48:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

Load content icons on a headless server (#8650)

Browse Source 
* Update build.gradle

* Update Fonts.java

* Update ServerLauncher.java

* Update ServerLauncher.java

* s stands for shiza

* Update build.gradle
This commit is contained in:
Даркнесс#3729 2023-05-29 20:09:56 +03:00 committed by GitHub
parent 7911a22cc9
commit e3ccd5cc2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/mindustry/ui/Fonts.java
View File

@ -156,10 +156,29 @@ public class Fonts{
});
for(Team team : Team.baseTeams){
if(Core.atlas.has("team-" + team.name)){
team.emoji = stringIcons.get(team.name, "");
team.emoji = stringIcons.get(team.name, "");
}
}
public static void loadContentIconsHeadless(){
try(Scanner scan = new Scanner(Core.files.internal("icons/icons.properties").read(512))){
while(scan.hasNextLine()){
String line = scan.nextLine();
String[] split = line.split("=");
String[] nametex = split[1].split("\\|");
String character = split[0];
int ch = Integer.parseInt(character);
unicodeIcons.put(nametex[0], ch);
stringIcons.put(nametex[0], ((char)ch) + "");
}
}
stringIcons.put("alphachan", stringIcons.get("alphaaaa"));
for(Team team : Team.baseTeams){
team.emoji = stringIcons.get(team.name, "");
}
}
/** Called from a static context for use in the loading screen.*/

4
server/build.gradle
View File

@ -39,11 +39,13 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
exclude("music/**")
exclude("sounds/**")
exclude("fonts/**")
exclude("icons/**")
exclude("bundles/**")
exclude("cubemaps/**")
exclude("cursors/**")
exclude("shaders/**")
exclude("icons/icon.icns")
exclude("icons/icon.ico")
exclude("icons/icon_64.png")
manifest{
attributes 'Main-Class': project.mainClassName

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

@ -11,6 +11,7 @@ import mindustry.mod.*;
import mindustry.mod.Mods.*;
import mindustry.net.Net;
import mindustry.net.*;
import mindustry.ui.*;
import java.time.*;
@ -45,11 +46,15 @@ public class ServerLauncher implements ApplicationListener{
Vars.loadSettings();
Vars.init();
UI.loadColors();
Fonts.loadContentIconsHeadless();
content.createBaseContent();
mods.loadScripts();
content.createModContent();
content.init();
if(mods.hasContentErrors()){
err("Error occurred loading mod content:");
for(LoadedMod mod : mods.list()){