Merge branch 'master' of https://github.com/sinai-dev/UnityExplorer

.github/workflows/dotnet.yml

@@ -34,53 +34,59 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: UnityExplorer.BepInEx.IL2CPP.zip
-          path: ./Release/UnityExplorer.BepInEx.IL2CPP.zip
+          path: ./Release/UnityExplorer.BepInEx.IL2CPP/
+      
+      # BepInEx IL2CPP CoreCLR
+      - uses: actions/upload-artifact@v2
+        with:
+          name: UnityExplorer.BepInEx.IL2CPP.CoreCLR.zip
+          path: ./Release/UnityExplorer.BepInEx.IL2CPP.CoreCLR/
      
       # BepInEx 5 Mono
       - uses: actions/upload-artifact@v2
         with:
           name: UnityExplorer.BepInEx5.Mono.zip
-          path: ./Release/UnityExplorer.BepInEx5.Mono.zip
+          path: ./Release/UnityExplorer.BepInEx5.Mono/
       
       # BepInEx 6 Mono
       - uses: actions/upload-artifact@v2
         with:
           name: UnityExplorer.BepInEx6.Mono.zip
-          path: ./Release/UnityExplorer.BepInEx6.Mono.zip
+          path: ./Release/UnityExplorer.BepInEx6.Mono/
       
       # Editor
       - uses: actions/upload-artifact@v2
         with:
           name: UnityExplorer.Editor.zip
-          path: ./Release/UnityExplorer.Editor.zip
+          path: ./UnityEditorPackage/
       
       # MelonLoader IL2CPP net6preview
       - uses: actions/upload-artifact@v2
         with:
           name: UnityExplorer.MelonLoader.IL2CPP.net6preview.zip
-          path: ./Release/UnityExplorer.MelonLoader.IL2CPP.net6preview.zip
+          path: ./Release/UnityExplorer.MelonLoader.IL2CPP.net6preview/
       
       # MelonLoader IL2CPP net472
       - uses: actions/upload-artifact@v2
         with:
           name: UnityExplorer.MelonLoader.IL2CPP.zip
-          path: ./Release/UnityExplorer.MelonLoader.IL2CPP.zip
+          path: ./Release/UnityExplorer.MelonLoader.IL2CPP/
       
       # MelonLoader Mono
       - uses: actions/upload-artifact@v2
         with:
           name: UnityExplorer.MelonLoader.Mono.zip
-          path: ./Release/UnityExplorer.MelonLoader.Mono.zip
+          path: ./Release/UnityExplorer.MelonLoader.Mono/
       
       # Standalone Il2Cpp
       - uses: actions/upload-artifact@v2
         with:
           name: UnityExplorer.Standalone.IL2CPP.zip
-          path: ./Release/UnityExplorer.Standalone.IL2CPP.zip
+          path: ./Release/UnityExplorer.Standalone.IL2CPP/
       
       # Standalone Mono
       - uses: actions/upload-artifact@v2
         with:
           name: UnityExplorer.Standalone.Mono.zip
-          path: ./Release/UnityExplorer.Standalone.Mono.zip
+          path: ./Release/UnityExplorer.Standalone.Mono/
       

README.md

@@ -29,6 +29,7 @@ Nightly builds can be found [here](https://github.com/sinai-dev/UnityExplorer/ac
 | Release | IL2CPP | Mono |
 | ------- | ------ | ---- |
 | BIE 6.X | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx.IL2CPP.zip) | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx6.Mono.zip) |
+| BIE 6.X (CoreCLR) | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx.IL2CPP.CoreCLR.zip) | ✖ |
 | BIE 5.X | ✖️ n/a | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx5.Mono.zip) |
 
 1. Unzip the release file into a folder

build.ps1

@@ -12,7 +12,7 @@ Remove-Item $Path/UnhollowerBaseLib.dll
 New-Item -Path "$Path" -Name "Mods" -ItemType "directory" -Force
 Move-Item -Path $Path/UnityExplorer.ML.IL2CPP.net6preview.dll -Destination $Path/Mods -Force
 New-Item -Path "$Path" -Name "UserLibs" -ItemType "directory" -Force
-Move-Item -Path $Path/UniverseLib.IL2CPP.dll -Destination $Path/UserLibs -Force
+Move-Item -Path $Path/UniverseLib.IL2CPP.Unhollower.dll -Destination $Path/UserLibs -Force
 # (create zip archive)
 Remove-Item $Path/../UnityExplorer.MelonLoader.IL2CPP.net6preview.zip -ErrorAction SilentlyContinue
 7z a $Path/../UnityExplorer.MelonLoader.IL2CPP.net6preview.zip .\$Path\*
@@ -30,7 +30,7 @@ Remove-Item $Path/UnhollowerBaseLib.dll
 New-Item -Path "$Path" -Name "Mods" -ItemType "directory" -Force
 Move-Item -Path $Path/UnityExplorer.ML.IL2CPP.dll -Destination $Path/Mods -Force
 New-Item -Path "$Path" -Name "UserLibs" -ItemType "directory" -Force
