From 70584c6e88e98549efaa1e7a0bff7b969a8cefc3 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Thu, 13 Jul 2023 01:13:26 -0400
Subject: [PATCH] Make funkin.util.Constants auto-imported
---
source/funkin/DialogueBox.hx | 1 -
source/funkin/MainMenuState.hx | 1 -
source/funkin/TitleState.hx | 1 -
source/funkin/import.hx | 1 +
source/funkin/play/Countdown.hx | 1 -
source/funkin/play/PlayState.hx | 1 -
source/funkin/play/PlayStatePlaylist.hx | 4 +---
.../funkin/play/cutscene/dialogue/ConversationDebugState.hx | 1 -
source/funkin/play/event/SetCameraBopSongEvent.hx | 5 ++---
source/funkin/play/notes/NoteDirection.hx | 1 -
source/funkin/play/song/SongValidator.hx | 1 -
source/funkin/ui/OptionsState.hx | 1 -
source/funkin/ui/PopUpStuff.hx | 1 -
source/funkin/ui/debug/charting/ChartEditorState.hx | 1 -
source/funkin/ui/story/StoryMenuState.hx | 1 -
source/funkin/util/Constants.hx | 1 +
16 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/source/funkin/DialogueBox.hx b/source/funkin/DialogueBox.hx
index 4258f71ce..342fcba10 100644
--- a/source/funkin/DialogueBox.hx
+++ b/source/funkin/DialogueBox.hx
@@ -1,6 +1,5 @@
package funkin;
-import funkin.util.Constants;
import flixel.FlxSprite;
import flixel.addons.text.FlxTypeText;
import flixel.group.FlxSpriteGroup;
diff --git a/source/funkin/MainMenuState.hx b/source/funkin/MainMenuState.hx
index 348bf8d17..020a121c0 100644
--- a/source/funkin/MainMenuState.hx
+++ b/source/funkin/MainMenuState.hx
@@ -26,7 +26,6 @@ import funkin.ui.story.StoryMenuState;
import funkin.ui.OptionsState;
import funkin.ui.PreferencesMenu;
import funkin.ui.Prompt;
-import funkin.util.Constants;
import funkin.util.WindowUtil;
import lime.app.Application;
import openfl.filters.ShaderFilter;
diff --git a/source/funkin/TitleState.hx b/source/funkin/TitleState.hx
index 59845ed40..30e8d67a5 100644
--- a/source/funkin/TitleState.hx
+++ b/source/funkin/TitleState.hx
@@ -14,7 +14,6 @@ import funkin.shaderslmfao.ColorSwap;
import funkin.shaderslmfao.LeftMaskShader;
import funkin.shaderslmfao.TitleOutline;
import funkin.ui.AtlasText;
-import funkin.util.Constants;
import openfl.Assets;
import openfl.display.Sprite;
import openfl.events.AsyncErrorEvent;
diff --git a/source/funkin/import.hx b/source/funkin/import.hx
index 9aa99fade..4ba062b8f 100644
--- a/source/funkin/import.hx
+++ b/source/funkin/import.hx
@@ -2,6 +2,7 @@ package;
#if !macro
// Only import these when we aren't in a macro.
+import funkin.util.Constants;
import funkin.Paths;
import flixel.FlxG; // This one in particular causes a compile error if you're using macros.
diff --git a/source/funkin/play/Countdown.hx b/source/funkin/play/Countdown.hx
index 169bda24b..51d72693e 100644
--- a/source/funkin/play/Countdown.hx
+++ b/source/funkin/play/Countdown.hx
@@ -1,6 +1,5 @@
package funkin.play;
-import funkin.util.Constants;
import flixel.tweens.FlxEase;
import flixel.tweens.FlxTween;
import flixel.FlxSprite;
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index 7d5dc48b9..f651f5ac6 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -47,7 +47,6 @@ import funkin.ui.PopUpStuff;
import funkin.ui.PreferencesMenu;
import funkin.ui.stageBuildShit.StageOffsetSubState;
import funkin.ui.story.StoryMenuState;
-import funkin.util.Constants;
import funkin.util.SerializerUtil;
import funkin.util.SortUtil;
import lime.ui.Haptic;
diff --git a/source/funkin/play/PlayStatePlaylist.hx b/source/funkin/play/PlayStatePlaylist.hx
index acfd26752..6b754878c 100644
--- a/source/funkin/play/PlayStatePlaylist.hx
+++ b/source/funkin/play/PlayStatePlaylist.hx
@@ -1,10 +1,8 @@
package funkin.play;
-import funkin.util.Constants;
-
/**
* Manages playback of multiple songs in a row.
- *
+ *
* TODO: Add getters/setters for all these properties to validate them.
*/
class PlayStatePlaylist
diff --git a/source/funkin/play/cutscene/dialogue/ConversationDebugState.hx b/source/funkin/play/cutscene/dialogue/ConversationDebugState.hx
index 5f2b98f8b..4d7f74a58 100644
--- a/source/funkin/play/cutscene/dialogue/ConversationDebugState.hx
+++ b/source/funkin/play/cutscene/dialogue/ConversationDebugState.hx
@@ -4,7 +4,6 @@ import flixel.FlxState;
import funkin.modding.events.ScriptEventDispatcher;
import funkin.modding.events.ScriptEvent;
import flixel.util.FlxColor;
-import funkin.Paths;
/**
* A state with displays a conversation with no background.
diff --git a/source/funkin/play/event/SetCameraBopSongEvent.hx b/source/funkin/play/event/SetCameraBopSongEvent.hx
index 6f8a0645d..b17d4511c 100644
--- a/source/funkin/play/event/SetCameraBopSongEvent.hx
+++ b/source/funkin/play/event/SetCameraBopSongEvent.hx
@@ -1,6 +1,5 @@
package funkin.play.event;
-import funkin.util.Constants;
import flixel.tweens.FlxTween;
import flixel.FlxCamera;
import flixel.tweens.FlxEase;
@@ -11,7 +10,7 @@ import funkin.play.event.SongEventData.SongEventFieldType;
/**
* This class represents a handler for configuring camera bop intensity and rate.
- *
+ *
* Example: Bop the camera twice as hard, once per beat (rather than once every four beats).
* ```
* {
@@ -22,7 +21,7 @@ import funkin.play.event.SongEventData.SongEventFieldType;
* }
* }
* ```
- *
+ *
* Example: Reset the camera bop to default values.
* ```
* {
diff --git a/source/funkin/play/notes/NoteDirection.hx b/source/funkin/play/notes/NoteDirection.hx
index 8a0fb5ecc..c937916f1 100644
--- a/source/funkin/play/notes/NoteDirection.hx
+++ b/source/funkin/play/notes/NoteDirection.hx
@@ -1,6 +1,5 @@
package funkin.play.notes;
-import funkin.util.Constants;
import flixel.util.FlxColor;
/**
diff --git a/source/funkin/play/song/SongValidator.hx b/source/funkin/play/song/SongValidator.hx
index d393c11eb..936ad46f7 100644
--- a/source/funkin/play/song/SongValidator.hx
+++ b/source/funkin/play/song/SongValidator.hx
@@ -5,7 +5,6 @@ import funkin.play.song.SongData.SongMetadata;
import funkin.play.song.SongData.SongPlayData;
import funkin.play.song.SongData.SongTimeChange;
import funkin.play.song.SongData.SongTimeFormat;
-import funkin.util.Constants;
/**
* For SongMetadata and SongChartData objects,
diff --git a/source/funkin/ui/OptionsState.hx b/source/funkin/ui/OptionsState.hx
index 291dafdf1..6c32c7f4c 100644
--- a/source/funkin/ui/OptionsState.hx
+++ b/source/funkin/ui/OptionsState.hx
@@ -5,7 +5,6 @@ import flixel.FlxSubState;
import flixel.addons.transition.FlxTransitionableState;
import flixel.group.FlxGroup;
import flixel.util.FlxSignal;
-import funkin.util.Constants;
import funkin.util.WindowUtil;
class OptionsState extends MusicBeatState
diff --git a/source/funkin/ui/PopUpStuff.hx b/source/funkin/ui/PopUpStuff.hx
index 3e848b9e6..75fc87c8b 100644
--- a/source/funkin/ui/PopUpStuff.hx
+++ b/source/funkin/ui/PopUpStuff.hx
@@ -4,7 +4,6 @@ import flixel.FlxSprite;
import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.tweens.FlxTween;
import funkin.play.PlayState;
-import funkin.util.Constants;
class PopUpStuff extends FlxTypedGroup<FlxSprite>
{
diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index 566e75706..aad43f93f 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -34,7 +34,6 @@ import funkin.ui.debug.charting.ChartEditorThemeHandler.ChartEditorTheme;
import funkin.ui.debug.charting.ChartEditorToolboxHandler.ChartEditorToolMode;
import funkin.ui.haxeui.components.CharacterPlayer;
import funkin.ui.haxeui.HaxeUIState;
-import funkin.util.Constants;
import funkin.util.FileUtil;
import funkin.util.DateUtil;
import funkin.util.SerializerUtil;
diff --git a/source/funkin/ui/story/StoryMenuState.hx b/source/funkin/ui/story/StoryMenuState.hx
index 37aa94d23..8badbbded 100644
--- a/source/funkin/ui/story/StoryMenuState.hx
+++ b/source/funkin/ui/story/StoryMenuState.hx
@@ -16,7 +16,6 @@ import funkin.play.PlayState;
import funkin.play.PlayStatePlaylist;
import funkin.play.song.Song;
import funkin.play.song.SongData.SongDataParser;
-import funkin.util.Constants;
class StoryMenuState extends MusicBeatState
{
diff --git a/source/funkin/util/Constants.hx b/source/funkin/util/Constants.hx
index bc280f176..0278d59b9 100644
--- a/source/funkin/util/Constants.hx
+++ b/source/funkin/util/Constants.hx
@@ -205,6 +205,7 @@ class Constants
* OTHER
*/
// ==============================
+ public static final LIBRARY_SEPARATOR:String = ':';
/**
* All MP3 decoders introduce a playback delay of `528` samples,