Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed assets/Arial Bold.ttf
Binary file not shown.
Binary file removed assets/OpenSans-Bold.ttf
Binary file not shown.
Binary file removed assets/OpenSans-Regular.ttf
Binary file not shown.
Binary file added assets/Symbola-trim-playback-buttons.ttf
Binary file not shown.
Binary file removed assets/Symbola_Hinted.ttf
Binary file not shown.
Binary file removed assets/TimesRoman.ttf
Binary file not shown.
2 changes: 1 addition & 1 deletion src/Client/Launcher.java
Original file line number Diff line number Diff line change
Expand Up @@ -2006,7 +2006,7 @@ private static Font determineControlsFont() {

// Current font is not suitable, using our fallback
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
try (InputStream is = getResourceAsStream("/assets/Symbola_Hinted.ttf")) {
try (InputStream is = getResourceAsStream("/assets/Symbola-trim-playback-buttons.ttf")) {
ge.registerFont(Font.createFont(Font.TRUETYPE_FONT, is));
font = new Font("Symbola", Font.PLAIN, osScaleMul(18));

Expand Down
4 changes: 2 additions & 2 deletions src/Client/NotificationsHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,10 @@ public void actionPerformed(ActionEvent arg0) {
try {
Font font =
Font.createFont(
Font.TRUETYPE_FONT, Launcher.getResourceAsStream("/assets/OpenSans-Regular.ttf"));
Font.TRUETYPE_FONT, Launcher.getResourceAsStream("/assets/arial.ttf"));
Font boldFont =
Font.createFont(
Font.TRUETYPE_FONT, Launcher.getResourceAsStream("/assets/OpenSans-Bold.ttf"));
Font.TRUETYPE_FONT, Launcher.getResourceAsStream("/assets/Helvetica-Bold.ttf"));

notificationTitle.setFont(boldFont.deriveFont(Font.BOLD, osScaleMul(18)));
notificationTextArea.setFont(font.deriveFont(Font.PLAIN, osScaleMul(16)));
Expand Down
2 changes: 1 addition & 1 deletion src/Client/WorldMapWindow.java
Original file line number Diff line number Diff line change
Expand Up @@ -1200,7 +1200,7 @@ public static void initAssets() {
fonts = new Font[20];
fontsBold = new Font[20];
try (InputStream is = Launcher.getResourceAsStream("/assets/arial.ttf");
InputStream is2 = Launcher.getResourceAsStream("/assets/Arial Bold.ttf")) {
InputStream is2 = Launcher.getResourceAsStream("/assets/Helvetica-Bold.ttf")) {
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
Font font = Font.createFont(Font.TRUETYPE_FONT, is);
Font boldFont = Font.createFont(Font.TRUETYPE_FONT, is2);
Expand Down
4 changes: 1 addition & 3 deletions src/Game/Renderer.java
Original file line number Diff line number Diff line change
Expand Up @@ -234,13 +234,11 @@ public static void init() {

// Load fonts
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
try (InputStream hIS = Launcher.getResourceAsStream("/assets/Helvetica-Bold.ttf");
InputStream tIS = Launcher.getResourceAsStream("/assets/TimesRoman.ttf")) {
try (InputStream hIS = Launcher.getResourceAsStream("/assets/Helvetica-Bold.ttf")) {
Font font = Font.createFont(Font.TRUETYPE_FONT, hIS);
ge.registerFont(font);
font_main = font.deriveFont(Font.PLAIN, 11.0f);
font_big = font.deriveFont(Font.PLAIN, 22.0f);
ge.registerFont(Font.createFont(Font.TRUETYPE_FONT, tIS));
} catch (Exception e) {
e.printStackTrace();
}
Expand Down