diff --git a/assets/Arial Bold.ttf b/assets/Arial Bold.ttf deleted file mode 100644 index 940e255d..00000000 Binary files a/assets/Arial Bold.ttf and /dev/null differ diff --git a/assets/OpenSans-Bold.ttf b/assets/OpenSans-Bold.ttf deleted file mode 100644 index fd79d43b..00000000 Binary files a/assets/OpenSans-Bold.ttf and /dev/null differ diff --git a/assets/OpenSans-Regular.ttf b/assets/OpenSans-Regular.ttf deleted file mode 100644 index db433349..00000000 Binary files a/assets/OpenSans-Regular.ttf and /dev/null differ diff --git a/assets/Symbola-trim-playback-buttons.ttf b/assets/Symbola-trim-playback-buttons.ttf new file mode 100644 index 00000000..e9cde125 Binary files /dev/null and b/assets/Symbola-trim-playback-buttons.ttf differ diff --git a/assets/Symbola_Hinted.ttf b/assets/Symbola_Hinted.ttf deleted file mode 100644 index ea1698aa..00000000 Binary files a/assets/Symbola_Hinted.ttf and /dev/null differ diff --git a/assets/TimesRoman.ttf b/assets/TimesRoman.ttf deleted file mode 100644 index 7d40ce13..00000000 Binary files a/assets/TimesRoman.ttf and /dev/null differ diff --git a/src/Client/Launcher.java b/src/Client/Launcher.java index 25960855..39474b43 100644 --- a/src/Client/Launcher.java +++ b/src/Client/Launcher.java @@ -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)); diff --git a/src/Client/NotificationsHandler.java b/src/Client/NotificationsHandler.java index 0363fa36..6f73e911 100644 --- a/src/Client/NotificationsHandler.java +++ b/src/Client/NotificationsHandler.java @@ -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))); diff --git a/src/Client/WorldMapWindow.java b/src/Client/WorldMapWindow.java index 3563f386..f0f8ecb5 100644 --- a/src/Client/WorldMapWindow.java +++ b/src/Client/WorldMapWindow.java @@ -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); diff --git a/src/Game/Renderer.java b/src/Game/Renderer.java index b37fe475..138a5acf 100644 --- a/src/Game/Renderer.java +++ b/src/Game/Renderer.java @@ -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(); }