-Move-Item -Path $Path/UniverseLib.IL2CPP.dll -Destination $Path/UserLibs -Force
+Move-Item -Path $Path/UniverseLib.IL2CPP.Unhollower.dll -Destination $Path/UserLibs -Force
 # (create zip archive)
 Remove-Item $Path/../UnityExplorer.MelonLoader.IL2CPP.zip -ErrorAction SilentlyContinue
 7z a $Path/../UnityExplorer.MelonLoader.IL2CPP.zip .\$Path\*
@@ -64,11 +64,32 @@ Remove-Item $Path/UnhollowerBaseLib.dll
 New-Item -Path "$Path" -Name "plugins" -ItemType "directory" -Force
 New-Item -Path "$Path" -Name "plugins/sinai-dev-UnityExplorer" -ItemType "directory" -Force
 Move-Item -Path $Path/UnityExplorer.BIE.IL2CPP.dll -Destination $Path/plugins/sinai-dev-UnityExplorer -Force
-Move-Item -Path $Path/UniverseLib.IL2CPP.dll -Destination $Path/plugins/sinai-dev-UnityExplorer -Force
+Move-Item -Path $Path/UniverseLib.IL2CPP.Unhollower.dll -Destination $Path/plugins/sinai-dev-UnityExplorer -Force
 # (create zip archive)
 Remove-Item $Path/../UnityExplorer.BepInEx.IL2CPP.zip -ErrorAction SilentlyContinue
 7z a $Path/../UnityExplorer.BepInEx.IL2CPP.zip .\$Path\*
 
+# ----------- BepInEx IL2CPP CoreCLR -----------
+dotnet build src/UnityExplorer.sln -c Release_BIE_CoreCLR
+$Path = "Release/UnityExplorer.BepInEx.IL2CPP.CoreCLR"
+# ILRepack
+lib/ILRepack.exe /target:library /lib:lib/net472 /lib:lib/net6/ /lib:lib/interop/ /lib:$Path /internalize /out:$Path/UnityExplorer.BIE.IL2CPP.CoreCLR.dll $Path/UnityExplorer.BIE.IL2CPP.CoreCLR.dll $Path/mcs.dll $Path/Tomlet.dll
+# (cleanup and move files)
+Remove-Item $Path/Tomlet.dll
+Remove-Item $Path/mcs.dll
+Remove-Item $Path/Iced.dll
+Remove-Item $Path/Il2CppInterop.Common.dll
+Remove-Item $Path/Il2CppInterop.Runtime.dll
+Remove-Item $Path/Microsoft.Extensions.Logging.Abstractions.dll
+Remove-Item $Path/UnityExplorer.BIE.IL2CPP.CoreCLR.deps.json
+New-Item -Path "$Path" -Name "plugins" -ItemType "directory" -Force
+New-Item -Path "$Path" -Name "plugins/sinai-dev-UnityExplorer" -ItemType "directory" -Force
+Move-Item -Path $Path/UnityExplorer.BIE.IL2CPP.CoreCLR.dll -Destination $Path/plugins/sinai-dev-UnityExplorer -Force
+Move-Item -Path $Path/UniverseLib.IL2CPP.Interop.dll -Destination $Path/plugins/sinai-dev-UnityExplorer -Force
+# (create zip archive)
+Remove-Item $Path/../UnityExplorer.BepInEx.IL2CPP.CoreCLR.zip -ErrorAction SilentlyContinue
+7z a $Path/../UnityExplorer.BepInEx.IL2CPP.CoreCLR.zip .\$Path\*
+
 # ----------- BepInEx 5 Mono -----------
 dotnet build src/UnityExplorer.sln -c Release_BIE5_Mono
 $Path = "Release/UnityExplorer.BepInEx5.Mono"

src/CSConsole/CSAutoCompleter.cs

