diff --git a/hmm.json b/hmm.json index 15206ba7d..1a1e8ae80 100644 --- a/hmm.json +++ b/hmm.json @@ -149,7 +149,7 @@ "name": "polymod", "type": "git", "dir": null, - "ref": "6cec79e4f322fbb262170594ed67ab72b4714810", + "ref": "0b53e478bc375ec51b760b650201ac7a965d2ef4", "url": "https://github.com/larsiusprime/polymod" }, { diff --git a/source/Main.hx b/source/Main.hx index 754d0732f..a40fda29d 100644 --- a/source/Main.hx +++ b/source/Main.hx @@ -33,8 +33,10 @@ class Main extends Sprite public static function main():Void { - haxe.Log.trace = funkin.util.logging.AnsiTrace.trace; - funkin.util.logging.AnsiTrace.traceBF(); + // We need to make the crash handler LITERALLY FIRST so nothing EVER gets past it. + CrashHandler.initialize(); + CrashHandler.queryStatus(); + Lib.current.addChild(new Main()); } @@ -42,7 +44,12 @@ class Main extends Sprite { super(); - // TODO: Replace this with loadEnabledMods(). + // Initialize custom logging. + haxe.Log.trace = funkin.util.logging.AnsiTrace.trace; + funkin.util.logging.AnsiTrace.traceBF(); + + // Load mods to override assets. + // TODO: Replace with loadEnabledMods() once the user can configure the mod list. funkin.modding.PolymodHandler.loadAllMods(); if (stage != null) @@ -82,10 +89,6 @@ class Main extends Sprite * -Eric */ - CrashHandler.initialize(); - - CrashHandler.queryStatus(); - initHaxeUI(); fpsCounter = new FPS(10, 3, 0xFFFFFF);