chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plugins: Add additional internal load options

Browse Source
This commit is contained in:
Katy Coe
2021-01-12 15:31:24 +01:00
parent c56bd26e4b
commit 356836e6e4
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Il2CppInspector.Common/Plugins/Internal/PluginManager.cs
View File

@@ -170,11 +170,12 @@ namespace Il2CppInspector
public static PluginManager EnsureInit() => AsInstance; public static PluginManager EnsureInit() => AsInstance;
// Find and load all available plugins from disk // Find and load all available plugins from disk
public static void Reload(string pluginPath = null) { public static void Reload(string pluginPath = null, bool reset = true, bool coreOnly = false) {
// Update plugin folder if requested, otherwise use current setting // Update plugin folder if requested, otherwise use current setting
pluginFolder = pluginPath ?? pluginFolder; pluginFolder = pluginPath ?? pluginFolder;
AsInstance.ManagedPlugins.Clear(); if (reset)
AsInstance.ManagedPlugins.Clear();
// Don't allow the user to start the application if there's no plugins folder // Don't allow the user to start the application if there's no plugins folder
if (!Directory.Exists(pluginFolder)) { if (!Directory.Exists(pluginFolder)) {
@@ -212,6 +213,12 @@ namespace Il2CppInspector
foreach (var type in asm.GetTypes()) { foreach (var type in asm.GetTypes()) {
// Current version // Current version
if (typeof(IPlugin).IsAssignableFrom(type) && !type.IsAbstract) { if (typeof(IPlugin).IsAssignableFrom(type) && !type.IsAbstract) {
var isCorePlugin = typeof(ICorePlugin).IsAssignableFrom(type);
if (coreOnly && !isCorePlugin)
continue;
var plugin = (IPlugin) Activator.CreateInstance(type); var plugin = (IPlugin) Activator.CreateInstance(type);
// Don't allow multiple identical plugins to load // Don't allow multiple identical plugins to load
@@ -219,9 +226,7 @@ namespace Il2CppInspector
throw new Exception($"Multiple copies of {plugin.Name} were found. Please ensure the plugins folder only contains one copy of each plugin."); throw new Exception($"Multiple copies of {plugin.Name} were found. Please ensure the plugins folder only contains one copy of each plugin.");
// Enable internal plugins by default // Enable internal plugins by default
var enabled = typeof(ICorePlugin).IsAssignableFrom(type); AsInstance.ManagedPlugins.Add(new ManagedPlugin { Plugin = plugin, Available = true, Enabled = isCorePlugin });
AsInstance.ManagedPlugins.Add(new ManagedPlugin { Plugin = plugin, Available = true, Enabled = enabled });
} }
// Add older versions here with adapters // Add older versions here with adapters

9
Il2CppTests/TestRunner.cs
View File

@@ -51,8 +51,13 @@ namespace Il2CppInspector
loadOptions.BinaryFilePath = testFile; loadOptions.BinaryFilePath = testFile;
// Set up plugins - place desired plugins in 'plugins' sub-folder of test folder // Load core plugins
PluginManager.Reload(testPath + @"\plugins"); PluginManager.Reload(testPath + @"\..\plugins", coreOnly: true);
// Set up additional plugins - place desired plugins in 'plugins' sub-folder of test folder
try {
PluginManager.Reload(testPath + @"\plugins", reset: false);
} catch (DirectoryNotFoundException) { }
// Handlers for debugging output // Handlers for debugging output
PluginManager.StatusHandler += (s, e) => { PluginManager.StatusHandler += (s, e) => {