From 71ef2243f6845ba8f6bb6953e34aeab3c96d01de Mon Sep 17 00:00:00 2001
From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com>
Date: Sat, 1 Apr 2023 15:31:11 +0200
Subject: [PATCH] custom classes support fixes

---
 source/funkin/scripting/events/CamMoveEvent.hx               | 2 +-
 source/funkin/scripting/events/CancellableEvent.hx           | 1 +
 source/funkin/scripting/events/CountdownEvent.hx             | 2 +-
 source/funkin/scripting/events/DanceEvent.hx                 | 2 +-
 source/funkin/scripting/events/DirectionAnimEvent.hx         | 2 +-
 source/funkin/scripting/events/DiscordPresenceUpdateEvent.hx | 2 +-
 source/funkin/scripting/events/FreeplaySongSelectEvent.hx    | 2 +-
 source/funkin/scripting/events/InputSystemEvent.hx           | 2 +-
 source/funkin/scripting/events/MenuChangeEvent.hx            | 2 +-
 source/funkin/scripting/events/NameEvent.hx                  | 2 +-
 source/funkin/scripting/events/NoteCreationEvent.hx          | 2 +-
 source/funkin/scripting/events/NoteHitEvent.hx               | 2 +-
 source/funkin/scripting/events/NoteUpdateEvent.hx            | 2 +-
 source/funkin/scripting/events/PauseCreationEvent.hx         | 2 +-
 source/funkin/scripting/events/PlayAnimEvent.hx              | 2 +-
 source/funkin/scripting/events/PointEvent.hx                 | 2 +-
 source/funkin/scripting/events/RatingUpdateEvent.hx          | 2 +-
 source/funkin/scripting/events/ResizeEvent.hx                | 2 +-
 source/funkin/scripting/events/SimpleNoteEvent.hx            | 2 +-
 source/funkin/scripting/events/StateEvent.hx                 | 2 +-
 source/funkin/scripting/events/StrumCreationEvent.hx         | 2 +-
 source/funkin/scripting/events/WeekSelectEvent.hx            | 2 +-
 source/funkin/system/Controls.hx                             | 1 +
 23 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/source/funkin/scripting/events/CamMoveEvent.hx b/source/funkin/scripting/events/CamMoveEvent.hx
index 709c9f33..5d2a0fa0 100644
--- a/source/funkin/scripting/events/CamMoveEvent.hx
+++ b/source/funkin/scripting/events/CamMoveEvent.hx
@@ -3,7 +3,7 @@ package funkin.scripting.events;
 import funkin.game.StrumLine;
 import flixel.math.FlxPoint;
 
