better events and funkinSave categorization

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;

source/funkin/backend/scripting/Script.hx

@@ -19,38 +19,38 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	public static function getDefaultVariables(?script:Script):Map<String, Dynamic> {
 		return [
 			// Haxe related stuff
-			"Std"			   => Std,
+			"Std"				=> Std,
-			"Math"			  => Math,
+			"Math"				=> Math,
-			"Reflect"			  => Reflect,
+			"Reflect"			=> Reflect,
-			"StringTools"	   => StringTools,
+			"StringTools"		=> StringTools,
-			"Json"			  => haxe.Json,
+			"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,
+			"state"				=> flixel.FlxG.state,
-			"FlxSprite"		 => flixel.FlxSprite,
+			"FlxG"				=> flixel.FlxG,
-			"FlxBasic"		  => flixel.FlxBasic,
+			"FlxSprite"			=> flixel.FlxSprite,
-			"FlxCamera"		 => flixel.FlxCamera,
+			"FlxBasic"			=> flixel.FlxBasic,
-			"state"			 => flixel.FlxG.state,
+			"FlxCamera"			=> flixel.FlxCamera,
-			"FlxEase"		   => flixel.tweens.FlxEase,
+			"FlxEase"			=> flixel.tweens.FlxEase,
-			"FlxTween"		  => flixel.tweens.FlxTween,
+			"FlxTween"			=> flixel.tweens.FlxTween,
-			"FlxSound"		  => flixel.sound.FlxSound,
+			"FlxSound"			=> flixel.sound.FlxSound,
-			"FlxAssets"		 => flixel.system.FlxAssets,
+			"FlxAssets"			=> flixel.system.FlxAssets,
-			"FlxMath"		   => flixel.math.FlxMath,
+			"FlxMath"			=> flixel.math.FlxMath,
-			"FlxGroup"		  => flixel.group.FlxGroup,
+			"FlxGroup"			=> flixel.group.FlxGroup,
-			"FlxTypedGroup"	 => flixel.group.FlxGroup.FlxTypedGroup,
+			"FlxTypedGroup"		=> flixel.group.FlxGroup.FlxTypedGroup,
 			"FlxSpriteGroup"	=> flixel.group.FlxSpriteGroup,
-			"FlxTypeText"	   => flixel.addons.text.FlxTypeText,
+			"FlxTypeText"		=> flixel.addons.text.FlxTypeText,
-			"FlxText"		   => flixel.text.FlxText,
+			"FlxText"			=> flixel.text.FlxText,
-			"FlxTimer"		  => flixel.util.FlxTimer,
+			"FlxTimer"			=> flixel.util.FlxTimer,
-			"FlxPoint"		  => CoolUtil.getMacroAbstractClass("flixel.math.FlxPoint"),
+			"FlxPoint"			=> CoolUtil.getMacroAbstractClass("flixel.math.FlxPoint"),
-			"FlxAxes"		   => CoolUtil.getMacroAbstractClass("flixel.util.FlxAxes"),
+			"FlxAxes"			=> CoolUtil.getMacroAbstractClass("flixel.util.FlxAxes"),
-			"FlxColor"		  => CoolUtil.getMacroAbstractClass("flixel.util.FlxColor"),
+			"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,
+			"ModState"			=> funkin.backend.scripting.ModState,
-			"ModSubState"	   => funkin.backend.scripting.ModSubState,
+			"ModSubState"		=> funkin.backend.scripting.ModSubState,
-			"PlayState"		 => funkin.game.PlayState,
+			"PlayState"			=> funkin.game.PlayState,
-			"GameOverSubstate"  => funkin.game.GameOverSubstate,
+			"GameOverSubstate"	=> funkin.game.GameOverSubstate,
 			"HealthIcon"		=> funkin.game.HealthIcon,
-			"HudCamera"		 => funkin.game.HudCamera,
+			"HudCamera"			=> funkin.game.HudCamera,
-			"Note"			  => funkin.game.Note,
+			"Note"				=> funkin.game.Note,
-			"Strum"			 => funkin.game.Strum,
+			"Strum"				=> funkin.game.Strum,
-			"StrumLine"		 => funkin.game.StrumLine,
+			"StrumLine"			=> funkin.game.StrumLine,
-			"Character"		 => funkin.game.Character,
+			"Character"			=> funkin.game.Character,
-			"Boyfriend"		 => funkin.game.Character, // for compatibility
+			"Boyfriend"			=> funkin.game.Character, // for compatibility
-			"PauseSubstate"	 => funkin.menus.PauseSubState,
+			"PauseSubstate"		=> funkin.menus.PauseSubState,
-			"FreeplayState"	 => funkin.menus.FreeplayState,
+			"FreeplayState"		=> funkin.menus.FreeplayState,
-			"MainMenuState"	 => funkin.menus.MainMenuState,
+			"MainMenuState"		=> funkin.menus.MainMenuState,
-			"PauseSubState"	 => funkin.menus.PauseSubState,
+			"PauseSubState"		=> funkin.menus.PauseSubState,
 			"StoryMenuState"	=> funkin.menus.StoryMenuState,
 			"TitleState"		=> funkin.menus.TitleState,
-			"Options"		   => funkin.options.Options,
+			"Options"			=> funkin.options.Options,
-			"Paths"			 => funkin.backend.assets.Paths,
+			"Paths"				=> funkin.backend.assets.Paths,
-			"Conductor"		 => funkin.backend.system.Conductor,
+			"Conductor"			=> funkin.backend.system.Conductor,
-			"FunkinShader"	  => funkin.backend.shaders.FunkinShader,
+			"FunkinShader"		=> funkin.backend.shaders.FunkinShader,
-			"CustomShader"	  => funkin.backend.shaders.CustomShader,
+			"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,
+			"CoolUtil"			=> funkin.backend.utils.CoolUtil,
-			"IniUtil"		   => funkin.backend.utils.IniUtil,
+			"IniUtil"			=> funkin.backend.utils.IniUtil,
-			"XMLUtil"		   => funkin.backend.utils.XMLUtil,
+			"XMLUtil"			=> funkin.backend.utils.XMLUtil,
-			#if sys "ZipUtil"   => funkin.backend.utils.ZipUtil, #end
+			#if sys "ZipUtil"	=> funkin.backend.utils.ZipUtil, #end
-			"MarkdownUtil"	  => funkin.backend.utils.MarkdownUtil,
+			"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<String, String> {
-		return [
+		var redirects:Map<String, String> = [
-			"Meow" => "funkin.backend.utils.CoolUtil",
+			"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<String, Dynamic> {

source/funkin/backend/scripting/events/AmountEvent.hx

@@ -5,9 +5,4 @@ final class AmountEvent extends CancellableEvent {
 	 * Amount
 	 */
 	public var amount:Null<Int>;
-
-	/**
-	 * Shows whether or not psych users complained about this class
-	 */
-	public var psychUsersComplained:Bool = true;
 }

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
 }

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.

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;

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

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;

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 {
 	/**

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 {
 	/**

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!

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;

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;

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;
 

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;
 

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 {
 	/**

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 {
 	/**

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 {
 	/**

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 {
 	/**

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 {
 	/**

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!

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;
 

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;
 

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;
 

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;

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;

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;

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;
 

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;
 

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
 {

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
 {

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;

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`.

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 {
 	/**

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;

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;

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;

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<GitHubContributor> {
+	public static function getOrganizationMembers(org:String, ?onError:Exception->Void):Array<GitHubContributor> {
 		#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';

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;

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;

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.character.*;
-import funkin.backend.scripting.events.PlayAnimContext;
+import funkin.backend.scripting.events.sprite.*;
-import funkin.backend.scripting.events.PlayAnimEvent;
 import funkin.backend.scripting.events.PointEvent;
 import funkin.backend.scripting.events.DrawEvent;
 import funkin.backend.system.Conductor;

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;

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;

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;

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 == null || event.params == null) return;
-		if (event.params == null) return;
 
 		var e = EventManager.get(EventGameEvent).recycle(event);
 		gameAndCharsEvent("onEvent", e);

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<FunkinSprite> {
 	/**

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.stage.*;
-import funkin.backend.scripting.events.StageXMLEvent;
 import funkin.backend.system.interfaces.IBeatReceiver;
 import haxe.io.Path;
 import haxe.xml.Access;

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;
 

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.sprite.*;
-import funkin.backend.scripting.events.PlayAnimEvent;
 import funkin.backend.scripting.events.dialogue.*;
 import haxe.xml.Access;
 

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.sprite.*;
-import funkin.backend.scripting.events.PlayAnimEvent;
 import funkin.backend.scripting.events.dialogue.*;
 import haxe.xml.Access;
 

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;
 

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;

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;

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.backend.scripting.events.menu.MenuChangeEvent;
-import funkin.savedata.FunkinSave;
+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;
 

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;

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
 	];
 }