diff --git a/src/index.ts b/src/index.ts index 8d50297..a7d76b6 100644 --- a/src/index.ts +++ b/src/index.ts @@ -8,9 +8,6 @@ Object.defineProperty(globalThis, '__c', { delete globalThis.__c globalThis.__c = clear - // Patch Metro's core functions - require('@revenge-mod/modules/metro/patches') - require('./preinit') }, }) diff --git a/src/init.ts b/src/init.ts index 0ae64a3..6a28436 100644 --- a/src/init.ts +++ b/src/init.ts @@ -1,10 +1,6 @@ // Initialize init libraries import '@revenge-mod/react/init' -// Run all init plugins -import '~/plugins/init' -import '@revenge-mod/plugins/init' - import { onRunApplication } from '@revenge-mod/react/native' import { onError } from './preinit' @@ -17,3 +13,7 @@ const unsub = onRunApplication(() => { onError(e) } }) + +// Run all init plugins +require('~/plugins/init') +require('@revenge-mod/plugins/init') diff --git a/src/preinit.ts b/src/preinit.ts index 8ef0ead..3d4c110 100644 --- a/src/preinit.ts +++ b/src/preinit.ts @@ -1,3 +1,4 @@ +import '@revenge-mod/modules/metro/patches' import '@revenge-mod/utils/patches/proxy' import { @@ -22,10 +23,6 @@ onModuleFirstRequired(IndexModuleId, function onIndexRequired() { require('@revenge-mod/assets/preinit') require('@revenge-mod/discord/preinit') - // Run all preinit plugins - require('~/plugins/preinit') - require('@revenge-mod/plugins/preinit') - onModuleInitialized(IndexModuleId, function onIndexInitialized() { if (__DEV__) nativeLoggingHook(`\u001b[31m--- INIT STAGE ---\u001b[0m`, 1) @@ -36,6 +33,10 @@ onModuleFirstRequired(IndexModuleId, function onIndexRequired() { onError(e) } }) + + // Run all preinit plugins + require('~/plugins/preinit') + require('@revenge-mod/plugins/preinit') } catch (e) { onError(e) } diff --git a/src/start.ts b/src/start.ts index 6d55277..4ba08cb 100644 --- a/src/start.ts +++ b/src/start.ts @@ -1,6 +1,6 @@ // Initialize start libraries -require('@revenge-mod/discord/start') +import '@revenge-mod/discord/start' // Run all start plugins -require('~/plugins/start') -require('@revenge-mod/plugins/start') +import '~/plugins/start' +import '@revenge-mod/plugins/start'