-class CamMoveEvent extends CancellableEvent {
+final class CamMoveEvent extends CancellableEvent {
 	/**
 	 * Final camera position.
 	 */
diff --git a/source/funkin/scripting/events/CancellableEvent.hx b/source/funkin/scripting/events/CancellableEvent.hx
index 768556ff..2883b85c 100644
--- a/source/funkin/scripting/events/CancellableEvent.hx
+++ b/source/funkin/scripting/events/CancellableEvent.hx
@@ -4,6 +4,7 @@ import flixel.util.FlxDestroyUtil.IFlxDestroyable;
 
 @:allow(ScriptPack)
 @:autoBuild(funkin.macros.EventMacro.build())
+@:noCustomClass
 class CancellableEvent implements IFlxDestroyable {
 	@:dox(hide) public var cancelled:Bool = false;
 	@:dox(hide) private var __continueCalls:Bool = true;
diff --git a/source/funkin/scripting/events/CountdownEvent.hx b/source/funkin/scripting/events/CountdownEvent.hx
index a60b3b6e..7e3e3eb2 100644
--- a/source/funkin/scripting/events/CountdownEvent.hx
+++ b/source/funkin/scripting/events/CountdownEvent.hx
@@ -3,7 +3,7 @@ package funkin.scripting.events;
 import flixel.tweens.FlxTween;
 import flixel.system.FlxSound;
 
-class CountdownEvent extends CancellableEvent {
+final class CountdownEvent extends CancellableEvent {
 	/**
 	 * At which count the countdown is. Normally goes 0-1-2-3-4 unless `PlayState.instance.introLength` is changed.
 	 */
diff --git a/source/funkin/scripting/events/DanceEvent.hx b/source/funkin/scripting/events/DanceEvent.hx
index fd68f8f4..869ce3b1 100644
--- a/source/funkin/scripting/events/DanceEvent.hx
+++ b/source/funkin/scripting/events/DanceEvent.hx
@@ -1,5 +1,5 @@
 package funkin.scripting.events;
 
-class DanceEvent extends CancellableEvent {
+final class DanceEvent extends CancellableEvent {
 	public var danced:Bool;
 }
\ No newline at end of file
diff --git a/source/funkin/scripting/events/DirectionAnimEvent.hx b/source/funkin/scripting/events/DirectionAnimEvent.hx
index 4a73c537..44ddb38b 100644
--- a/source/funkin/scripting/events/DirectionAnimEvent.hx
+++ b/source/funkin/scripting/events/DirectionAnimEvent.hx
@@ -2,7 +2,7 @@ package funkin.scripting.events;
 
 import funkin.scripting.events.PlayAnimEvent.PlayAnimContext;
 
-class DirectionAnimEvent extends CancellableEvent {
+final class DirectionAnimEvent extends CancellableEvent {
 	/**
 		Default animation that will be played
 	**/
diff --git a/source/funkin/scripting/events/DiscordPresenceUpdateEvent.hx b/source/funkin/scripting/events/DiscordPresenceUpdateEvent.hx
index 7fc35019..a714f122 100644
--- a/source/funkin/scripting/events/DiscordPresenceUpdateEvent.hx
+++ b/source/funkin/scripting/events/DiscordPresenceUpdateEvent.hx
@@ -4,7 +4,7 @@ package funkin.scripting.events;
 import discord_rpc.DiscordRpc.DiscordPresenceOptions;
 #end
 
-class DiscordPresenceUpdateEvent extends CancellableEvent {
+final class DiscordPresenceUpdateEvent extends CancellableEvent {
 	/**
 	 * Object containing all of the data for the presence. Can be altered.
 	 */
diff --git a/source/funkin/scripting/events/FreeplaySongSelectEvent.hx b/source/funkin/scripting/events/FreeplaySongSelectEvent.hx
index cd09d0c4..30296734 100644
--- a/source/funkin/scripting/events/FreeplaySongSelectEvent.hx
+++ b/source/funkin/scripting/events/FreeplaySongSelectEvent.hx
@@ -1,6 +1,6 @@
 package funkin.scripting.events;
 
-class FreeplaySongSelectEvent extends CancellableEvent {
+final class FreeplaySongSelectEvent extends CancellableEvent {
 	/**
 	 * Song name that is about to be played
 	 */
diff --git a/source/funkin/scripting/events/InputSystemEvent.hx b/source/funkin/scripting/events/InputSystemEvent.hx
index 6c50ba22..31ed3418 100644
--- a/source/funkin/scripting/events/InputSystemEvent.hx
+++ b/source/funkin/scripting/events/InputSystemEvent.hx
@@ -2,7 +2,7 @@ package funkin.scripting.events;
 
 import funkin.game.StrumLine;
 
-class InputSystemEvent extends CancellableEvent {
+final class InputSystemEvent extends CancellableEvent {
 	/**
 	 * Array containing whenever a specific control is pressed or not.
 	 * For example, `pressed[0]` will return whenever the left strum was pressed.
diff --git a/source/funkin/scripting/events/MenuChangeEvent.hx b/source/funkin/scripting/events/MenuChangeEvent.hx
index f28b2ca1..84f1bc2e 100644
--- a/source/funkin/scripting/events/MenuChangeEvent.hx
+++ b/source/funkin/scripting/events/MenuChangeEvent.hx
@@ -1,6 +1,6 @@
 package funkin.scripting.events;
 
-class MenuChangeEvent extends CancellableEvent {
+final class MenuChangeEvent extends CancellableEvent {
 	/**
 	 * Value before the change
 	 */
diff --git a/source/funkin/scripting/events/NameEvent.hx b/source/funkin/scripting/events/NameEvent.hx
index ded960bb..83939b19 100644
--- a/source/funkin/scripting/events/NameEvent.hx
+++ b/source/funkin/scripting/events/NameEvent.hx
@@ -1,6 +1,6 @@
 package funkin.scripting.events;
 
-class NameEvent extends CancellableEvent {
+final class NameEvent extends CancellableEvent {
 	/**
 	 * Name
 	 */
diff --git a/source/funkin/scripting/events/NoteCreationEvent.hx b/source/funkin/scripting/events/NoteCreationEvent.hx
index f5600204..cafd328d 100644
--- a/source/funkin/scripting/events/NoteCreationEvent.hx
+++ b/source/funkin/scripting/events/NoteCreationEvent.hx
@@ -2,7 +2,7 @@ package funkin.scripting.events;
 
 import funkin.game.Note;
 
-class NoteCreationEvent extends CancellableEvent {
+final class NoteCreationEvent extends CancellableEvent {
 	/**
 	 * Note that is being created
 	 */
diff --git a/source/funkin/scripting/events/NoteHitEvent.hx b/source/funkin/scripting/events/NoteHitEvent.hx
index f084c3a8..d82b990f 100644
--- a/source/funkin/scripting/events/NoteHitEvent.hx
+++ b/source/funkin/scripting/events/NoteHitEvent.hx
@@ -3,7 +3,7 @@ package funkin.scripting.events;
 import funkin.game.Note;
 import funkin.game.Character;
 
-class NoteHitEvent extends CancellableEvent {
+final class NoteHitEvent extends CancellableEvent {
 	@:dox(hide) public var animCancelled:Bool = false;
 	@:dox(hide) public var strumGlowCancelled:Bool = false;
 	@:dox(hide) public var deleteNote:Bool = true;
diff --git a/source/funkin/scripting/events/NoteUpdateEvent.hx b/source/funkin/scripting/events/NoteUpdateEvent.hx
index f176ce79..97a39b98 100644
--- a/source/funkin/scripting/events/NoteUpdateEvent.hx
+++ b/source/funkin/scripting/events/NoteUpdateEvent.hx
@@ -3,7 +3,7 @@ package funkin.scripting.events;
 import funkin.game.Note;
 import funkin.game.Strum;
 
-class NoteUpdateEvent extends CancellableEvent {
+final class NoteUpdateEvent extends CancellableEvent {
 	@:dox(hide) public var __updateHitWindow = true;
 	@:dox(hide) public var __autoCPUHit = true;
 	@:dox(hide) public var __reposNote = true;
diff --git a/source/funkin/scripting/events/PauseCreationEvent.hx b/source/funkin/scripting/events/PauseCreationEvent.hx
index 36c333ae..e96c1e8d 100644
--- a/source/funkin/scripting/events/PauseCreationEvent.hx
+++ b/source/funkin/scripting/events/PauseCreationEvent.hx
@@ -3,7 +3,7 @@ package funkin.scripting.events;
 /**
  * CANCEL this event to prevent default behaviour!
  */
-class PauseCreationEvent extends CancellableEvent {
+final class PauseCreationEvent extends CancellableEvent {
 	/**
 	 * Music that is going to be played
 	 */
diff --git a/source/funkin/scripting/events/PlayAnimEvent.hx b/source/funkin/scripting/events/PlayAnimEvent.hx
index 6f330e8d..e256bfd8 100644
--- a/source/funkin/scripting/events/PlayAnimEvent.hx
+++ b/source/funkin/scripting/events/PlayAnimEvent.hx
@@ -1,6 +1,6 @@
 package funkin.scripting.events;
 
-class PlayAnimEvent extends CancellableEvent {
+final class PlayAnimEvent extends CancellableEvent {
 	/**
 		Name of the animation that's going to be played.
 	**/
diff --git a/source/funkin/scripting/events/PointEvent.hx b/source/funkin/scripting/events/PointEvent.hx
index f92a801c..d3c178ab 100644
--- a/source/funkin/scripting/events/PointEvent.hx
+++ b/source/funkin/scripting/events/PointEvent.hx
@@ -1,6 +1,6 @@
 package funkin.scripting.events;
 
-class PointEvent extends CancellableEvent {
+final class PointEvent extends CancellableEvent {
 	/**
 		X position
 	**/
diff --git a/source/funkin/scripting/events/RatingUpdateEvent.hx b/source/funkin/scripting/events/RatingUpdateEvent.hx
index 196671cb..8bbb7ed1 100644
--- a/source/funkin/scripting/events/RatingUpdateEvent.hx
+++ b/source/funkin/scripting/events/RatingUpdateEvent.hx
@@ -1,6 +1,6 @@
 package funkin.scripting.events;
 
-class RatingUpdateEvent extends CancellableEvent {
+final class RatingUpdateEvent extends CancellableEvent {
 	/**
 		New combo
 	**/
diff --git a/source/funkin/scripting/events/ResizeEvent.hx b/source/funkin/scripting/events/ResizeEvent.hx
index 1946ca31..b522076e 100644
--- a/source/funkin/scripting/events/ResizeEvent.hx
+++ b/source/funkin/scripting/events/ResizeEvent.hx
@@ -1,6 +1,6 @@
 package funkin.scripting.events;
 
-class ResizeEvent extends CancellableEvent {
+final class ResizeEvent extends CancellableEvent {
 	/**
 	 * New width
 	 */
diff --git a/source/funkin/scripting/events/SimpleNoteEvent.hx b/source/funkin/scripting/events/SimpleNoteEvent.hx
index d9dd7a4f..48b7a832 100644
--- a/source/funkin/scripting/events/SimpleNoteEvent.hx
+++ b/source/funkin/scripting/events/SimpleNoteEvent.hx
@@ -2,7 +2,7 @@ package funkin.scripting.events;
 
 import funkin.game.Note;
 
-class SimpleNoteEvent extends CancellableEvent {
+final class SimpleNoteEvent extends CancellableEvent {
 	/**
 		Note that is affected.
 	**/
diff --git a/source/funkin/scripting/events/StateEvent.hx b/source/funkin/scripting/events/StateEvent.hx
index aa2bbc25..6602dce7 100644
--- a/source/funkin/scripting/events/StateEvent.hx
+++ b/source/funkin/scripting/events/StateEvent.hx
@@ -2,7 +2,7 @@ package funkin.scripting.events;
 
 import flixel.FlxState;
 
-class StateEvent extends CancellableEvent {
+final class StateEvent extends CancellableEvent {
 	/**
 	 * Substate that is about to be opened/closed
 	 */
diff --git a/source/funkin/scripting/events/StrumCreationEvent.hx b/source/funkin/scripting/events/StrumCreationEvent.hx
index 2c855bd9..7c46f6cf 100644
--- a/source/funkin/scripting/events/StrumCreationEvent.hx
+++ b/source/funkin/scripting/events/StrumCreationEvent.hx
@@ -2,7 +2,7 @@ package funkin.scripting.events;
 
 import funkin.game.Strum;
 
-class StrumCreationEvent extends CancellableEvent {
+final class StrumCreationEvent extends CancellableEvent {
 	@:dox(hide) public var __doAnimation = true;
 
 
diff --git a/source/funkin/scripting/events/WeekSelectEvent.hx b/source/funkin/scripting/events/WeekSelectEvent.hx
index bfef919d..8be6e488 100644
--- a/source/funkin/scripting/events/WeekSelectEvent.hx
+++ b/source/funkin/scripting/events/WeekSelectEvent.hx
@@ -2,7 +2,7 @@ package funkin.scripting.events;
 
 import funkin.menus.StoryMenuState.WeekData;
 
-class WeekSelectEvent extends CancellableEvent {
+final class WeekSelectEvent extends CancellableEvent {
 	/**
 	 * Week that is going to be selected
 	 */
diff --git a/source/funkin/system/Controls.hx b/source/funkin/system/Controls.hx
index 5ca81129..a435bd67 100644
--- a/source/funkin/system/Controls.hx
+++ b/source/funkin/system/Controls.hx
@@ -87,6 +87,7 @@ enum KeyboardScheme
  * A list of actions that a player would invoke via some input device.
  * Uses FlxActions to funnel various inputs to a single action.
  */
+@:noCustomClass
 class Controls extends FlxActionSet
 {
 	var _up = new FlxActionDigital(Action.UP);