diff --git a/source/funkin/backend/FunkinSprite.hx b/source/funkin/backend/FunkinSprite.hx index 4d9db079..9e3392dc 100644 --- a/source/funkin/backend/FunkinSprite.hx +++ b/source/funkin/backend/FunkinSprite.hx @@ -8,7 +8,7 @@ import flixel.math.FlxRect; import flixel.system.FlxAssets.FlxGraphicAsset; import flixel.util.typeLimit.OneOfTwo; import flxanimate.animate.FlxAnim.FlxSymbolAnimation; -import funkin.backend.scripting.events.PlayAnimContext; +import funkin.backend.scripting.events.sprite.PlayAnimContext; import funkin.backend.system.interfaces.IBeatReceiver; import funkin.backend.system.interfaces.IOffsetCompatible; import funkin.backend.utils.XMLUtil.AnimData; diff --git a/source/funkin/backend/scripting/Script.hx b/source/funkin/backend/scripting/Script.hx index 773340d5..f493aff2 100644 --- a/source/funkin/backend/scripting/Script.hx +++ b/source/funkin/backend/scripting/Script.hx @@ -19,38 +19,38 @@ class Script extends FlxBasic implements IFlxDestroyable { public static function getDefaultVariables(?script:Script):Map { return [ // Haxe related stuff - "Std" => Std, - "Math" => Math, - "Reflect" => Reflect, - "StringTools" => StringTools, - "Json" => haxe.Json, + "Std" => Std, + "Math" => Math, + "Reflect" => Reflect, + "StringTools" => StringTools, + "Json" => haxe.Json, // OpenFL & Lime related stuff "Assets" => openfl.utils.Assets, - "Application" => lime.app.Application, + "Application" => lime.app.Application, "Main" => funkin.backend.system.Main, "window" => lime.app.Application.current.window, // Flixel related stuff - "FlxG" => flixel.FlxG, - "FlxSprite" => flixel.FlxSprite, - "FlxBasic" => flixel.FlxBasic, - "FlxCamera" => flixel.FlxCamera, - "state" => flixel.FlxG.state, - "FlxEase" => flixel.tweens.FlxEase, - "FlxTween" => flixel.tweens.FlxTween, - "FlxSound" => flixel.sound.FlxSound, - "FlxAssets" => flixel.system.FlxAssets, - "FlxMath" => flixel.math.FlxMath, - "FlxGroup" => flixel.group.FlxGroup, - "FlxTypedGroup" => flixel.group.FlxGroup.FlxTypedGroup, + "state" => flixel.FlxG.state, + "FlxG" => flixel.FlxG, + "FlxSprite" => flixel.FlxSprite, + "FlxBasic" => flixel.FlxBasic, + "FlxCamera" => flixel.FlxCamera, + "FlxEase" => flixel.tweens.FlxEase, + "FlxTween" => flixel.tweens.FlxTween, + "FlxSound" => flixel.sound.FlxSound, + "FlxAssets" => flixel.system.FlxAssets, + "FlxMath" => flixel.math.FlxMath, + "FlxGroup" => flixel.group.FlxGroup, + "FlxTypedGroup" => flixel.group.FlxGroup.FlxTypedGroup, "FlxSpriteGroup" => flixel.group.FlxSpriteGroup, - "FlxTypeText" => flixel.addons.text.FlxTypeText, - "FlxText" => flixel.text.FlxText, - "FlxTimer" => flixel.util.FlxTimer, - "FlxPoint" => CoolUtil.getMacroAbstractClass("flixel.math.FlxPoint"), - "FlxAxes" => CoolUtil.getMacroAbstractClass("flixel.util.FlxAxes"), - "FlxColor" => CoolUtil.getMacroAbstractClass("flixel.util.FlxColor"), + "FlxTypeText" => flixel.addons.text.FlxTypeText, + "FlxText" => flixel.text.FlxText, + "FlxTimer" => flixel.util.FlxTimer, + "FlxPoint" => CoolUtil.getMacroAbstractClass("flixel.math.FlxPoint"), + "FlxAxes" => CoolUtil.getMacroAbstractClass("flixel.util.FlxAxes"), + "FlxColor" => CoolUtil.getMacroAbstractClass("flixel.util.FlxColor"), // Engine related stuff "engine" => { @@ -59,38 +59,38 @@ class Script extends FlxBasic implements IFlxDestroyable { build: 2675, // 2675 being the last build num before it was removed name: "Codename Engine" }, - "ModState" => funkin.backend.scripting.ModState, - "ModSubState" => funkin.backend.scripting.ModSubState, - "PlayState" => funkin.game.PlayState, - "GameOverSubstate" => funkin.game.GameOverSubstate, + "ModState" => funkin.backend.scripting.ModState, + "ModSubState" => funkin.backend.scripting.ModSubState, + "PlayState" => funkin.game.PlayState, + "GameOverSubstate" => funkin.game.GameOverSubstate, "HealthIcon" => funkin.game.HealthIcon, - "HudCamera" => funkin.game.HudCamera, - "Note" => funkin.game.Note, - "Strum" => funkin.game.Strum, - "StrumLine" => funkin.game.StrumLine, - "Character" => funkin.game.Character, - "Boyfriend" => funkin.game.Character, // for compatibility - "PauseSubstate" => funkin.menus.PauseSubState, - "FreeplayState" => funkin.menus.FreeplayState, - "MainMenuState" => funkin.menus.MainMenuState, - "PauseSubState" => funkin.menus.PauseSubState, + "HudCamera" => funkin.game.HudCamera, + "Note" => funkin.game.Note, + "Strum" => funkin.game.Strum, + "StrumLine" => funkin.game.StrumLine, + "Character" => funkin.game.Character, + "Boyfriend" => funkin.game.Character, // for compatibility + "PauseSubstate" => funkin.menus.PauseSubState, + "FreeplayState" => funkin.menus.FreeplayState, + "MainMenuState" => funkin.menus.MainMenuState, + "PauseSubState" => funkin.menus.PauseSubState, "StoryMenuState" => funkin.menus.StoryMenuState, "TitleState" => funkin.menus.TitleState, - "Options" => funkin.options.Options, - "Paths" => funkin.backend.assets.Paths, - "Conductor" => funkin.backend.system.Conductor, - "FunkinShader" => funkin.backend.shaders.FunkinShader, - "CustomShader" => funkin.backend.shaders.CustomShader, + "Options" => funkin.options.Options, + "Paths" => funkin.backend.assets.Paths, + "Conductor" => funkin.backend.system.Conductor, + "FunkinShader" => funkin.backend.shaders.FunkinShader, + "CustomShader" => funkin.backend.shaders.CustomShader, "FunkinText" => funkin.backend.FunkinText, "FlxAnimate" => funkin.backend.FlxAnimate, "FunkinSprite" => funkin.backend.FunkinSprite, - "Alphabet" => funkin.menus.ui.Alphabet, + "Alphabet" => funkin.menus.ui.Alphabet, - "CoolUtil" => funkin.backend.utils.CoolUtil, - "IniUtil" => funkin.backend.utils.IniUtil, - "XMLUtil" => funkin.backend.utils.XMLUtil, - #if sys "ZipUtil" => funkin.backend.utils.ZipUtil, #end - "MarkdownUtil" => funkin.backend.utils.MarkdownUtil, + "CoolUtil" => funkin.backend.utils.CoolUtil, + "IniUtil" => funkin.backend.utils.IniUtil, + "XMLUtil" => funkin.backend.utils.XMLUtil, + #if sys "ZipUtil" => funkin.backend.utils.ZipUtil, #end + "MarkdownUtil" => funkin.backend.utils.MarkdownUtil, "EngineUtil" => funkin.backend.utils.EngineUtil, "MemoryUtil" => funkin.backend.utils.MemoryUtil, "BitmapUtil" => funkin.backend.utils.BitmapUtil, @@ -98,14 +98,47 @@ class Script extends FlxBasic implements IFlxDestroyable { } /** - * Used internally to keep backwards compatability with old scripts. + * Used internally to keep backwards compatibility with old scripts. * This gets set on `hscript.Interp.importRedirects`, * if you wanna modify it, please edit `hscript.Interp.importRedirects` directly. **/ public static function getDefaultImportRedirects():Map { - return [ - "Meow" => "funkin.backend.utils.CoolUtil", + var redirects:Map = [ + "funkin.savedata.FunkinSave" => "funkin.backend.utils.FunkinSave" ]; + + final events = "funkin.backend.scripting.events."; + redirects[events + "CharacterNodeEvent"] = events + "character.CharacterNodeEvent"; + redirects[events + "CharacterXMLEvent"] = events + "character.CharacterXMLEvent"; + redirects[events + "DanceEvent"] = events + "character.DanceEvent"; + redirects[events + "DirectionAnimEvent"] = events + "character.DirectionAnimEvent"; + redirects[events + "DiscordPresenceUpdateEvent"] = events + "discord.DiscordPresenceUpdateEvent"; + redirects[events + "GameOverCreationEvent"] = events + "gameover.GameOverCreationEvent"; + redirects[events + "CamMoveEvent"] = events + "gameplay.CamMoveEvent"; + redirects[events + "CountdownEvent"] = events + "gameplay.CountdownEvent"; + redirects[events + "EventGameEvent"] = events + "gameplay.EventGameEvent"; + redirects[events + "GameOverEvent"] = events + "gameplay.GameOverEvent"; + redirects[events + "RatingUpdateEvent"] = events + "gameplay.RatingUpdateEvent"; + redirects[events + "HealthIconChangeEvent"] = events + "healthicon.HealthIconChangeEvent"; + redirects[events + "FreeplayAlphaUpdateEvent"] = events + "menu.freeplay.FreeplayAlphaUpdateEvent"; + redirects[events + "FreeplaySongSelectEvent"] = events + "menu.freeplay.FreeplaySongSelectEvent"; + redirects[events + "MenuChangeEvent"] = events + "menu.MenuChangeEvent"; + redirects[events + "PauseCreationEvent"] = events + "menu.pause.PauseCreationEvent"; + redirects[events + "WeekSelectEvent"] = events + "menu.storymenu.WeekSelectEvent"; + redirects[events + "InputSystemEvent"] = events + "note.InputSystemEvent"; + redirects[events + "NoteCreationEvent"] = events + "note.NoteCreationEvent"; + redirects[events + "NoteHitEvent"] = events + "note.NoteHitEvent"; + redirects[events + "NoteMissEvent"] = events + "note.NoteMissEvent"; + redirects[events + "NoteUpdateEvent"] = events + "note.NoteUpdateEvent"; + redirects[events + "SimpleNoteEvent"] = events + "note.SimpleNoteEvent"; + redirects[events + "StrumCreationEvent"] = events + "note.StrumCreationEvent"; + redirects[events + "SplashShowEvent"] = events + "splash.SplashShowEvent"; + redirects[events + "PlayAnimContext"] = events + "sprite.PlayAnimContext"; + redirects[events + "PlayAnimEvent"] = events + "sprite.PlayAnimEvent"; + redirects[events + "StageNodeEvent"] = events + "stage.StageNodeEvent"; + redirects[events + "StageXMLEvent"] = events + "stage.StageXMLEvent"; + + return redirects; } public static function getDefaultPreprocessors():Map { diff --git a/source/funkin/backend/scripting/events/AmountEvent.hx b/source/funkin/backend/scripting/events/AmountEvent.hx index 31ae18c6..f77ed9ec 100644 --- a/source/funkin/backend/scripting/events/AmountEvent.hx +++ b/source/funkin/backend/scripting/events/AmountEvent.hx @@ -5,9 +5,4 @@ final class AmountEvent extends CancellableEvent { * Amount */ public var amount:Null; - - /** - * Shows whether or not psych users complained about this class - */ - public var psychUsersComplained:Bool = true; } \ No newline at end of file diff --git a/source/funkin/backend/scripting/events/DrawEvent.hx b/source/funkin/backend/scripting/events/DrawEvent.hx index 94e1aa8b..74788ecd 100644 --- a/source/funkin/backend/scripting/events/DrawEvent.hx +++ b/source/funkin/backend/scripting/events/DrawEvent.hx @@ -1,4 +1,5 @@ package funkin.backend.scripting.events; final class DrawEvent extends CancellableEvent { + // temp empty for now - Nex } \ No newline at end of file diff --git a/source/funkin/backend/scripting/events/README.md b/source/funkin/backend/scripting/events/README.md new file mode 100644 index 00000000..193eef72 --- /dev/null +++ b/source/funkin/backend/scripting/events/README.md @@ -0,0 +1,7 @@ +## NOTE +Keep in mind that a certain criteria was used to place events in their corresponding folders which is simply what the events themselves are mostly related to. + +For example: + +- `GameOverEvent` inside of the `gameplay` folder instead of the `gameover` folder since it gets called in the `PlayState` class (that owns the `gameplay` folder) instead of the `GameOverSubstate` class itself; +- `NoteHitEvent` gets indeed called by the `PlayState` class but it's also used in the `StrumLine` (For those who didn't really know, Strumlines are the Input Notes) class and since the event's name itself starts with the word `Note` it was more accurate to place it in the `note` folder instead of the `gameplay` folder that `PlayState` owns. \ No newline at end of file diff --git a/source/funkin/backend/scripting/events/CharacterNodeEvent.hx b/source/funkin/backend/scripting/events/character/CharacterNodeEvent.hx similarity index 87% rename from source/funkin/backend/scripting/events/CharacterNodeEvent.hx rename to source/funkin/backend/scripting/events/character/CharacterNodeEvent.hx index 9577a64f..85eb46c8 100644 --- a/source/funkin/backend/scripting/events/CharacterNodeEvent.hx +++ b/source/funkin/backend/scripting/events/character/CharacterNodeEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.character; import funkin.game.Character; import haxe.xml.Access; diff --git a/source/funkin/backend/scripting/events/CharacterXMLEvent.hx b/source/funkin/backend/scripting/events/character/CharacterXMLEvent.hx similarity index 70% rename from source/funkin/backend/scripting/events/CharacterXMLEvent.hx rename to source/funkin/backend/scripting/events/character/CharacterXMLEvent.hx index e4f107fd..7375bafd 100644 --- a/source/funkin/backend/scripting/events/CharacterXMLEvent.hx +++ b/source/funkin/backend/scripting/events/character/CharacterXMLEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.character; import funkin.game.Character; import haxe.xml.Access; @@ -7,7 +7,7 @@ final class CharacterXMLEvent extends CancellableEvent { /** * The character instance */ - public var character:Character; + public var character:Character; /** * The xml diff --git a/source/funkin/backend/scripting/events/DanceEvent.hx b/source/funkin/backend/scripting/events/character/DanceEvent.hx similarity index 60% rename from source/funkin/backend/scripting/events/DanceEvent.hx rename to source/funkin/backend/scripting/events/character/DanceEvent.hx index b2300f8f..4f7f7154 100644 --- a/source/funkin/backend/scripting/events/DanceEvent.hx +++ b/source/funkin/backend/scripting/events/character/DanceEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.character; final class DanceEvent extends CancellableEvent { public var danced:Bool; diff --git a/source/funkin/backend/scripting/events/DirectionAnimEvent.hx b/source/funkin/backend/scripting/events/character/DirectionAnimEvent.hx similarity index 87% rename from source/funkin/backend/scripting/events/DirectionAnimEvent.hx rename to source/funkin/backend/scripting/events/character/DirectionAnimEvent.hx index dce2eaff..2bc027fa 100644 --- a/source/funkin/backend/scripting/events/DirectionAnimEvent.hx +++ b/source/funkin/backend/scripting/events/character/DirectionAnimEvent.hx @@ -1,4 +1,6 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.character; + +import funkin.backend.scripting.events.sprite.PlayAnimContext; final class DirectionAnimEvent extends CancellableEvent { /** diff --git a/source/funkin/backend/scripting/events/DiscordPresenceUpdateEvent.hx b/source/funkin/backend/scripting/events/discord/DiscordPresenceUpdateEvent.hx similarity index 81% rename from source/funkin/backend/scripting/events/DiscordPresenceUpdateEvent.hx rename to source/funkin/backend/scripting/events/discord/DiscordPresenceUpdateEvent.hx index c17cbb68..19884e42 100644 --- a/source/funkin/backend/scripting/events/DiscordPresenceUpdateEvent.hx +++ b/source/funkin/backend/scripting/events/discord/DiscordPresenceUpdateEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.discord; final class DiscordPresenceUpdateEvent extends CancellableEvent { /** diff --git a/source/funkin/backend/scripting/events/GameOverCreationEvent.hx b/source/funkin/backend/scripting/events/gameover/GameOverCreationEvent.hx similarity index 87% rename from source/funkin/backend/scripting/events/GameOverCreationEvent.hx rename to source/funkin/backend/scripting/events/gameover/GameOverCreationEvent.hx index bb9b04c0..39762aeb 100644 --- a/source/funkin/backend/scripting/events/GameOverCreationEvent.hx +++ b/source/funkin/backend/scripting/events/gameover/GameOverCreationEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.gameover; /** * CANCEL this event to prevent default behaviour! diff --git a/source/funkin/backend/scripting/events/CamMoveEvent.hx b/source/funkin/backend/scripting/events/gameplay/CamMoveEvent.hx similarity index 87% rename from source/funkin/backend/scripting/events/CamMoveEvent.hx rename to source/funkin/backend/scripting/events/gameplay/CamMoveEvent.hx index 3dcbda78..06792c48 100644 --- a/source/funkin/backend/scripting/events/CamMoveEvent.hx +++ b/source/funkin/backend/scripting/events/gameplay/CamMoveEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.gameplay; import flixel.math.FlxPoint; import funkin.game.StrumLine; diff --git a/source/funkin/backend/scripting/events/CountdownEvent.hx b/source/funkin/backend/scripting/events/gameplay/CountdownEvent.hx similarity index 95% rename from source/funkin/backend/scripting/events/CountdownEvent.hx rename to source/funkin/backend/scripting/events/gameplay/CountdownEvent.hx index 7c6b4308..a86d8bae 100644 --- a/source/funkin/backend/scripting/events/CountdownEvent.hx +++ b/source/funkin/backend/scripting/events/gameplay/CountdownEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.gameplay; import flixel.sound.FlxSound; import flixel.tweens.FlxTween; diff --git a/source/funkin/backend/scripting/events/EventGameEvent.hx b/source/funkin/backend/scripting/events/gameplay/EventGameEvent.hx similarity index 71% rename from source/funkin/backend/scripting/events/EventGameEvent.hx rename to source/funkin/backend/scripting/events/gameplay/EventGameEvent.hx index 836e44c9..2e063d90 100644 --- a/source/funkin/backend/scripting/events/EventGameEvent.hx +++ b/source/funkin/backend/scripting/events/gameplay/EventGameEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.gameplay; import funkin.backend.chart.ChartData; diff --git a/source/funkin/backend/scripting/events/GameOverEvent.hx b/source/funkin/backend/scripting/events/gameplay/GameOverEvent.hx similarity index 94% rename from source/funkin/backend/scripting/events/GameOverEvent.hx rename to source/funkin/backend/scripting/events/gameplay/GameOverEvent.hx index b0e83795..28521f5b 100644 --- a/source/funkin/backend/scripting/events/GameOverEvent.hx +++ b/source/funkin/backend/scripting/events/gameplay/GameOverEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.gameplay; import funkin.game.Character; diff --git a/source/funkin/backend/scripting/events/RatingUpdateEvent.hx b/source/funkin/backend/scripting/events/gameplay/RatingUpdateEvent.hx similarity index 78% rename from source/funkin/backend/scripting/events/RatingUpdateEvent.hx rename to source/funkin/backend/scripting/events/gameplay/RatingUpdateEvent.hx index 96ad7e7e..59a3305d 100644 --- a/source/funkin/backend/scripting/events/RatingUpdateEvent.hx +++ b/source/funkin/backend/scripting/events/gameplay/RatingUpdateEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.gameplay; final class RatingUpdateEvent extends CancellableEvent { /** diff --git a/source/funkin/backend/scripting/events/HealthIconChangeEvent.hx b/source/funkin/backend/scripting/events/healthicon/HealthIconChangeEvent.hx similarity index 78% rename from source/funkin/backend/scripting/events/HealthIconChangeEvent.hx rename to source/funkin/backend/scripting/events/healthicon/HealthIconChangeEvent.hx index a98493ef..dbb4cb68 100644 --- a/source/funkin/backend/scripting/events/HealthIconChangeEvent.hx +++ b/source/funkin/backend/scripting/events/healthicon/HealthIconChangeEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.healthicon; final class HealthIconChangeEvent extends CancellableEvent { /** diff --git a/source/funkin/backend/scripting/events/MenuChangeEvent.hx b/source/funkin/backend/scripting/events/menu/MenuChangeEvent.hx similarity index 87% rename from source/funkin/backend/scripting/events/MenuChangeEvent.hx rename to source/funkin/backend/scripting/events/menu/MenuChangeEvent.hx index d74ef2a4..90b03dcf 100644 --- a/source/funkin/backend/scripting/events/MenuChangeEvent.hx +++ b/source/funkin/backend/scripting/events/menu/MenuChangeEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.menu; final class MenuChangeEvent extends CancellableEvent { /** diff --git a/source/funkin/backend/scripting/events/FreeplayAlphaUpdateEvent.hx b/source/funkin/backend/scripting/events/menu/freeplay/FreeplayAlphaUpdateEvent.hx similarity index 90% rename from source/funkin/backend/scripting/events/FreeplayAlphaUpdateEvent.hx rename to source/funkin/backend/scripting/events/menu/freeplay/FreeplayAlphaUpdateEvent.hx index 639645c2..d8ab6f0b 100644 --- a/source/funkin/backend/scripting/events/FreeplayAlphaUpdateEvent.hx +++ b/source/funkin/backend/scripting/events/menu/freeplay/FreeplayAlphaUpdateEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.menu.freeplay; final class FreeplayAlphaUpdateEvent extends CancellableEvent { /** diff --git a/source/funkin/backend/scripting/events/FreeplaySongSelectEvent.hx b/source/funkin/backend/scripting/events/menu/freeplay/FreeplaySongSelectEvent.hx similarity index 86% rename from source/funkin/backend/scripting/events/FreeplaySongSelectEvent.hx rename to source/funkin/backend/scripting/events/menu/freeplay/FreeplaySongSelectEvent.hx index b97847b0..e2ee1fc7 100644 --- a/source/funkin/backend/scripting/events/FreeplaySongSelectEvent.hx +++ b/source/funkin/backend/scripting/events/menu/freeplay/FreeplaySongSelectEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.menu.freeplay; final class FreeplaySongSelectEvent extends CancellableEvent { /** diff --git a/source/funkin/backend/scripting/events/PauseCreationEvent.hx b/source/funkin/backend/scripting/events/menu/pause/PauseCreationEvent.hx similarity index 83% rename from source/funkin/backend/scripting/events/PauseCreationEvent.hx rename to source/funkin/backend/scripting/events/menu/pause/PauseCreationEvent.hx index a02b0e1a..290ac847 100644 --- a/source/funkin/backend/scripting/events/PauseCreationEvent.hx +++ b/source/funkin/backend/scripting/events/menu/pause/PauseCreationEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.menu.pause; /** * CANCEL this event to prevent default behaviour! diff --git a/source/funkin/backend/scripting/events/WeekSelectEvent.hx b/source/funkin/backend/scripting/events/menu/storymenu/WeekSelectEvent.hx similarity index 89% rename from source/funkin/backend/scripting/events/WeekSelectEvent.hx rename to source/funkin/backend/scripting/events/menu/storymenu/WeekSelectEvent.hx index e255d361..c9afe956 100644 --- a/source/funkin/backend/scripting/events/WeekSelectEvent.hx +++ b/source/funkin/backend/scripting/events/menu/storymenu/WeekSelectEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.menu.storymenu; import funkin.menus.StoryMenuState.WeekData; diff --git a/source/funkin/backend/scripting/events/InputSystemEvent.hx b/source/funkin/backend/scripting/events/note/InputSystemEvent.hx similarity index 95% rename from source/funkin/backend/scripting/events/InputSystemEvent.hx rename to source/funkin/backend/scripting/events/note/InputSystemEvent.hx index 3855c31f..06ea39a4 100644 --- a/source/funkin/backend/scripting/events/InputSystemEvent.hx +++ b/source/funkin/backend/scripting/events/note/InputSystemEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.note; import funkin.game.StrumLine; diff --git a/source/funkin/backend/scripting/events/NoteCreationEvent.hx b/source/funkin/backend/scripting/events/note/NoteCreationEvent.hx similarity index 94% rename from source/funkin/backend/scripting/events/NoteCreationEvent.hx rename to source/funkin/backend/scripting/events/note/NoteCreationEvent.hx index 3f7d1890..f070099f 100644 --- a/source/funkin/backend/scripting/events/NoteCreationEvent.hx +++ b/source/funkin/backend/scripting/events/note/NoteCreationEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.note; import funkin.game.Note; diff --git a/source/funkin/backend/scripting/events/NoteHitEvent.hx b/source/funkin/backend/scripting/events/note/NoteHitEvent.hx similarity index 99% rename from source/funkin/backend/scripting/events/NoteHitEvent.hx rename to source/funkin/backend/scripting/events/note/NoteHitEvent.hx index d0b58f5a..4c4a2053 100644 --- a/source/funkin/backend/scripting/events/NoteHitEvent.hx +++ b/source/funkin/backend/scripting/events/note/NoteHitEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.note; import funkin.game.Character; import funkin.game.Note; diff --git a/source/funkin/backend/scripting/events/NoteMissEvent.hx b/source/funkin/backend/scripting/events/note/NoteMissEvent.hx similarity index 98% rename from source/funkin/backend/scripting/events/NoteMissEvent.hx rename to source/funkin/backend/scripting/events/note/NoteMissEvent.hx index 72f87ddd..9499d612 100644 --- a/source/funkin/backend/scripting/events/NoteMissEvent.hx +++ b/source/funkin/backend/scripting/events/note/NoteMissEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.note; import funkin.game.Character; import funkin.game.Note; diff --git a/source/funkin/backend/scripting/events/NoteUpdateEvent.hx b/source/funkin/backend/scripting/events/note/NoteUpdateEvent.hx similarity index 95% rename from source/funkin/backend/scripting/events/NoteUpdateEvent.hx rename to source/funkin/backend/scripting/events/note/NoteUpdateEvent.hx index 45676ec5..d004fa0e 100644 --- a/source/funkin/backend/scripting/events/NoteUpdateEvent.hx +++ b/source/funkin/backend/scripting/events/note/NoteUpdateEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.note; import funkin.game.Note; import funkin.game.Strum; diff --git a/source/funkin/backend/scripting/events/SimpleNoteEvent.hx b/source/funkin/backend/scripting/events/note/SimpleNoteEvent.hx similarity index 75% rename from source/funkin/backend/scripting/events/SimpleNoteEvent.hx rename to source/funkin/backend/scripting/events/note/SimpleNoteEvent.hx index 3899958b..9d031fcf 100644 --- a/source/funkin/backend/scripting/events/SimpleNoteEvent.hx +++ b/source/funkin/backend/scripting/events/note/SimpleNoteEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.note; import funkin.game.Note; diff --git a/source/funkin/backend/scripting/events/StrumCreationEvent.hx b/source/funkin/backend/scripting/events/note/StrumCreationEvent.hx similarity index 94% rename from source/funkin/backend/scripting/events/StrumCreationEvent.hx rename to source/funkin/backend/scripting/events/note/StrumCreationEvent.hx index d591d958..517075c3 100644 --- a/source/funkin/backend/scripting/events/StrumCreationEvent.hx +++ b/source/funkin/backend/scripting/events/note/StrumCreationEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.note; import funkin.game.Strum; diff --git a/source/funkin/backend/scripting/events/soundTray/SoundTrayShowEvent.hx b/source/funkin/backend/scripting/events/soundtray/SoundTrayShowEvent.hx similarity index 61% rename from source/funkin/backend/scripting/events/soundTray/SoundTrayShowEvent.hx rename to source/funkin/backend/scripting/events/soundtray/SoundTrayShowEvent.hx index a363e790..7d9b29bd 100644 --- a/source/funkin/backend/scripting/events/soundTray/SoundTrayShowEvent.hx +++ b/source/funkin/backend/scripting/events/soundtray/SoundTrayShowEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events.soundTray; +package funkin.backend.scripting.events.soundtray; final class SoundTrayShowEvent extends CancellableEvent { diff --git a/source/funkin/backend/scripting/events/soundTray/SoundTrayTextEvent.hx b/source/funkin/backend/scripting/events/soundtray/SoundTrayTextEvent.hx similarity index 78% rename from source/funkin/backend/scripting/events/soundTray/SoundTrayTextEvent.hx rename to source/funkin/backend/scripting/events/soundtray/SoundTrayTextEvent.hx index 3f8d23a0..1010df06 100644 --- a/source/funkin/backend/scripting/events/soundTray/SoundTrayTextEvent.hx +++ b/source/funkin/backend/scripting/events/soundtray/SoundTrayTextEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events.soundTray; +package funkin.backend.scripting.events.soundtray; final class SoundTrayTextEvent extends CancellableEvent { diff --git a/source/funkin/backend/scripting/events/SplashShowEvent.hx b/source/funkin/backend/scripting/events/splash/SplashShowEvent.hx similarity index 89% rename from source/funkin/backend/scripting/events/SplashShowEvent.hx rename to source/funkin/backend/scripting/events/splash/SplashShowEvent.hx index 46504d44..6cdea0ee 100644 --- a/source/funkin/backend/scripting/events/SplashShowEvent.hx +++ b/source/funkin/backend/scripting/events/splash/SplashShowEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.splash; import funkin.game.SplashGroup; import funkin.game.Strum; diff --git a/source/funkin/backend/scripting/events/PlayAnimContext.hx b/source/funkin/backend/scripting/events/sprite/PlayAnimContext.hx similarity index 94% rename from source/funkin/backend/scripting/events/PlayAnimContext.hx rename to source/funkin/backend/scripting/events/sprite/PlayAnimContext.hx index f3c9e211..67f8c857 100644 --- a/source/funkin/backend/scripting/events/PlayAnimContext.hx +++ b/source/funkin/backend/scripting/events/sprite/PlayAnimContext.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.sprite; /** Contains all contexts possible for `PlayAnimEvent`. diff --git a/source/funkin/backend/scripting/events/PlayAnimEvent.hx b/source/funkin/backend/scripting/events/sprite/PlayAnimEvent.hx similarity index 92% rename from source/funkin/backend/scripting/events/PlayAnimEvent.hx rename to source/funkin/backend/scripting/events/sprite/PlayAnimEvent.hx index f51c8243..0db69a2b 100644 --- a/source/funkin/backend/scripting/events/PlayAnimEvent.hx +++ b/source/funkin/backend/scripting/events/sprite/PlayAnimEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.sprite; final class PlayAnimEvent extends CancellableEvent { /** diff --git a/source/funkin/backend/scripting/events/StageNodeEvent.hx b/source/funkin/backend/scripting/events/stage/StageNodeEvent.hx similarity index 89% rename from source/funkin/backend/scripting/events/StageNodeEvent.hx rename to source/funkin/backend/scripting/events/stage/StageNodeEvent.hx index 93465fa6..505e92b8 100644 --- a/source/funkin/backend/scripting/events/StageNodeEvent.hx +++ b/source/funkin/backend/scripting/events/stage/StageNodeEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.stage; import funkin.game.Stage; import haxe.xml.Access; diff --git a/source/funkin/backend/scripting/events/StageXMLEvent.hx b/source/funkin/backend/scripting/events/stage/StageXMLEvent.hx similarity index 85% rename from source/funkin/backend/scripting/events/StageXMLEvent.hx rename to source/funkin/backend/scripting/events/stage/StageXMLEvent.hx index 16693d33..9bc6f10b 100644 --- a/source/funkin/backend/scripting/events/StageXMLEvent.hx +++ b/source/funkin/backend/scripting/events/stage/StageXMLEvent.hx @@ -1,4 +1,4 @@ -package funkin.backend.scripting.events; +package funkin.backend.scripting.events.stage; import funkin.game.Stage; import haxe.xml.Access; diff --git a/source/funkin/backend/system/Main.hx b/source/funkin/backend/system/Main.hx index a487f92a..b60dee80 100644 --- a/source/funkin/backend/system/Main.hx +++ b/source/funkin/backend/system/Main.hx @@ -142,7 +142,7 @@ class Main extends Sprite Assets.registerLibrary('default', lib); funkin.options.PlayerSettings.init(); - funkin.savedata.FunkinSave.init(); + funkin.backend.utils.FunkinSave.init(); Options.load(); FlxG.fixedTimestep = false; diff --git a/source/funkin/backend/system/github/GitHub.hx b/source/funkin/backend/system/github/GitHub.hx index 515e2f63..ce7e61dc 100644 --- a/source/funkin/backend/system/github/GitHub.hx +++ b/source/funkin/backend/system/github/GitHub.hx @@ -83,7 +83,7 @@ class GitHub { * @param onError Error Callback * @return Members List */ - public static function getOrganizationMembers(org:String, ?onError:Exception->Void):Array { + public static function getOrganizationMembers(org:String, ?onError:Exception->Void):Array { #if GITHUB_API try { var data = Json.parse(HttpUtil.requestText('https://api.github.com/orgs/$org/members')); @@ -106,7 +106,7 @@ class GitHub { * @param onError Error Callback * @return User/Organization */ - public static function getUser(user:String, ?onError:Exception->Void):GitHubUser { + public static function getUser(user:String, ?onError:Exception->Void):GitHubUser { #if GITHUB_API try { var url = 'https://api.github.com/users/$user'; diff --git a/source/funkin/backend/utils/DiscordUtil.hx b/source/funkin/backend/utils/DiscordUtil.hx index a870884d..7a7bc549 100644 --- a/source/funkin/backend/utils/DiscordUtil.hx +++ b/source/funkin/backend/utils/DiscordUtil.hx @@ -5,7 +5,7 @@ import flixel.sound.FlxSound; import flixel.util.typeLimit.OneOfTwo; import funkin.backend.scripting.*; // lazy import funkin.backend.scripting.events.CancellableEvent; -import funkin.backend.scripting.events.DiscordPresenceUpdateEvent; +import funkin.backend.scripting.events.discord.*; import funkin.backend.system.macros.Utils; import haxe.Json; import openfl.display.BitmapData; diff --git a/source/funkin/savedata/FunkinSave.hx b/source/funkin/backend/utils/FunkinSave.hx similarity index 99% rename from source/funkin/savedata/FunkinSave.hx rename to source/funkin/backend/utils/FunkinSave.hx index 20337df6..82167fe6 100644 --- a/source/funkin/savedata/FunkinSave.hx +++ b/source/funkin/backend/utils/FunkinSave.hx @@ -1,4 +1,4 @@ -package funkin.savedata; +package funkin.backend.utils; import flixel.util.FlxSave; import lime.app.Application; diff --git a/source/funkin/game/Character.hx b/source/funkin/game/Character.hx index acb0845b..79a30aab 100644 --- a/source/funkin/game/Character.hx +++ b/source/funkin/game/Character.hx @@ -9,13 +9,9 @@ import funkin.backend.FunkinSprite; import funkin.backend.scripting.DummyScript; import funkin.backend.scripting.Script; import funkin.backend.scripting.ScriptPack; -import funkin.backend.scripting.events.CharacterNodeEvent; -import funkin.backend.scripting.events.CharacterXMLEvent; -import funkin.backend.scripting.events.DanceEvent; import funkin.backend.scripting.events.CancellableEvent; -import funkin.backend.scripting.events.DirectionAnimEvent; -import funkin.backend.scripting.events.PlayAnimContext; -import funkin.backend.scripting.events.PlayAnimEvent; +import funkin.backend.scripting.events.character.*; +import funkin.backend.scripting.events.sprite.*; import funkin.backend.scripting.events.PointEvent; import funkin.backend.scripting.events.DrawEvent; import funkin.backend.system.Conductor; diff --git a/source/funkin/game/GameOverSubstate.hx b/source/funkin/game/GameOverSubstate.hx index 5181422a..a871422f 100644 --- a/source/funkin/game/GameOverSubstate.hx +++ b/source/funkin/game/GameOverSubstate.hx @@ -5,7 +5,7 @@ import flixel.util.FlxColor; import flixel.util.FlxTimer; import funkin.backend.scripting.Script; import funkin.backend.scripting.events.CancellableEvent; -import funkin.backend.scripting.events.GameOverCreationEvent; +import funkin.backend.scripting.events.gameover.*; import funkin.backend.system.Conductor; import funkin.editors.charter.Charter; import funkin.menus.FreeplayState; diff --git a/source/funkin/game/HealthIcon.hx b/source/funkin/game/HealthIcon.hx index ce377efa..5d2c8225 100644 --- a/source/funkin/game/HealthIcon.hx +++ b/source/funkin/game/HealthIcon.hx @@ -27,7 +27,7 @@ class HealthIcon extends FlxSprite /** * current animation state */ - public var curAnimState:Int = -1; + public var curAnimState:Int = -1; /** * Helper for HScript who can't make maps @@ -95,7 +95,7 @@ class HealthIcon extends FlxSprite i = icon; } if (i >= 0 && curAnimState != i) { - var event = EventManager.get(funkin.backend.scripting.events.HealthIconChangeEvent).recycle(i, this); + var event = EventManager.get(funkin.backend.scripting.events.healthicon.HealthIconChangeEvent).recycle(i, this); funkin.backend.scripting.GlobalScript.event("onHealthIconAnimChange", event); if (!event.cancelled) animation.curAnim.curFrame = event.amount; diff --git a/source/funkin/game/Note.hx b/source/funkin/game/Note.hx index 6c2a92a0..125ec419 100644 --- a/source/funkin/game/Note.hx +++ b/source/funkin/game/Note.hx @@ -3,7 +3,7 @@ package funkin.game; import flixel.math.FlxPoint; import flixel.math.FlxRect; import funkin.backend.chart.ChartData; -import funkin.backend.scripting.events.*; +import funkin.backend.scripting.events.note.NoteCreationEvent; import funkin.backend.system.Conductor; using StringTools; diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 0d5cd1a8..b8f2e75f 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -18,6 +18,8 @@ import funkin.backend.chart.EventsData; import funkin.backend.scripting.DummyScript; import funkin.backend.scripting.Script; import funkin.backend.scripting.ScriptPack; +import funkin.backend.scripting.events.gameplay.*; +import funkin.backend.scripting.events.note.*; import funkin.backend.scripting.events.*; import funkin.backend.system.Conductor; import funkin.backend.system.RotatingSpriteGroup; @@ -28,7 +30,7 @@ import funkin.game.SplashHandler; import funkin.game.cutscenes.*; import funkin.menus.*; import funkin.menus.StoryMenuState.WeekData; -import funkin.savedata.FunkinSave; +import funkin.backend.utils.FunkinSave; import haxe.io.Path; using StringTools; @@ -1397,8 +1399,7 @@ class PlayState extends MusicBeatState public var scrollSpeedTween:FlxTween = null; public function executeEvent(event:ChartEvent) @:privateAccess { - if (event == null) return; - if (event.params == null) return; + if (event == null || event.params == null) return; var e = EventManager.get(EventGameEvent).recycle(event); gameAndCharsEvent("onEvent", e); diff --git a/source/funkin/game/SplashHandler.hx b/source/funkin/game/SplashHandler.hx index 2f8891dd..ad14ad8c 100644 --- a/source/funkin/game/SplashHandler.hx +++ b/source/funkin/game/SplashHandler.hx @@ -1,6 +1,6 @@ package funkin.game; -import funkin.backend.scripting.events.SplashShowEvent; +import funkin.backend.scripting.events.splash.*; class SplashHandler extends FlxTypedGroup { /** diff --git a/source/funkin/game/Stage.hx b/source/funkin/game/Stage.hx index a63acb08..5cc145f0 100644 --- a/source/funkin/game/Stage.hx +++ b/source/funkin/game/Stage.hx @@ -7,8 +7,7 @@ import funkin.backend.utils.XMLUtil.XMLImportedScriptInfo; import funkin.backend.system.interfaces.IBeatReceiver; import funkin.backend.scripting.DummyScript; import funkin.backend.scripting.Script; -import funkin.backend.scripting.events.StageNodeEvent; -import funkin.backend.scripting.events.StageXMLEvent; +import funkin.backend.scripting.events.stage.*; import funkin.backend.system.interfaces.IBeatReceiver; import haxe.io.Path; import haxe.xml.Access; diff --git a/source/funkin/game/StrumLine.hx b/source/funkin/game/StrumLine.hx index 86c905e6..5417b494 100644 --- a/source/funkin/game/StrumLine.hx +++ b/source/funkin/game/StrumLine.hx @@ -5,7 +5,7 @@ import flixel.sound.FlxSound; import flixel.tweens.FlxTween; import flixel.util.FlxSignal.FlxTypedSignal; import funkin.backend.chart.ChartData; -import funkin.backend.scripting.events.*; +import funkin.backend.scripting.events.note.*; import funkin.backend.system.Conductor; import funkin.backend.system.Controls; diff --git a/source/funkin/game/cutscenes/dialogue/DialogueBox.hx b/source/funkin/game/cutscenes/dialogue/DialogueBox.hx index a37143ef..b445b611 100644 --- a/source/funkin/game/cutscenes/dialogue/DialogueBox.hx +++ b/source/funkin/game/cutscenes/dialogue/DialogueBox.hx @@ -3,8 +3,7 @@ package funkin.game.cutscenes.dialogue; import flixel.addons.text.FlxTypeText; import flixel.sound.FlxSound; import funkin.backend.scripting.Script; -import funkin.backend.scripting.events.PlayAnimContext; -import funkin.backend.scripting.events.PlayAnimEvent; +import funkin.backend.scripting.events.sprite.*; import funkin.backend.scripting.events.dialogue.*; import haxe.xml.Access; diff --git a/source/funkin/game/cutscenes/dialogue/DialogueCharacter.hx b/source/funkin/game/cutscenes/dialogue/DialogueCharacter.hx index 3fa06f54..2c3eec13 100644 --- a/source/funkin/game/cutscenes/dialogue/DialogueCharacter.hx +++ b/source/funkin/game/cutscenes/dialogue/DialogueCharacter.hx @@ -2,8 +2,7 @@ package funkin.game.cutscenes.dialogue; import flixel.tweens.FlxTween; import funkin.backend.scripting.Script; -import funkin.backend.scripting.events.PlayAnimContext; -import funkin.backend.scripting.events.PlayAnimEvent; +import funkin.backend.scripting.events.sprite.*; import funkin.backend.scripting.events.dialogue.*; import haxe.xml.Access; diff --git a/source/funkin/menus/FreeplayState.hx b/source/funkin/menus/FreeplayState.hx index 864f9e7d..30518112 100644 --- a/source/funkin/menus/FreeplayState.hx +++ b/source/funkin/menus/FreeplayState.hx @@ -4,9 +4,10 @@ import flixel.text.FlxText; import flixel.util.FlxColor; import funkin.backend.chart.Chart; import funkin.backend.chart.ChartData.ChartMetaData; -import funkin.backend.scripting.events.*; +import funkin.backend.scripting.events.menu.MenuChangeEvent; +import funkin.backend.scripting.events.menu.freeplay.*; import funkin.game.HealthIcon; -import funkin.savedata.FunkinSave; +import funkin.backend.utils.FunkinSave; using StringTools; diff --git a/source/funkin/menus/MainMenuState.hx b/source/funkin/menus/MainMenuState.hx index 8e0eeb14..5f580868 100644 --- a/source/funkin/menus/MainMenuState.hx +++ b/source/funkin/menus/MainMenuState.hx @@ -4,7 +4,8 @@ import flixel.FlxState; import flixel.effects.FlxFlicker; import flixel.tweens.FlxTween; import funkin.backend.FunkinText; -import funkin.backend.scripting.events.*; +import funkin.backend.scripting.events.menu.MenuChangeEvent; +import funkin.backend.scripting.events.NameEvent; import funkin.menus.credits.CreditsMain; import funkin.options.OptionsMenu; import lime.app.Application; diff --git a/source/funkin/menus/PauseSubState.hx b/source/funkin/menus/PauseSubState.hx index 7586ae77..1ab70f33 100644 --- a/source/funkin/menus/PauseSubState.hx +++ b/source/funkin/menus/PauseSubState.hx @@ -5,9 +5,9 @@ import flixel.text.FlxText; import flixel.tweens.FlxTween; import flixel.util.FlxColor; import funkin.backend.scripting.Script; -import funkin.backend.scripting.events.MenuChangeEvent; +import funkin.backend.scripting.events.menu.MenuChangeEvent; +import funkin.backend.scripting.events.menu.pause.*; import funkin.backend.scripting.events.NameEvent; -import funkin.backend.scripting.events.PauseCreationEvent; import funkin.backend.system.Conductor; import funkin.backend.utils.FunkinParentDisabler; import funkin.editors.charter.Charter; diff --git a/source/funkin/menus/StoryMenuState.hx b/source/funkin/menus/StoryMenuState.hx index 01c61640..8cc0c431 100644 --- a/source/funkin/menus/StoryMenuState.hx +++ b/source/funkin/menus/StoryMenuState.hx @@ -6,8 +6,10 @@ import flixel.tweens.FlxTween; import flixel.util.FlxColor; import flixel.util.FlxTimer; import funkin.backend.FunkinText; -import funkin.backend.scripting.events.*; -import funkin.savedata.FunkinSave; +import funkin.backend.scripting.events.menu.MenuChangeEvent; +import funkin.backend.scripting.events.menu.storymenu.*; +import funkin.backend.scripting.events.CancellableEvent; +import funkin.backend.utils.FunkinSave; import haxe.io.Path; import haxe.xml.Access; diff --git a/source/funkin/menus/ui/FunkinSoundTray.hx b/source/funkin/menus/ui/FunkinSoundTray.hx index bd89e2d1..21280679 100644 --- a/source/funkin/menus/ui/FunkinSoundTray.hx +++ b/source/funkin/menus/ui/FunkinSoundTray.hx @@ -1,7 +1,7 @@ package funkin.menus.ui; import funkin.backend.scripting.events.CancellableEvent; -import funkin.backend.scripting.events.soundTray.*; +import funkin.backend.scripting.events.soundtray.*; import funkin.backend.scripting.Script; import flixel.system.ui.FlxSoundTray; import openfl.text.TextFormat; diff --git a/source/hscript/Config.hx b/source/hscript/Config.hx index 98fc7f7a..4847baca 100644 --- a/source/hscript/Config.hx +++ b/source/hscript/Config.hx @@ -29,6 +29,6 @@ class Config { ]; public static final DISALLOW_ABSTRACT_AND_ENUM = [ - "funkin.backend.scripting.events.PlayAnimContext", // Error: expected member name or ';' after declaration specifiers, Due to define macro from math.h + "funkin.backend.scripting.events.sprite.PlayAnimContext", // Error: expected member name or ';' after declaration specifiers, Due to define macro from math.h ]; } \ No newline at end of file