@@ -1,13 +1,8 @@
-using System;
+using System.Text;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using UnityExplorer.CSConsole.Lexers;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets.AutoComplete;
-using UniverseLib;
 using UniverseLib.UI.Models;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.CSConsole
 {

src/CSConsole/ConsoleController.cs

@@ -1,23 +1,10 @@
-using HarmonyLib;
+using Mono.CSharp;
-using Mono.CSharp;
-using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
 using System.Text;
-using UnityEngine;
-using UnityEngine.EventSystems;
-using UnityEngine.UI;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
-using UnityExplorer.UI.Widgets.AutoComplete;
-using UniverseLib;
 using UniverseLib.Input;
-using UniverseLib.Runtime;
 using UniverseLib.UI.Models;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.CSConsole
 {

src/CSConsole/LexerBuilder.cs

@@ -1,8 +1,5 @@
-using System;
+using System.Text;
-using System.Collections.Generic;
-using System.Text;
 using UnityExplorer.CSConsole.Lexers;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.CSConsole
 {

src/CSConsole/Lexers/CommentLexer.cs

@@ -1,6 +1,4 @@
-using UnityEngine;
+namespace UnityExplorer.CSConsole.Lexers
-
-namespace UnityExplorer.CSConsole.Lexers
 {
     public class CommentLexer : Lexer
     {

src/CSConsole/Lexers/KeywordLexer.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
+using System.Text;
-using System.Text;
-using UnityEngine;
 
 namespace UnityExplorer.CSConsole.Lexers
 {

src/CSConsole/Lexers/Lexer.cs

@@ -1,9 +1,4 @@
-using System.Collections.Generic;
+namespace UnityExplorer.CSConsole.Lexers
-using System.Linq;
-using UnityEngine;
-using UniverseLib.Utility;
-
-namespace UnityExplorer.CSConsole.Lexers
 {
     public abstract class Lexer
     {

src/CSConsole/Lexers/NumberLexer.cs

@@ -1,6 +1,4 @@
-using UnityEngine;
+namespace UnityExplorer.CSConsole.Lexers
-
-namespace UnityExplorer.CSConsole.Lexers
 {
     public class NumberLexer : Lexer
     {

src/CSConsole/Lexers/StringLexer.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
+namespace UnityExplorer.CSConsole.Lexers
-using UnityEngine;
-
-namespace UnityExplorer.CSConsole.Lexers
 {
     public class StringLexer : Lexer
     {

src/CSConsole/Lexers/SymbolLexer.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
+namespace UnityExplorer.CSConsole.Lexers
-using System.Linq;
-using UnityEngine;
-
-namespace UnityExplorer.CSConsole.Lexers
 {
     public class SymbolLexer : Lexer
     {

src/CSConsole/ScriptEvaluator.cs

@@ -1,8 +1,4 @@
 using Mono.CSharp;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
 using UnityExplorer.Config;
 
 // Thanks to ManlyMarco for this

src/CSConsole/ScriptInteraction.cs

@@ -1,12 +1,8 @@
 using HarmonyLib;
 using Mono.CSharp;
-using System;
 using System.Collections;
-using System.Linq;
 using System.Text;
-using UnityEngine;
 using UnityExplorer.UI.Panels;
-using UniverseLib;
 
 namespace UnityExplorer.CSConsole
 {

src/CacheObject/CacheConstructor.cs

@@ -1,7 +1,4 @@
-using System;
+using UnityExplorer.Inspectors;
-using System.Reflection;
-using UnityExplorer.Inspectors;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject
 {

src/CacheObject/CacheField.cs

@@ -1,6 +1,4 @@
-using System;
+using UnityExplorer.Inspectors;
-using System.Reflection;
-using UnityExplorer.Inspectors;
 
 namespace UnityExplorer.CacheObject
 {

src/CacheObject/CacheKeyValuePair.cs

@@ -1,8 +1,5 @@
-using System;
+using UnityExplorer.CacheObject.IValues;
-using UnityExplorer.CacheObject.IValues;
 using UnityExplorer.CacheObject.Views;
-using UniverseLib;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject
 {

src/CacheObject/CacheMember.cs

@@ -1,12 +1,7 @@
-using System;
+using UnityExplorer.CacheObject.Views;
-using System.Reflection;
-using UnityEngine;
-using UnityExplorer.CacheObject.Views;
 using UnityExplorer.Inspectors;
 using UnityExplorer.UI.Widgets;
-using UniverseLib;
 using UniverseLib.UI.ObjectPool;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject
 {

src/CacheObject/CacheMemberFactory.cs

@@ -1,11 +1,6 @@
 using HarmonyLib;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
 using UnityExplorer.Inspectors;
 using UnityExplorer.Runtime;
-using UniverseLib;
 
 namespace UnityExplorer.CacheObject
 {

src/CacheObject/CacheMethod.cs

@@ -1,7 +1,4 @@
-using System;
+using UnityExplorer.Inspectors;
-using System.Reflection;
-using UnityExplorer.Inspectors;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject
 {

src/CacheObject/CacheObjectBase.cs

@@ -1,12 +1,8 @@
-using System;
+using System.Collections;
-using System.Collections;
-using UnityEngine;
 using UnityExplorer.CacheObject.IValues;
 using UnityExplorer.CacheObject.Views;
-using UniverseLib;
 using UniverseLib.UI;
 using UniverseLib.UI.ObjectPool;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject
 {

src/CacheObject/CacheProperty.cs

@@ -1,6 +1,4 @@
-using System;
+using UnityExplorer.Inspectors;
-using System.Reflection;
-using UnityExplorer.Inspectors;
 
 namespace UnityExplorer.CacheObject
 {

src/CacheObject/ICacheObjectController.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections;
-using System.Collections;
 using UnityExplorer.CacheObject.Views;
 
 namespace UnityExplorer.CacheObject

src/CacheObject/IValues/InteractiveColor.cs

@@ -1,9 +1,5 @@
-using System;
+using UniverseLib.UI;
-using UnityEngine;
-using UnityEngine.UI;
-using UniverseLib.UI;
 using UniverseLib.UI.Models;
-using UniverseLib;
 
 namespace UnityExplorer.CacheObject.IValues
 {

src/CacheObject/IValues/InteractiveDictionary.cs

@@ -1,14 +1,8 @@
-using System;
+using System.Collections;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
 using UnityExplorer.CacheObject.Views;
 using UnityExplorer.UI.Panels;
-using UniverseLib;
 using UniverseLib.UI;
 using UniverseLib.UI.Widgets.ScrollView;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject.IValues
 {

src/CacheObject/IValues/InteractiveEnum.cs

@@ -1,14 +1,8 @@
-using System;
+using System.Collections.Specialized;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using UnityEngine;
-using UnityEngine.UI;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets.AutoComplete;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject.IValues
 {

src/CacheObject/IValues/InteractiveList.cs

@@ -1,16 +1,8 @@
-using System;
+using System.Collections;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using UnityEngine;
-using UnityEngine.UI;
 using UnityExplorer.CacheObject.Views;
 using UnityExplorer.UI.Panels;
-using UniverseLib;
 using UniverseLib.UI;
 using UniverseLib.UI.Widgets.ScrollView;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject.IValues
 {

src/CacheObject/IValues/InteractiveString.cs

@@ -1,10 +1,6 @@
-using System.IO;
+using UnityExplorer.Config;
-using UnityEngine;
-using UnityEngine.UI;
-using UnityExplorer.Config;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject.IValues
 {

src/CacheObject/IValues/InteractiveValue.cs

@@ -1,6 +1,4 @@
-using System;
+using UniverseLib.UI.ObjectPool;
-using UnityEngine;
-using UniverseLib.UI.ObjectPool;
 
 namespace UnityExplorer.CacheObject.IValues
 {

src/CacheObject/IValues/InteractiveValueStruct.cs

@@ -1,13 +1,5 @@
-using System;
+using UniverseLib.UI;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using UnityEngine;
-using UnityEngine.UI;
-using UniverseLib;
-using UniverseLib.UI;
 using UniverseLib.UI.Models;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject.IValues
 {

src/CacheObject/Views/CacheConfigCell.cs

@@ -1,8 +1,4 @@
-using UnityEngine;
+using UniverseLib.UI;
-using UnityEngine.UI;
-using UniverseLib.UI;
-using UniverseLib.Utility;
-using UniverseLib;
 
 namespace UnityExplorer.CacheObject.Views
 {

src/CacheObject/Views/CacheKeyValuePairCell.cs

@@ -1,6 +1,4 @@
-using UnityEngine;
+using UnityExplorer.CacheObject.IValues;
-using UnityEngine.UI;
-using UnityExplorer.CacheObject.IValues;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
 

src/CacheObject/Views/CacheListEntryCell.cs

@@ -1,6 +1,4 @@
-using UnityEngine;
+using UnityExplorer.CacheObject.IValues;
-using UnityEngine.UI;
-using UnityExplorer.CacheObject.IValues;
 
 namespace UnityExplorer.CacheObject.Views
 {

src/CacheObject/Views/CacheMemberCell.cs

@@ -1,6 +1,4 @@
-using UnityEngine;
+using UniverseLib.UI;
-using UnityEngine.UI;
-using UniverseLib.UI;
 using UniverseLib.UI.Models;
 
 namespace UnityExplorer.CacheObject.Views

src/CacheObject/Views/CacheObjectCell.cs

@@ -1,11 +1,7 @@
-using UnityEngine;
+using UnityExplorer.UI.Panels;
-using UnityEngine.UI;
-using UnityExplorer.UI.Panels;
-using UniverseLib;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
 using UniverseLib.UI.Widgets.ScrollView;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.CacheObject.Views
 {

src/Config/ConfigElement.cs

@@ -1,6 +1,4 @@
-using System;
+namespace UnityExplorer.Config
-
-namespace UnityExplorer.Config
 {
     public class ConfigElement<T> : IConfigElement
     {

src/Config/ConfigManager.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
+using UnityExplorer.UI;
-using System.IO;
-using UnityEngine;
-using UnityExplorer.UI;
 
 namespace UnityExplorer.Config
 {

src/Config/IConfigElement.cs

@@ -1,6 +1,4 @@
-using System;
+namespace UnityExplorer.Config
-
-namespace UnityExplorer.Config
 {
     public interface IConfigElement
     {

src/Config/InternalConfigHandler.cs

@@ -1,7 +1,4 @@
-using System;
+using Tomlet;
-using System.Collections.Generic;
-using System.IO;
-using Tomlet;
 using Tomlet.Models;
 using UnityExplorer.UI;
 

src/ExplorerBehaviour.cs

@@ -1,10 +1,10 @@
-using System;
+using UnityExplorer.UI;
-using System.Reflection;
-using UnityEngine;
-using UnityExplorer.UI;
-using UniverseLib;
 #if CPP
+#if UNHOLLOWER
 using UnhollowerRuntimeLib;
+#else
+using Il2CppInterop.Runtime.Injection;
+#endif
 #endif
 
 namespace UnityExplorer

src/ExplorerCore.cs

@@ -1,12 +1,17 @@
-using System;
+global using System;
-using System.IO;
+global using System.Collections.Generic;
-using UnityEngine;
+global using System.IO;
+global using System.Linq;
+global using System.Reflection;
+global using UnityEngine;
+global using UnityEngine.UI;
+global using UniverseLib;
+global using UniverseLib.Utility;
 using UnityExplorer.Config;
 using UnityExplorer.ObjectExplorer;
 using UnityExplorer.Runtime;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
-using UniverseLib;
 using UniverseLib.Input;
 
 namespace UnityExplorer
@@ -14,7 +19,7 @@ namespace UnityExplorer
     public static class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "4.8.1";
+        public const string VERSION = "4.9.0";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
 
@@ -72,7 +77,9 @@ namespace UnityExplorer
         {
             // check master toggle
             if (InputManager.GetKeyDown(ConfigManager.Master_Toggle.Value))
+            {
                 UIManager.ShowMenu = !UIManager.ShowMenu;
+            }
         }
 
 

src/Hooks/AddHookCell.cs

@@ -1,6 +1,4 @@
-using UnityEngine;
+using UniverseLib.UI;
-using UnityEngine.UI;
-using UniverseLib.UI;
 using UniverseLib.UI.Models;
 using UniverseLib.UI.Widgets.ScrollView;
 

src/Hooks/HookCell.cs

@@ -1,7 +1,4 @@
-using UnityEngine;
+using UniverseLib.UI;
-using UnityEngine.UI;
-using UnityExplorer.UI.Panels;
-using UniverseLib.UI;
 using UniverseLib.UI.Models;
 using UniverseLib.UI.Widgets.ScrollView;
 

src/Hooks/HookCreator.cs

@@ -1,20 +1,12 @@
 using HarmonyLib;
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using UnityEngine;
-using UnityEngine.UI;
 using UnityExplorer.CSConsole;
 using UnityExplorer.Runtime;
 using UnityExplorer.UI.Panels;
-using UnityExplorer.UI.Widgets;
 using UnityExplorer.UI.Widgets.AutoComplete;
-using UniverseLib;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
 using UniverseLib.UI.Widgets;
 using UniverseLib.UI.Widgets.ScrollView;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.Hooks
 {

src/Hooks/HookInstance.cs

@@ -1,13 +1,7 @@
 using HarmonyLib;
 using Mono.CSharp;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
 using System.Text;
 using UnityExplorer.CSConsole;
-using UniverseLib;
 
 namespace UnityExplorer.Hooks
 {

src/Hooks/HookList.cs

@@ -1,15 +1,8 @@
 using HarmonyLib;
-using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
-using UnityEngine;
-using UnityEngine.UI;
 using UnityExplorer.UI.Panels;
-using UniverseLib;
 using UniverseLib.UI;
-using UniverseLib.UI.Models;
 using UniverseLib.UI.Widgets.ScrollView;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.Hooks
 {

src/Inspectors/GameObjectInspector.cs

@@ -1,18 +1,11 @@
-using System;
+using System.Collections;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEngine;
-using UnityEngine.UI;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
 using UnityExplorer.UI.Widgets.AutoComplete;
-using UniverseLib;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
 using UniverseLib.UI.Widgets;
 using UniverseLib.UI.Widgets.ScrollView;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.Inspectors
 {

src/Inspectors/InspectorBase.cs

@@ -1,8 +1,4 @@
-using System;
+using UnityExplorer.UI.Panels;
-using UnityEngine;
-using UnityEngine.UI;
-using UnityExplorer.UI.Panels;
-using UniverseLib;
 using UniverseLib.UI.ObjectPool;
 
 namespace UnityExplorer.Inspectors

src/Inspectors/InspectorManager.cs

@@ -1,14 +1,8 @@
-using System;
+using UnityExplorer.CacheObject;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEngine;
-using UnityExplorer.CacheObject;
 using UnityExplorer.Inspectors;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
-using UniverseLib;
 using UniverseLib.UI.ObjectPool;
-using UniverseLib.Utility;
 
 namespace UnityExplorer
 {

src/Inspectors/InspectorTab.cs

@@ -1,7 +1,4 @@
-using UnityEngine;
+using UniverseLib.UI;
-using UnityEngine.UI;
-using UniverseLib;
-using UniverseLib.UI;
 using UniverseLib.UI.Models;
 using UniverseLib.UI.ObjectPool;
 

src/Inspectors/MouseInspector.cs

@@ -1,13 +1,10 @@
-using UnityEngine;
+using UnityExplorer.Config;
-using UnityEngine.UI;
-using UnityExplorer.Config;
 using UnityExplorer.Inspectors.MouseInspectors;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
 using UniverseLib.Input;
 using UniverseLib.UI;
 using UniverseLib.UI.Panels;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.Inspectors
 {

src/Inspectors/MouseInspectors/MouseInspectorBase.cs

@@ -1,6 +1,4 @@
-using UnityEngine;
+namespace UnityExplorer.Inspectors.MouseInspectors
-
-namespace UnityExplorer.Inspectors.MouseInspectors
 {
     public abstract class MouseInspectorBase
     {

src/Inspectors/MouseInspectors/UiInspector.cs

@@ -1,12 +1,7 @@
 using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEngine;
 using UnityEngine.EventSystems;
-using UnityEngine.UI;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
-using UniverseLib;
 
 namespace UnityExplorer.Inspectors.MouseInspectors
 {

src/Inspectors/MouseInspectors/WorldInspector.cs

@@ -1,7 +1,4 @@
-using UnityEngine;
+namespace UnityExplorer.Inspectors.MouseInspectors
-using UniverseLib.Utility;
-
-namespace UnityExplorer.Inspectors.MouseInspectors
 {
     public class WorldInspector : MouseInspectorBase
     {

src/Inspectors/ReflectionInspector.cs

@@ -1,24 +1,16 @@
-using System;
+using System.Collections;
-using System.Collections;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
-using System.Reflection;
 using System.Reflection.Emit;
-using UnityEngine;
-using UnityEngine.UI;
 using UnityExplorer.CacheObject;
 using UnityExplorer.CacheObject.Views;
 using UnityExplorer.Config;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
-using UniverseLib;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
 using UniverseLib.UI.ObjectPool;
 using UniverseLib.UI.Widgets.ScrollView;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.Inspectors
 {

src/Loader/BepInEx/BepInExConfigHandler.cs

@@ -1,7 +1,5 @@
 #if BIE
 using BepInEx.Configuration;
-using System;
-using System.Collections.Generic;
 using UnityExplorer.Config;
 
 namespace UnityExplorer.Loader.BIE

src/Loader/BepInEx/ExplorerBepInPlugin.cs

@@ -2,13 +2,10 @@
 using BepInEx;
 using BepInEx.Logging;
 using HarmonyLib;
-using System;
-using System.IO;
 using UnityExplorer.Config;
 using UnityExplorer.Loader.BIE;
 #if CPP
 using BepInEx.IL2CPP;
-using UnhollowerRuntimeLib;
 #endif
 
 namespace UnityExplorer
@@ -31,8 +28,14 @@ namespace UnityExplorer
 #else
             => Log;
 #endif
-
+        const string IL2CPP_LIBS_FOLDER =
-        public string UnhollowedModulesFolder => Path.Combine(Paths.BepInExRootPath, "unhollowed");
+#if UNHOLLOWER
+            "unhollowed"
+#else
+            "interop"
+#endif
+            ;
+        public string UnhollowedModulesFolder => Path.Combine(Paths.BepInExRootPath, IL2CPP_LIBS_FOLDER);
 
         public ConfigHandler ConfigHandler => _configHandler;
         private BepInExConfigHandler _configHandler;

src/Loader/IExplorerLoader.cs

@@ -1,5 +1,4 @@
-using System;
+using UnityExplorer.Config;
-using UnityExplorer.Config;
 
 namespace UnityExplorer
 {

src/ObjectExplorer/ObjectSearch.cs

@@ -1,16 +1,9 @@
-using System;
+using UnityExplorer.UI.Panels;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEngine;
-using UnityEngine.UI;
-using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets.AutoComplete;
-using UniverseLib;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
 using UniverseLib.UI.Widgets.ButtonList;
 using UniverseLib.UI.Widgets.ScrollView;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.ObjectExplorer
 {

src/ObjectExplorer/SceneExplorer.cs

@@ -1,18 +1,9 @@
-using System;
+using System.Collections;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using UnityEngine;
 using UnityEngine.SceneManagement;
-using UnityEngine.UI;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
-using UnityExplorer.UI.Widgets;
-using UniverseLib;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
-using UniverseLib.Utility;
 using UniverseLib.UI.Widgets;
 
 namespace UnityExplorer.ObjectExplorer

src/ObjectExplorer/SceneHandler.cs

@@ -1,9 +1,4 @@
-using System;
+using UnityEngine.SceneManagement;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEngine;
-using UnityEngine.SceneManagement;
-using UniverseLib;
 
 namespace UnityExplorer.ObjectExplorer
 {

src/ObjectExplorer/SearchProvider.cs

@@ -1,11 +1,4 @@
-using System;
+using UnityEngine.SceneManagement;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using UnityEngine;
-using UnityEngine.SceneManagement;
-using UniverseLib;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.ObjectExplorer
 {

src/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
-using System.Reflection;
+using System.Runtime.InteropServices;
-using System.Runtime.InteropServices;
 using UnityExplorer;
 
 // General Information about an assembly is controlled through the following

src/Runtime/MonoHelper.cs

@@ -1,5 +1,4 @@
 #if MONO
-using UnityEngine;
 
 namespace UnityExplorer.Runtime
 {

src/Runtime/UERuntimeHelper.cs

@@ -1,9 +1,4 @@
-using System;
+using UnityExplorer.Config;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using UnityExplorer.Config;
-using UniverseLib;
 
 namespace UnityExplorer.Runtime
 {

src/Runtime/UnityCrashPrevention.cs

@@ -1,10 +1,4 @@
-using System;
+namespace UnityExplorer.Runtime
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using UnityEngine;
-
-namespace UnityExplorer.Runtime
 {
     internal static class UnityCrashPrevention
     {

src/Tests/TestClass.cs

@@ -1,12 +1,13 @@
-using System;
+using System.Collections;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-using UnityEngine;
 #if CPP
+#if INTEROP
+using Il2CppInterop.Runtime.InteropTypes.Arrays;
+using Il2CppInterop.Runtime;
+#else
 using UnhollowerRuntimeLib;
 using UnhollowerBaseLib;
 #endif
+#endif
 
 namespace UnityExplorer.Tests
 {
@@ -257,7 +258,7 @@ namespace UnityExplorer.Tests
             }
 
             ExplorerCore.Log($"IL2CPP 9: Il2Cpp struct array of ints");
-            IL2CPP_structArray = new UnhollowerBaseLib.Il2CppStructArray<int>(5);
+            IL2CPP_structArray = new Il2CppStructArray<int>(5);
             IL2CPP_structArray[0] = 0;
             IL2CPP_structArray[1] = 1;
             IL2CPP_structArray[2] = 2;
@@ -265,7 +266,7 @@ namespace UnityExplorer.Tests
             IL2CPP_structArray[4] = 4;
 
             ExplorerCore.Log($"IL2CPP 10: Il2Cpp reference array of boxed objects");
-            IL2CPP_ReferenceArray = new UnhollowerBaseLib.Il2CppReferenceArray<Il2CppSystem.Object>(3);
+            IL2CPP_ReferenceArray = new Il2CppReferenceArray<Il2CppSystem.Object>(3);
             IL2CPP_ReferenceArray[0] = new Il2CppSystem.Int32 { m_value = 5 }.BoxIl2CppObject();
             IL2CPP_ReferenceArray[1] = null;
             IL2CPP_ReferenceArray[2] = (Il2CppSystem.String)"whats up";

src/UI/DisplayManager.cs

@@ -1,7 +1,5 @@
 using System.Collections;
-using UnityEngine;
 using UnityExplorer.Config;
-using UniverseLib;
 using UniverseLib.Input;
 
 namespace UnityExplorer.UI

src/UI/ExplorerUIBase.cs

@@ -1,8 +1,4 @@
-using System;
+using UniverseLib.UI;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using UniverseLib.UI;
 using UniverseLib.UI.Panels;
 
 namespace UnityExplorer.UI

src/UI/Notification.cs

@@ -1,6 +1,4 @@
-using UnityEngine;
+using UniverseLib.UI;
-using UnityEngine.UI;
-using UniverseLib.UI;
 
 namespace UnityExplorer.UI
 {

src/UI/Panels/AutoCompleteModal.cs

@@ -1,17 +1,9 @@
-using System;
+using UnityExplorer.UI.Widgets.AutoComplete;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEngine;
-using UnityEngine.UI;
-using UnityExplorer.UI.Panels;
-using UnityExplorer.UI.Widgets.AutoComplete;
-using UniverseLib;
 using UniverseLib.Input;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
 using UniverseLib.UI.Widgets.ButtonList;
 using UniverseLib.UI.Widgets.ScrollView;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Panels
 {

src/UI/Panels/CSConsolePanel.cs

@@ -1,9 +1,5 @@
-using System;
+using System.Collections;
-using System.Collections;
-using UnityEngine;
-using UnityEngine.UI;
 using UnityExplorer.CSConsole;
-using UniverseLib;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
 using UniverseLib.UI.Widgets;

src/UI/Panels/ClipboardPanel.cs

@@ -1,9 +1,4 @@
-using System;
+using UniverseLib.UI;
-using UnityEngine;
-using UnityEngine.UI;
-using UniverseLib;
-using UniverseLib.UI;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Panels
 {

src/UI/Panels/FreeCamPanel.cs

@@ -1,17 +1,12 @@
-using HarmonyLib;
+using UniverseLib.Input;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using UnityEngine;
-using UnityEngine.EventSystems;
-using UnityEngine.UI;
-using UniverseLib;
-using UniverseLib.Input;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
-using UniverseLib.Utility;
+#if UNHOLLOWER
+using UnhollowerRuntimeLib;
+#endif
+#if INTEROP
+using Il2CppInterop.Runtime.Injection;
+#endif
 
 namespace UnityExplorer.UI.Panels
 {
@@ -335,7 +330,7 @@ namespace UnityExplorer.UI.Panels
 #if CPP
         static FreeCamBehaviour()
         {
-            UnhollowerRuntimeLib.ClassInjector.RegisterTypeInIl2Cpp<FreeCamBehaviour>();
+            ClassInjector.RegisterTypeInIl2Cpp<FreeCamBehaviour>();
         }
 
         public FreeCamBehaviour(IntPtr ptr) : base(ptr) { }

src/UI/Panels/HookManagerPanel.cs

@@ -1,14 +1,6 @@
-using System;
+using UnityExplorer.Hooks;
-using UnityEngine;
-using UnityEngine.UI;
-using UnityExplorer.Hooks;
 using UnityExplorer.UI.Widgets;
-using UnityExplorer.UI.Widgets.AutoComplete;
-using UniverseLib;
 using UniverseLib.UI;
-using UniverseLib.UI.Models;
-using UniverseLib.UI.Widgets;
-using UniverseLib.UI.Widgets.ScrollView;
 
 namespace UnityExplorer.UI.Panels
 {

src/UI/Panels/InspectorPanel.cs

@@ -1,6 +1,4 @@
-using UnityEngine;
+using UnityExplorer.Inspectors;
-using UnityEngine.UI;
-using UnityExplorer.Inspectors;
 using UniverseLib.UI;
 
 namespace UnityExplorer.UI.Panels

src/UI/Panels/LogPanel.cs

@@ -1,16 +1,8 @@
-using System;
+using System.Diagnostics;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using UnityEngine;
-using UnityEngine.UI;
 using UnityExplorer.Config;
-using UniverseLib;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
 using UniverseLib.UI.Widgets.ScrollView;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Panels
 {

src/UI/Panels/MouseInspectorResultsPanel.cs

@@ -1,10 +1,7 @@
-using System.Collections.Generic;
+using UnityExplorer.Inspectors.MouseInspectors;
-using UnityEngine;
-using UnityExplorer.Inspectors.MouseInspectors;
 using UniverseLib.UI;
 using UniverseLib.UI.Widgets.ButtonList;
 using UniverseLib.UI.Widgets.ScrollView;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Panels
 {

src/UI/Panels/ObjectExplorerPanel.cs

@@ -1,9 +1,4 @@
-using System;
+using UnityExplorer.ObjectExplorer;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEngine;
-using UnityExplorer.ObjectExplorer;
-using UniverseLib;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
 

src/UI/Panels/OptionsPanel.cs

@@ -1,7 +1,4 @@
-using System;
+using UnityExplorer.CacheObject;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityExplorer.CacheObject;
 using UnityExplorer.CacheObject.Views;
 using UnityExplorer.Config;
 using UniverseLib.UI;

src/UI/Panels/UEPanel.cs

@@ -1,12 +1,5 @@
-using System;
+using System.Globalization;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using UnityEngine;
-using UnityEngine.UI;
 using UnityExplorer.Config;
-using UniverseLib;
-using UniverseLib.Input;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
 using UniverseLib.UI.Panels;

src/UI/Panels/UEPanelDragger.cs

@@ -1,12 +1,4 @@
-using System;
+using UniverseLib.UI.Panels;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-using UnityExplorer.UI.Widgets.AutoComplete;
-using UniverseLib.Input;
-using UniverseLib.UI;
-using UniverseLib.UI.Panels;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Panels
 {

src/UI/UEPanelManager.cs

@@ -1,9 +1,4 @@
-using System;
+using UnityExplorer.UI.Panels;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using UnityEngine;
-using UnityExplorer.UI.Panels;
 using UniverseLib.UI;
 using UniverseLib.UI.Panels;
 

src/UI/UIManager.cs

@@ -1,19 +1,11 @@
-using System.Collections.Generic;
+using UnityExplorer.Config;
-using UnityEngine;
-using UnityEngine.UI;
-using UnityExplorer.Config;
 using UnityExplorer.CSConsole;
 using UnityExplorer.Inspectors;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
-using UnityExplorer.UI.Widgets.AutoComplete;
-using UniverseLib;
 using UniverseLib.Input;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
-using UniverseLib.UI.Panels;
-using UniverseLib.UI.Widgets.ScrollView;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.UI
 {

src/UI/Widgets/AutoComplete/EnumCompleter.cs

@@ -1,10 +1,7 @@
-using System;
+using System.Collections.Specialized;
-using System.Collections.Generic;
-using System.Collections.Specialized;
 using UnityExplorer.CacheObject.IValues;
 using UnityExplorer.UI.Panels;
 using UniverseLib.UI.Models;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Widgets.AutoComplete
 {

src/UI/Widgets/AutoComplete/TypeCompleter.cs

@@ -1,13 +1,7 @@
-using System;
+using System.Collections;
-using System.Collections;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using UnityEngine;
 using UnityExplorer.UI.Panels;
-using UniverseLib;
 using UniverseLib.UI.Models;
-using UniverseLib.Utility;
 
 namespace UnityExplorer.UI.Widgets.AutoComplete
 {

src/UI/Widgets/EvaluateWidget/BaseArgumentHandler.cs

@@ -1,6 +1,4 @@
-using UnityEngine;
+using UnityExplorer.UI.Widgets.AutoComplete;
-using UnityEngine.UI;
-using UnityExplorer.UI.Widgets.AutoComplete;
 using UniverseLib.UI;
 using UniverseLib.UI.Models;
 using UniverseLib.UI.ObjectPool;