From 134b4678769de803b245c182fed9afe07fc29049 Mon Sep 17 00:00:00 2001
From: lemz <ismael.amjad07@gmail.com>
Date: Fri, 31 May 2024 16:55:42 +0200
Subject: [PATCH] rename stuff
---
source/funkin/InitState.hx | 4 ++--
source/funkin/play/PlayState.hx | 4 ++--
.../notekind/{NoteKindScript.hx => NoteKind.hx} | 2 +-
...teKindScriptManager.hx => NoteKindManager.hx} | 16 ++++++++--------
.../play/notes/notekind/ScriptedNoteKind.hx | 9 +++++++++
.../notes/notekind/ScriptedNoteKindScript.hx | 9 ---------
6 files changed, 22 insertions(+), 22 deletions(-)
rename source/funkin/play/notes/notekind/{NoteKindScript.hx => NoteKind.hx} (94%)
rename source/funkin/play/notes/notekind/{NoteKindScriptManager.hx => NoteKindManager.hx} (64%)
create mode 100644 source/funkin/play/notes/notekind/ScriptedNoteKind.hx
delete mode 100644 source/funkin/play/notes/notekind/ScriptedNoteKindScript.hx
diff --git a/source/funkin/InitState.hx b/source/funkin/InitState.hx
index a339d2655..34516dee1 100644
--- a/source/funkin/InitState.hx
+++ b/source/funkin/InitState.hx
@@ -27,7 +27,7 @@ import funkin.data.dialogue.speaker.SpeakerRegistry;
import funkin.data.freeplay.album.AlbumRegistry;
import funkin.data.song.SongRegistry;
import funkin.play.character.CharacterData.CharacterDataParser;
-import funkin.play.notes.notekind.NoteKindScriptManager;
+import funkin.play.notes.notekind.NoteKindManager;
import funkin.modding.module.ModuleHandler;
import funkin.ui.title.TitleState;
import funkin.util.CLIUtil;
@@ -177,7 +177,7 @@ class InitState extends FlxState
// Move it to use a BaseRegistry.
CharacterDataParser.loadCharacterCache();
- NoteKindScriptManager.loadScripts();
+ NoteKindManager.loadScripts();
ModuleHandler.buildModuleCallbacks();
ModuleHandler.loadModuleCache();
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index 93306e9d5..bc441a7d5 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -49,7 +49,7 @@ import funkin.play.notes.NoteSprite;
import funkin.play.notes.notestyle.NoteStyle;
import funkin.play.notes.Strumline;
import funkin.play.notes.SustainTrail;
-import funkin.play.notes.notekind.NoteKindScriptManager;
+import funkin.play.notes.notekind.NoteKindManager;
import funkin.play.scoring.Scoring;
import funkin.play.song.Song;
import funkin.play.stage.Stage;
@@ -1182,7 +1182,7 @@ class PlayState extends MusicBeatSubState
if (Std.isOfType(event, NoteScriptEvent))
{
var noteEvent:NoteScriptEvent = cast(event, NoteScriptEvent);
- NoteKindScriptManager.callEvent(noteEvent.note.noteData.kind, noteEvent);
+ NoteKindManager.callEvent(noteEvent.note.noteData.kind, noteEvent);
}
}
diff --git a/source/funkin/play/notes/notekind/NoteKindScript.hx b/source/funkin/play/notes/notekind/NoteKind.hx
similarity index 94%
rename from source/funkin/play/notes/notekind/NoteKindScript.hx
rename to source/funkin/play/notes/notekind/NoteKind.hx
index baa57b146..77b2bbc45 100644
--- a/source/funkin/play/notes/notekind/NoteKindScript.hx
+++ b/source/funkin/play/notes/notekind/NoteKind.hx
@@ -6,7 +6,7 @@ import funkin.modding.events.ScriptEvent;
/**
* Class for note scripts
*/
-class NoteKindScript implements INoteScriptedClass
+class NoteKind implements INoteScriptedClass
{
/**
* the name of the note kind
diff --git a/source/funkin/play/notes/notekind/NoteKindScriptManager.hx b/source/funkin/play/notes/notekind/NoteKindManager.hx
similarity index 64%
rename from source/funkin/play/notes/notekind/NoteKindScriptManager.hx
rename to source/funkin/play/notes/notekind/NoteKindManager.hx
index dc22732b6..eaee0d319 100644
--- a/source/funkin/play/notes/notekind/NoteKindScriptManager.hx
+++ b/source/funkin/play/notes/notekind/NoteKindManager.hx
@@ -4,13 +4,13 @@ import funkin.modding.events.ScriptEventDispatcher;
import funkin.modding.events.ScriptEvent;
import funkin.ui.debug.charting.util.ChartEditorDropdowns;
-class NoteKindScriptManager
+class NoteKindManager
{
- static var noteKindScripts:Map<String, NoteKindScript> = [];
+ static var noteKinds:Map<String, NoteKind> = [];
public static function loadScripts():Void
{
- var scriptedClassName:Array<String> = ScriptedNoteKindScript.listScriptClasses();
+ var scriptedClassName:Array<String> = ScriptedNoteKind.listScriptClasses();
if (scriptedClassName.length > 0)
{
trace('Instantiating ${scriptedClassName.length} scripted note kind...');
@@ -18,9 +18,9 @@ class NoteKindScriptManager
{
try
{
- var script:NoteKindScript = ScriptedNoteKindScript.init(scriptedClass, "unknown");
+ var script:NoteKind = ScriptedNoteKind.init(scriptedClass, "unknown");
trace(' Initialized scripted note kind: ${script.noteKind}');
- noteKindScripts.set(script.noteKind, script);
+ noteKinds.set(script.noteKind, script);
ChartEditorDropdowns.NOTE_KINDS.set(script.noteKind, script.description);
}
catch (e)
@@ -34,13 +34,13 @@ class NoteKindScriptManager
public static function callEvent(noteKind:String, event:ScriptEvent):Void
{
- var noteKindScript:NoteKindScript = noteKindScripts.get(noteKind);
+ var noteKind:NoteKind = noteKinds.get(noteKind);
- if (noteKindScript == null)
+ if (noteKind == null)
{
return;
}
- ScriptEventDispatcher.callEvent(noteKindScript, event);
+ ScriptEventDispatcher.callEvent(noteKind, event);
}
}
diff --git a/source/funkin/play/notes/notekind/ScriptedNoteKind.hx b/source/funkin/play/notes/notekind/ScriptedNoteKind.hx
new file mode 100644
index 000000000..cd1781394
--- /dev/null
+++ b/source/funkin/play/notes/notekind/ScriptedNoteKind.hx
@@ -0,0 +1,9 @@
+package funkin.play.notes.notekind;
+
+/**
+ * A script that can be tied to a NoteKind.
+ * Create a scripted class that extends NoteKind,
+ * then call `super('noteKind')` in the constructor to use this.
+ */
+@:hscriptClass
+class ScriptedNoteKind extends NoteKind implements polymod.hscript.HScriptedClass {}
diff --git a/source/funkin/play/notes/notekind/ScriptedNoteKindScript.hx b/source/funkin/play/notes/notekind/ScriptedNoteKindScript.hx
deleted file mode 100644
index d54a0cde2..000000000
--- a/source/funkin/play/notes/notekind/ScriptedNoteKindScript.hx
+++ /dev/null
@@ -1,9 +0,0 @@
-package funkin.play.notes.notekind;
-
-/**
- * A script that can be tied to a NoteKindScript.
- * Create a scripted class that extends NoteKindScript,
- * then call `super('noteKind')` in the constructor to use this.
- */
-@:hscriptClass
-class ScriptedNoteKindScript extends NoteKindScript implements polymod.hscript.HScriptedClass {}