Merge pull request #29 from js6pak/embedded-assetbundle

Load assetbundle from EmbeddedResource

Author: sinai-dev

resources/Older Unity bundle/THIS BUNDLE IS FOR UNITY 5.6.1 AND OLDER.txt

@@ -11,7 +11,7 @@ public class ModConfig
         public static ModConfig Instance;
 
         internal static readonly IniDataParser _parser = new IniDataParser();
-        internal const string INI_PATH = ExplorerCore.EXPLORER_FOLDER + @"\config.ini";
+        internal static readonly string INI_PATH = Path.Combine(ExplorerCore.EXPLORER_FOLDER, "config.ini");
 
         static ModConfig()
         {

src/Config/ModConfig.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using BepInEx;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityExplorer.Config;
@@ -19,7 +20,12 @@ public class ExplorerCore
         public const string VERSION = "3.1.4";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
+
+#if ML
         public const string EXPLORER_FOLDER = @"Mods\UnityExplorer";
+#elif BIE
+        public static string EXPLORER_FOLDER = Path.Combine(Paths.ConfigPath, "UnityExplorer");
+#endif
 
         public static ExplorerCore Instance { get; private set; }
 

src/ExplorerCore.cs

@@ -70,7 +70,8 @@ public static Texture2D Copy(Texture2D orig, Rect rect)
 
             pixels = orig.GetPixels((int)rect.x, (int)rect.y, (int)rect.width, (int)rect.height);
 
-            var _newTex = new Texture2D((int)rect.width, (int)rect.height);
+            // use full constructor for better compatibility
+            var _newTex = new Texture2D((int)rect.width, (int)rect.height, TextureFormat.RGBA32, Texture.GenerateAllMips, false, IntPtr.Zero);
             _newTex.SetPixels(pixels);
 
             return _newTex;

src/Helpers/Texture2DHelpers.cs

@@ -88,33 +88,62 @@ public static void Update()
             }
         }
 
-        private static void LoadBundle()
+        private static byte[] ReadFully(this Stream input)
         {
-            var bundlePath = ExplorerCore.EXPLORER_FOLDER + @"\explorerui.bundle";
-            if (File.Exists(bundlePath))
+            using (var ms = new MemoryStream())
             {
-                var bundle = AssetBundle.LoadFromFile(bundlePath);
+                input.CopyTo(ms);
+                return ms.ToArray();
+            }
+        }
+
+        private static AssetBundle LoadExplorerUi(string id)
+        {
+            return AssetBundle.LoadFromMemory(ReadFully(typeof(ExplorerCore).Assembly.GetManifestResourceStream($"UnityExplorer.Resources.explorerui.{id}.bundle")));
+        }
 
-                BackupShader = bundle.LoadAsset<Shader>("DefaultUI");
+        private static void LoadBundle()
+        {
+            AssetBundle bundle = null;
+
+            try
+            {
+                bundle = LoadExplorerUi("modern");
+            }
+            catch
+            {
+                ExplorerCore.Log("Failed to load modern ExplorerUI Bundle, falling back to legacy");
 
-                // Fix for games which don't ship with 'UI/Default' shader.
-                if (Graphic.defaultGraphicMaterial.shader?.name != "UI/Default")
+                try
                 {
-                    ExplorerCore.Log("This game does not ship with the 'UI/Default' shader, using manual Default Shader...");
-                    Graphic.defaultGraphicMaterial.shader = BackupShader;
+                    bundle = LoadExplorerUi("legacy");
                 }
+                catch
+                {
+                    // ignored
+                }
+            }
 
-                ResizeCursor = bundle.LoadAsset<Sprite>("cursor");
+            if (bundle == null)
+            {
+                ExplorerCore.LogWarning("Could not load the ExplorerUI Bundle!");
+                return;
+            }
 
-                ConsoleFont = bundle.LoadAsset<Font>("CONSOLA");
+            BackupShader = bundle.LoadAsset<Shader>("DefaultUI");
 
-                ExplorerCore.Log("Loaded UI bundle");
-            }
-            else
+            // Fix for games which don't ship with 'UI/Default' shader.
+            if (Graphic.defaultGraphicMaterial.shader?.name != "UI/Default")
             {
-                ExplorerCore.LogWarning("Could not find the ExplorerUI Bundle! It should exist at '" + bundlePath + "'");
-                return;
+                ExplorerCore.Log("This game does not ship with the 'UI/Default' shader, using manual Default Shader...");
+                Graphic.defaultGraphicMaterial.shader = BackupShader;
             }
+
+            ResizeCursor = bundle.LoadAsset<Sprite>("cursor");
+
+            ConsoleFont = bundle.LoadAsset<Font>("CONSOLA");
+
+            ExplorerCore.Log("Loaded UI bundle");
         }
 
         private static GameObject CreateRootCanvas()

resources/Older Unity bundle/explorerui.bundle renamed to src/Resources/explorerui.legacy.bundle

@@ -293,6 +293,7 @@
     <Compile Include="Unstrip\SceneUnstrip.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UI\UIFactory.cs" />
+    <EmbeddedResource Include="Resources\*" />
   </ItemGroup>
   <ItemGroup>
     <None Include="ILRepack.targets" />

resources/explorerui.bundle renamed to src/Resources/explorerui.modern.bundle

@@ -24,6 +24,17 @@ public static AssetBundle LoadFromFile(string path)
 
             return new AssetBundle(ptr);
         }
+        
+        private delegate IntPtr d_LoadFromMemory(IntPtr binary, uint crc);
+
+        public static AssetBundle LoadFromMemory(byte[] binary, uint crc = 0)
+        {
+            var iCall = ICallHelper.GetICall<d_LoadFromMemory>("UnityEngine.AssetBundle::LoadFromMemory_Internal");
+
+            var ptr = iCall(((Il2CppStructArray<byte>) binary).Pointer, crc);
+
+            return new AssetBundle(ptr);
+        }
 
         // ~~~~~~~~~~~~ Instance ~~~~~~~~~~~~