3.1.5

* Integrate PR from js6pak

README.md

@@ -49,15 +49,14 @@
 
 0. Install [BepInEx](https://github.com/BepInEx/BepInEx) for your game.
 1. Download the UnityExplorer release for BepInEx IL2CPP or Mono above.
-2. Take the `UnityExplorer.dll` file and put it in `[GameFolder]\BepInEx\plugins\`
-3. Take the `UnityExplorer\` folder (with `explorerui.bundle`) and put it in `[GameFolder]\Mods\`, so it looks like `[GameFolder]\Mods\UnityExplorer\explorerui.bundle`.
-4. In IL2CPP, it is highly recommended to get the base Unity libs for the game's Unity version and put them in the `BepInEx\unhollowed\base\` folder. 
+2. Take the `UnityExplorer.BIE.___.dll` file and put it in `[GameFolder]\BepInEx\plugins\`
+3. In IL2CPP, it is highly recommended to get the base Unity libs for the game's Unity version and put them in the `BepInEx\unhollowed\base\` folder. 
 
 ### MelonLoader
 
 0. Install [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) for your game.
 1. Download the UnityExplorer release for MelonLoader IL2CPP or Mono above.
-2. Take the contents of the release and put it in the `[GameFolder]\Mods\` folder. It should look like `[GameFolder]\Mods\UnityExplorer.dll` and `[GameFolder]\Mods\UnityExplorer\explorerui.bundle`.
+2. Take the contents of the release and put it in the `[GameFolder]\Mods\` folder. It should look like `[GameFolder]\Mods\UnityExplorer.ML.___.dll`
 
 ## Mod Config
 

src/Config/ModConfig.cs

@@ -11,7 +11,7 @@ namespace UnityExplorer.Config
         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/ExplorerCore.cs

@@ -16,10 +16,15 @@ namespace UnityExplorer
     public class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "3.1.4";
+        public const string VERSION = "3.1.5";
         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(BepInEx.Paths.ConfigPath, "UnityExplorer");
+#endif
 
         public static ExplorerCore Instance { get; private set; }
 

src/Helpers/Texture2DHelpers.cs

@@ -70,7 +70,12 @@ namespace UnityExplorer.Helpers
 
             pixels = orig.GetPixels((int)rect.x, (int)rect.y, (int)rect.width, (int)rect.height);
 
+            // use full constructor for better compatibility
+#if CPP
+            var _newTex = new Texture2D((int)rect.width, (int)rect.height, TextureFormat.RGBA32, Texture.GenerateAllMips, false, IntPtr.Zero);
+#else
             var _newTex = new Texture2D((int)rect.width, (int)rect.height);
+#endif
             _newTex.SetPixels(pixels);
 
             return _newTex;

src/UI/UIManager.cs

@@ -88,33 +88,66 @@ namespace UnityExplorer.UI
             }
         }
 
+        private static AssetBundle LoadExplorerUi(string id)
+        {
+            return AssetBundle.LoadFromMemory(ReadFully(typeof(ExplorerCore).Assembly.GetManifestResourceStream($"UnityExplorer.Resources.explorerui.{id}.bundle")));
+        }
+
+        private static byte[] ReadFully(this Stream input)
+        {
+            using (var ms = new MemoryStream())
+            {
+                byte[] buffer = new byte[81920];
+                int read;
+                while ((read = input.Read(buffer, 0, buffer.Length)) != 0)
+                    ms.Write(buffer, 0, read);
+
+                return ms.ToArray();
+            }
+        }
+
         private static void LoadBundle()
         {
-            var bundlePath = ExplorerCore.EXPLORER_FOLDER + @"\explorerui.bundle";
-            if (File.Exists(bundlePath))
+            AssetBundle bundle = null;
+
+            try
             {
-                var bundle = AssetBundle.LoadFromFile(bundlePath);
-
-                BackupShader = bundle.LoadAsset<Shader>("DefaultUI");
-
-                // Fix for games which don't ship with 'UI/Default' shader.
-                if (Graphic.defaultGraphicMaterial.shader?.name != "UI/Default")
-                {
-                    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");
+                bundle = LoadExplorerUi("modern");
             }
-            else
+            catch
             {
-                ExplorerCore.LogWarning("Could not find the ExplorerUI Bundle! It should exist at '" + bundlePath + "'");
+                ExplorerCore.Log("Failed to load modern ExplorerUI Bundle, falling back to legacy");
+
+                try
+                {
+                    bundle = LoadExplorerUi("legacy");
+                }
+                catch
+                {
+                    // ignored
+                }
+            }
+
+            if (bundle == null)
+            {
+                ExplorerCore.LogWarning("Could not load the ExplorerUI Bundle!");
                 return;
             }
+
+            BackupShader = bundle.LoadAsset<Shader>("DefaultUI");
+
+            // Fix for games which don't ship with 'UI/Default' shader.
+            if (Graphic.defaultGraphicMaterial.shader?.name != "UI/Default")
+            {
+                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()

src/UnityExplorer.csproj

@@ -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" />

src/Unstrip/AssetBundleUnstrip.cs

@@ -24,6 +24,17 @@ namespace UnityExplorer.Unstrip
 
             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 ~~~~~~~~~~~~