Re-added OpenSans font for compatible languages

Ninjabrain1 · Dec 27, 2021 · 0eeb34d · 0eeb34d
1 parent db25e74
commit 0eeb34d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/src/ninjabrainbot/Main.java b/src/ninjabrainbot/Main.java
@@ -9,9 +9,6 @@
 import ninjabrainbot.util.I18n;
 import ninjabrainbot.util.Profiler;
 
-import java.util.Arrays;
-import java.util.Locale;
-
 public class Main {
 
 	public static final String VERSION = "1.1.0";

diff --git a/src/ninjabrainbot/gui/GUI.java b/src/ninjabrainbot/gui/GUI.java
@@ -29,6 +29,7 @@
 import ninjabrainbot.gui.components.NinjabrainBotFrame;
 import ninjabrainbot.gui.components.ThemedComponent;
 import ninjabrainbot.io.VersionURL;
+import ninjabrainbot.util.I18n;
 import ninjabrainbot.util.Profiler;
 
 /**
@@ -56,7 +57,8 @@ public class GUI {
 	private ArrayList<Throw> eyeThrows;
 	private ArrayList<Throw> eyeThrowsLast;
 
-	private final Font font;
+	private Font font;
+	private Font fontLight;
 
 	public GUI() {
 		theme = Theme.get(Main.preferences.theme.get());
@@ -71,7 +73,25 @@ public GUI() {
 		Profiler.start("Create frame");
 		frame = new NinjabrainBotFrame(this);
 		notificationsFrame = frame.getNotificationsFrame();
-
+
+		// Load fonts
+		Profiler.stopAndStart("Load fonts");
+		try {
+			font = Font.createFont(Font.TRUETYPE_FONT, Main.class.getResourceAsStream("/resources/OpenSans-Regular.ttf"));
+			if (font.canDisplayUpTo(I18n.get("lang")) != -1) {
+				font = new Font(null);
+			}
+			fontLight = Font.createFont(Font.TRUETYPE_FONT, Main.class.getResourceAsStream("/resources/OpenSans-Light.ttf"));
+			if (fontLight.canDisplayUpTo(I18n.get("lang")) != -1) {
+				fontLight = new Font(null);
+			}
+			GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+			ge.registerFont(font);
+			ge.registerFont(fontLight);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
 		// Set application icon
 		Profiler.stopAndStart("Set app icon");
 		URL iconURL = Main.class.getResource("/resources/icon.png");
@@ -161,7 +181,7 @@ public void setAngleErrorsEnabled(boolean b) {
 	}
 
 	public Font fontSize(float size, boolean light) {
-		return font.deriveFont(Font.BOLD, size);
+		return light ? fontLight.deriveFont(Font.BOLD, size) : font.deriveFont(Font.BOLD, size);
 	}
 
 	public void registerThemedComponent(ThemedComponent c) {

diff --git a/src/ninjabrainbot/util/I18n.java b/src/ninjabrainbot/util/I18n.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;

diff --git a/src/resources/OpenSans-Light.ttf b/src/resources/OpenSans-Light.ttf
diff --git a/src/resources/OpenSans-Regular.ttf b/src/resources/OpenSans-Regular.ttf