From 7fa5d77db79fc04299ce89a7c4eacf9245caf8b2 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Wed, 4 Feb 2026 00:38:44 -0500 Subject: [PATCH] Switch from `.init()` to `.scriptInit()` --- source/funkin/data/character/CharacterData.hx | 24 +++++++++---------- source/funkin/data/event/SongEventRegistry.hx | 2 +- .../funkin/data/stickers/StickerRegistry.hx | 2 +- source/funkin/modding/PolymodErrorHandler.hx | 4 +--- source/funkin/modding/module/ModuleHandler.hx | 2 +- source/funkin/play/ResultState.hx | 4 ++-- .../play/notes/notekind/NoteKindManager.hx | 2 +- source/funkin/ui/freeplay/FreeplayState.hx | 17 ++++++------- source/funkin/util/macro/RegistryMacro.hx | 2 +- .../util/plugins/ReloadAssetsDebugPlugin.hx | 2 +- 10 files changed, 30 insertions(+), 31 deletions(-) diff --git a/source/funkin/data/character/CharacterData.hx b/source/funkin/data/character/CharacterData.hx index a81d22c8e..7fe7547f8 100644 --- a/source/funkin/data/character/CharacterData.hx +++ b/source/funkin/data/character/CharacterData.hx @@ -93,7 +93,7 @@ class CharacterDataParser { try { - var character:SparrowCharacter = ScriptedSparrowCharacter.init(charCls, DEFAULT_CHAR_ID); + var character:SparrowCharacter = ScriptedSparrowCharacter.scriptInit(charCls, DEFAULT_CHAR_ID); log('Loaded character ${character.characterName} (scripted: $charCls)'); characterScriptedClass.set(character.characterId, charCls); } @@ -113,7 +113,7 @@ class CharacterDataParser { try { - var character:PackerCharacter = ScriptedPackerCharacter.init(charCls, DEFAULT_CHAR_ID); + var character:PackerCharacter = ScriptedPackerCharacter.scriptInit(charCls, DEFAULT_CHAR_ID); log('Loaded character ${character.characterName} (scripted: $charCls)'); characterScriptedClass.set(character.characterId, charCls); } @@ -133,7 +133,7 @@ class CharacterDataParser { try { - var character:MultiSparrowCharacter = ScriptedMultiSparrowCharacter.init(charCls, DEFAULT_CHAR_ID); + var character:MultiSparrowCharacter = ScriptedMultiSparrowCharacter.scriptInit(charCls, DEFAULT_CHAR_ID); log('Loaded character ${character.characterName} (scripted: $charCls)'); characterScriptedClass.set(character.characterId, charCls); } @@ -153,7 +153,7 @@ class CharacterDataParser { try { - var character:AnimateAtlasCharacter = ScriptedAnimateAtlasCharacter.init(charCls, DEFAULT_CHAR_ID); + var character:AnimateAtlasCharacter = ScriptedAnimateAtlasCharacter.scriptInit(charCls, DEFAULT_CHAR_ID); log('Loaded character ${character.characterName} (scripted: $charCls)'); characterScriptedClass.set(character.characterId, charCls); } @@ -173,7 +173,7 @@ class CharacterDataParser { try { - var character:MultiAnimateAtlasCharacter = ScriptedMultiAnimateAtlasCharacter.init(charCls, DEFAULT_CHAR_ID); + var character:MultiAnimateAtlasCharacter = ScriptedMultiAnimateAtlasCharacter.scriptInit(charCls, DEFAULT_CHAR_ID); log('Loaded character ${character.characterName} (scripted: $charCls)'); characterScriptedClass.set(character.characterId, charCls); } @@ -201,7 +201,7 @@ class CharacterDataParser log('Instantiating ${scriptedCharClassNames.length} (Base) scripted characters...'); for (charCls in scriptedCharClassNames) { - var character:BaseCharacter = ScriptedBaseCharacter.init(charCls, DEFAULT_CHAR_ID, Custom); + var character:BaseCharacter = ScriptedBaseCharacter.scriptInit(charCls, DEFAULT_CHAR_ID, Custom); if (character == null) { log(' ERROR '.error() + 'Failed to initialize scripted character: $charCls'); @@ -245,18 +245,18 @@ class CharacterDataParser if (charData != null) switch (charData.renderType) { case CharacterRenderType.AnimateAtlas: - char = ScriptedAnimateAtlasCharacter.init(charScriptClass, charId); + char = ScriptedAnimateAtlasCharacter.scriptInit(charScriptClass, charId); case CharacterRenderType.MultiSparrow: - char = ScriptedMultiSparrowCharacter.init(charScriptClass, charId); + char = ScriptedMultiSparrowCharacter.scriptInit(charScriptClass, charId); case CharacterRenderType.Sparrow: - char = ScriptedSparrowCharacter.init(charScriptClass, charId); + char = ScriptedSparrowCharacter.scriptInit(charScriptClass, charId); case CharacterRenderType.Packer: - char = ScriptedPackerCharacter.init(charScriptClass, charId); + char = ScriptedPackerCharacter.scriptInit(charScriptClass, charId); case CharacterRenderType.MultiAnimateAtlas: - char = ScriptedMultiAnimateAtlasCharacter.init(charScriptClass, charId); + char = ScriptedMultiAnimateAtlasCharacter.scriptInit(charScriptClass, charId); default: // We're going to assume that the script class does the rendering. - char = ScriptedBaseCharacter.init(charScriptClass, charId, CharacterRenderType.Custom); + char = ScriptedBaseCharacter.scriptInit(charScriptClass, charId, CharacterRenderType.Custom); } } else diff --git a/source/funkin/data/event/SongEventRegistry.hx b/source/funkin/data/event/SongEventRegistry.hx index 60cf50afc..7c534115b 100644 --- a/source/funkin/data/event/SongEventRegistry.hx +++ b/source/funkin/data/event/SongEventRegistry.hx @@ -66,7 +66,7 @@ class SongEventRegistry for (eventCls in scriptedEventClassNames) { - var event:SongEvent = ScriptedSongEvent.init(eventCls, "UKNOWN"); + var event:SongEvent = ScriptedSongEvent.scriptInit(eventCls, "UKNOWN"); if (event != null) { diff --git a/source/funkin/data/stickers/StickerRegistry.hx b/source/funkin/data/stickers/StickerRegistry.hx index 6f5378851..d2dbd394f 100644 --- a/source/funkin/data/stickers/StickerRegistry.hx +++ b/source/funkin/data/stickers/StickerRegistry.hx @@ -82,7 +82,7 @@ class StickerRegistry extends BaseRegistry diff --git a/source/funkin/modding/PolymodErrorHandler.hx b/source/funkin/modding/PolymodErrorHandler.hx index fdbd32f5b..2009bd253 100644 --- a/source/funkin/modding/PolymodErrorHandler.hx +++ b/source/funkin/modding/PolymodErrorHandler.hx @@ -35,10 +35,8 @@ class PolymodErrorHandler logError(error.message); // Last word is the class name. - var className:Null = error.message.split(' ').pop(); var msg:String = 'Import error in ${error.origin}'; - msg += '\nCould not import unknown class ${className}'; - msg += '\nCheck to ensure the class exists and is spelled correctly.'; + msg += '\n${error.message}'; // Notify the user via popup. funkin.util.WindowUtil.showError('Polymod Script Import Error', msg); diff --git a/source/funkin/modding/module/ModuleHandler.hx b/source/funkin/modding/module/ModuleHandler.hx index 90fc22aa1..52aeccd7e 100644 --- a/source/funkin/modding/module/ModuleHandler.hx +++ b/source/funkin/modding/module/ModuleHandler.hx @@ -32,7 +32,7 @@ class ModuleHandler trace(' Instantiating ${scriptedModuleClassNames.length} modules...'); for (moduleCls in scriptedModuleClassNames) { - var module:Module = ScriptedModule.init(moduleCls, moduleCls); + var module:Module = ScriptedModule.scriptInit(moduleCls, moduleCls); if (module != null) { trace(' Loaded module: ${moduleCls}'); diff --git a/source/funkin/play/ResultState.hx b/source/funkin/play/ResultState.hx index 2c0b05b09..2ed0abb4f 100644 --- a/source/funkin/play/ResultState.hx +++ b/source/funkin/play/ResultState.hx @@ -241,7 +241,7 @@ class ResultState extends MusicBeatSubState var xPos = offsets[0] + (FullScreenScaleMode.gameCutoutSize.x / 2); var yPos = offsets[1]; - if (animData.scriptClass != null) animation = ScriptedFunkinSprite.init(animData.scriptClass, xPos, yPos); + if (animData.scriptClass != null) animation = ScriptedFunkinSprite.scriptInit(animData.scriptClass, xPos, yPos); else animation = FunkinSprite.createTextureAtlas(xPos, yPos, animPath, animLibrary); @@ -303,7 +303,7 @@ class ResultState extends MusicBeatSubState @:nullSafety(Off) var animation:FunkinSprite = null; - if (animData.scriptClass != null) animation = ScriptedFunkinSprite.init(animData.scriptClass, + if (animData.scriptClass != null) animation = ScriptedFunkinSprite.scriptInit(animData.scriptClass, offsets[0] + (FullScreenScaleMode.gameCutoutSize.x / 2), offsets[1]); else animation = FunkinSprite.createSparrow(offsets[0] + (FullScreenScaleMode.gameCutoutSize.x / 2), offsets[1], animPath); diff --git a/source/funkin/play/notes/notekind/NoteKindManager.hx b/source/funkin/play/notes/notekind/NoteKindManager.hx index c5e7cde0e..aecbc1206 100644 --- a/source/funkin/play/notes/notekind/NoteKindManager.hx +++ b/source/funkin/play/notes/notekind/NoteKindManager.hx @@ -88,7 +88,7 @@ class NoteKindManager { try { - var script:NoteKind = ScriptedNoteKind.init(scriptedClass, "unknown"); + var script:NoteKind = ScriptedNoteKind.scriptInit(scriptedClass, "unknown"); trace(' Initialized scripted note kind: ${script.noteKind}'); noteKinds.set(script.noteKind, script); #if FEATURE_CHART_EDITOR diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx index 065804691..39b3e08f1 100644 --- a/source/funkin/ui/freeplay/FreeplayState.hx +++ b/source/funkin/ui/freeplay/FreeplayState.hx @@ -317,7 +317,7 @@ class FreeplayState extends MusicBeatSubState var allScriptedCards:Array = ScriptedBackingCard.listScriptClasses(); for (cardClass in allScriptedCards) { - var card:BackingCard = ScriptedBackingCard.init(cardClass, "unknown"); + var card:BackingCard = ScriptedBackingCard.scriptInit(cardClass, "unknown"); if (card.currentCharacter == currentCharacterId) { backingCardPrep = card; @@ -901,13 +901,15 @@ class FreeplayState extends MusicBeatSubState switch (renderType) { case "animateatlas": - dj = (scriptClass != "") ? (ScriptedAnimateAtlasFreeplayDJ.init(scriptClass, x, y, characterId)) : (new AnimateAtlasFreeplayDJ(x, y, characterId)); + dj = (scriptClass != "") ? (ScriptedAnimateAtlasFreeplayDJ.scriptInit(scriptClass, x, y, + characterId)) : (new AnimateAtlasFreeplayDJ(x, y, characterId)); case "sparrow": - dj = (scriptClass != "") ? (ScriptedSparrowFreeplayDJ.init(scriptClass, x, y, characterId)) : (new SparrowFreeplayDJ(x, y, characterId)); + dj = (scriptClass != "") ? (ScriptedSparrowFreeplayDJ.scriptInit(scriptClass, x, y, characterId)) : (new SparrowFreeplayDJ(x, y, characterId)); case 'multisparrow': - dj = (scriptClass != "") ? (ScriptedMultiSparrowFreeplayDJ.init(scriptClass, x, y, characterId)) : (new MultiSparrowFreeplayDJ(x, y, characterId)); + dj = (scriptClass != "") ? (ScriptedMultiSparrowFreeplayDJ.scriptInit(scriptClass, x, y, + characterId)) : (new MultiSparrowFreeplayDJ(x, y, characterId)); case 'packer': - dj = (scriptClass != "") ? (ScriptedPackerFreeplayDJ.init(scriptClass, x, y, characterId)) : (new PackerFreeplayDJ(x, y, characterId)); + dj = (scriptClass != "") ? (ScriptedPackerFreeplayDJ.scriptInit(scriptClass, x, y, characterId)) : (new PackerFreeplayDJ(x, y, characterId)); } } @@ -2783,8 +2785,7 @@ class FreeplayState extends MusicBeatSubState minimalMode: false, #if FEATURE_DEBUG_FUNCTIONS - botPlayMode: FlxG.keys.pressed.SHIFT, - mirrored: FlxG.keys.pressed.CONTROL, + botPlayMode: FlxG.keys.pressed.SHIFT, mirrored: FlxG.keys.pressed.CONTROL, #else botPlayMode: false, #end @@ -2928,7 +2929,7 @@ class FreeplayState extends MusicBeatSubState clearPreviews(); HapticUtil.vibrate(0, 0.01, 0.5); } - + dispatchEvent(new CapsuleScriptEvent(CAPSULE_SELECTED, currentCapsule, currentDifficulty, currentVariation)); } diff --git a/source/funkin/util/macro/RegistryMacro.hx b/source/funkin/util/macro/RegistryMacro.hx index adf8025f6..654afc9da 100644 --- a/source/funkin/util/macro/RegistryMacro.hx +++ b/source/funkin/util/macro/RegistryMacro.hx @@ -146,7 +146,7 @@ class RegistryMacro var getScriptedClassName:String = '${scriptedEntryClsName}'; - var createScriptedEntry:String = '${scriptedEntryClsName}.init(clsName, "unknown")'; + var createScriptedEntry:String = '${scriptedEntryClsName}.scriptInit(clsName, "unknown")'; var newJsonParser:String = 'new json2object.JsonParser<${dataType.module}.${dataType.name}>()'; diff --git a/source/funkin/util/plugins/ReloadAssetsDebugPlugin.hx b/source/funkin/util/plugins/ReloadAssetsDebugPlugin.hx index 57b6b255c..928d2dcbb 100644 --- a/source/funkin/util/plugins/ReloadAssetsDebugPlugin.hx +++ b/source/funkin/util/plugins/ReloadAssetsDebugPlugin.hx @@ -80,7 +80,7 @@ class ReloadAssetsDebugPlugin extends FlxBasic if (isScripted) { trace("Reloading scripted state: " + path); - var state:Dynamic = ScriptedMusicBeatState.init(path); + var state:Dynamic = ScriptedMusicBeatState.scriptInit(path); FlxG.switchState(state); }