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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2023-05-30 20:08:53 -04:00
parent b6f5d424da 2e96f598fb
commit b97e6ef84c
4 changed files with 30 additions and 4 deletions
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.*/