Include Arial font, don't rely on built-in resource

TODO add font to legacy bundles

Author: sinai-dev

src/Resources/modern.bundle

@@ -16,12 +16,6 @@ public static class UIFactory
         internal static Vector2 _largeElementSize = new Vector2(100, 30);
         internal static Vector2 _smallElementSize = new Vector2(25, 25);
         internal static Color _defaultTextColor = Color.white;
-        internal static Font _defaultFont;
-
-        public static void Init()
-        {
-            _defaultFont = Resources.GetBuiltinResource<Font>("Arial.ttf");
-        }
 
         public static GameObject CreateUIObject(string name, GameObject parent, Vector2 size = default)
         {
@@ -48,7 +42,7 @@ public static GameObject CreateUIObject(string name, GameObject parent, Vector2
         internal static void SetDefaultTextValues(Text text)
         {
             text.color = _defaultTextColor;
-            text.font = _defaultFont;
+            text.font = UIManager.DefaultFont;
             text.fontSize = 14;
         }
 

src/UI/UIFactory.cs

@@ -52,6 +52,7 @@ public enum VerticalAnchor
         internal static GameObject PanelHolder { get; private set; }
 
         internal static Font ConsoleFont { get; private set; }
+        internal static Font DefaultFont { get; private set; }
         internal static Shader BackupShader { get; private set; }
 
         public static RectTransform NavBarRect;
@@ -92,8 +93,6 @@ internal static void InitUI()
         {
             LoadBundle();
 
-            UIFactory.Init();
-
             CreateRootCanvas();
 
             // Global UI Pool Holder
@@ -423,11 +422,11 @@ private static void LoadBundle()
                 int minor = int.Parse(split[1]);
 
                 // Use appropriate AssetBundle for Unity version
-                // >= 2017.3
-                if (major > 2017 || (major == 2017 && minor >= 3))
+                // >= 2017
+                if (major >= 2017)
                     bundle = LoadBundle("modern");
-                // 5.6.0 to 2017.3
-                else if (major == 2017 || (major == 5 && minor >= 6))
+                // 5.6.0 to <2017
+                else if (major == 5 && minor >= 6)
                     bundle = LoadBundle("legacy.5.6");
                 // < 5.6.0
                 else
@@ -452,11 +451,15 @@ AssetBundle LoadBundle(string id)
             {
                 ExplorerCore.LogWarning("Could not load the ExplorerUI Bundle!");
                 ConsoleFont = Resources.GetBuiltinResource<Font>("Arial.ttf");
+                DefaultFont = ConsoleFont;
                 return;
             }
 
-            BackupShader = bundle.LoadAsset<Shader>("DefaultUI");
+            // Bundle loaded
+            ConsoleFont = bundle.LoadAsset<Font>("CONSOLA");
+            DefaultFont = bundle.LoadAsset<Font>("arial");
 
+            BackupShader = bundle.LoadAsset<Shader>("DefaultUI");
             // Fix for games which don't ship with 'UI/Default' shader.
             if (Graphic.defaultGraphicMaterial.shader?.name != "UI/Default")
             {
@@ -466,7 +469,6 @@ AssetBundle LoadBundle(string id)
             else
                 BackupShader = Graphic.defaultGraphicMaterial.shader;
 
-            ConsoleFont = bundle.LoadAsset<Font>("CONSOLA");
         }
 
         private static byte[] ReadFully(Stream input)