diff --git a/src/plugins/developer-settings/index.ts b/src/plugins/developer-settings/index.ts index 4c995fd..0c4c88a 100644 --- a/src/plugins/developer-settings/index.ts +++ b/src/plugins/developer-settings/index.ts @@ -15,10 +15,7 @@ registerPlugin( { start(api) { pluginApi = api - - onceSettingsModulesLoaded(() => { - require('./register') - }) + onceSettingsModulesLoaded(() => require('./register')) }, }, PluginFlags.Enabled, diff --git a/src/plugins/settings/index.ts b/src/plugins/settings/index.ts index 1e057fc..803e441 100644 --- a/src/plugins/settings/index.ts +++ b/src/plugins/settings/index.ts @@ -1,4 +1,4 @@ -import { type PluginApi, PluginFlags } from '@revenge-mod/plugins' +import { PluginFlags } from '@revenge-mod/plugins' import { InternalPluginFlags, registerPlugin } from '@revenge-mod/plugins/_' import { waitForModules } from '@revenge-mod/modules/finders' @@ -20,12 +20,8 @@ registerPlugin( icon: 'SettingsIcon', }, { - start(api) { - pluginApi = api - - onceSettingsModulesLoaded(() => { - require('./register') - }) + start({ logger }) { + onceSettingsModulesLoaded(() => require('./register')) const unsubForRendererConfig = waitForModules( byProps<{ @@ -34,6 +30,8 @@ registerPlugin( (_, SettingRendererConfig) => { unsubForRendererConfig() + logger.info('Settings modules loaded, running subscriptions and patching...') + for (const sub of _subs) sub() // We don't ever need to call this again _subs.clear() @@ -94,6 +92,3 @@ registerPlugin( PluginFlags.Enabled, InternalPluginFlags.Internal | InternalPluginFlags.Essential, ) - -// Expose to EvaluateJavaScriptSetting -export let pluginApi: PluginApi