From 06828cade72bc414739a8e496af704b1e294a427 Mon Sep 17 00:00:00 2001 From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com> Date: Tue, 18 Apr 2023 02:13:04 +0200 Subject: [PATCH] time to break your mods again for ease of use --- Project.xml | 8 ++-- source/Main.hx | 2 +- source/flx3d/Flx3DCamera.hx | 4 +- source/flx3d/Flx3DView.hx | 4 +- .../funkin/{system => backend}/FlxAnimate.hx | 2 +- .../{system => backend}/FunkinSprite.hx | 10 ++--- .../funkin/{system => backend}/FunkinText.hx | 2 +- .../{system => backend}/MusicBeatGroup.hx | 4 +- .../{system => backend}/MusicBeatState.hx | 16 +++---- .../{system => backend}/MusicBeatSubstate.hx | 15 +++---- .../MusicBeatTransition.hx | 4 +- .../funkin/{ => backend}/assets/AssetPaths.hx | 2 +- .../{ => backend}/assets/AssetsLibraryList.hx | 8 ++-- .../{ => backend}/assets/LimeLibrarySymbol.hx | 2 +- .../assets/ModdableAssetsFolder.hx | 2 +- .../{ => backend}/assets/ModsAssetLibrary.hx | 2 +- .../funkin/{ => backend}/assets/ModsFolder.hx | 6 +-- .../{ => backend}/assets/ModsFolderLibrary.hx | 2 +- source/funkin/{ => backend}/assets/Paths.hx | 12 +++--- .../{ => backend}/assets/ZipFolderLibrary.hx | 6 +-- .../{ => backend}/chart/BaseGameParser.hx | 2 +- source/funkin/{ => backend}/chart/Chart.hx | 4 +- .../funkin/{ => backend}/chart/ChartData.hx | 2 +- .../{ => backend}/scripting/DummyScript.hx | 2 +- .../{ => backend}/scripting/EventManager.hx | 4 +- .../{ => backend}/scripting/GlobalScript.hx | 8 ++-- .../funkin/{ => backend}/scripting/HScript.hx | 2 +- .../{ => backend}/scripting/ModState.hx | 2 +- .../{ => backend}/scripting/ModSubState.hx | 2 +- .../scripting/MultiThreadedScript.hx | 2 +- .../funkin/{ => backend}/scripting/Script.hx | 42 +++++++++---------- .../{ => backend}/scripting/ScriptPack.hx | 4 +- .../scripting/events/CamMoveEvent.hx | 2 +- .../scripting/events/CancellableEvent.hx | 4 +- .../scripting/events/CountdownEvent.hx | 2 +- .../scripting/events/DanceEvent.hx | 2 +- .../scripting/events/DirectionAnimEvent.hx | 4 +- .../events/DiscordPresenceUpdateEvent.hx | 2 +- .../events/FreeplaySongSelectEvent.hx | 2 +- .../scripting/events/InputSystemEvent.hx | 2 +- .../scripting/events/MenuChangeEvent.hx | 2 +- .../scripting/events/NameEvent.hx | 2 +- .../scripting/events/NoteCreationEvent.hx | 2 +- .../scripting/events/NoteHitEvent.hx | 2 +- .../scripting/events/NoteUpdateEvent.hx | 2 +- .../scripting/events/PauseCreationEvent.hx | 2 +- .../scripting/events/PlayAnimEvent.hx | 2 +- .../scripting/events/PointEvent.hx | 2 +- .../scripting/events/RatingUpdateEvent.hx | 2 +- .../scripting/events/ResizeEvent.hx | 2 +- .../scripting/events/SimpleNoteEvent.hx | 2 +- .../scripting/events/StateEvent.hx | 2 +- .../scripting/events/StrumCreationEvent.hx | 2 +- .../scripting/events/WeekSelectEvent.hx | 2 +- .../{ => backend}/shaders/BlendModeEffect.hx | 2 +- .../{ => backend}/shaders/CustomShader.hx | 2 +- .../{ => backend}/shaders/FunkinShader.hx | 2 +- .../{ => backend}/shaders/OverlayShader.hx | 2 +- .../{ => backend}/shaders/WiggleEffect.hx | 2 +- .../system/CommandLineHandler.hx | 4 +- .../funkin/{ => backend}/system/Conductor.hx | 8 ++-- .../funkin/{ => backend}/system/Controls.hx | 2 +- .../funkin/{ => backend}/system/ErrorCode.hx | 2 +- .../funkin/{ => backend}/system/FunkinGame.hx | 2 +- .../system/FunkinRatioScaleMode.hx | 2 +- .../system/GraphicCacheSprite.hx | 2 +- source/funkin/{ => backend}/system/Logs.hx | 6 +-- source/funkin/{ => backend}/system/Main.hx | 20 ++++----- .../funkin/{ => backend}/system/MainState.hx | 4 +- .../system/OptimizedBitmapData.hx | 2 +- .../system/framerate/AssetTreeInfo.hx | 4 +- .../system/framerate/CodenameBuildField.hx | 4 +- .../system/framerate/ConductorInfo.hx | 2 +- .../system/framerate/FlixelInfo.hx | 2 +- .../system/framerate/Framerate.hx | 2 +- .../system/framerate/FramerateCategory.hx | 2 +- .../system/framerate/FramerateCounter.hx | 2 +- .../system/framerate/MemoryCounter.hx | 2 +- .../system/framerate/StatsInfo.hx | 2 +- .../system/framerate/SystemInfo.hx | 6 +-- .../{ => backend}/system/github/GitHub.hx | 2 +- .../system/github/GitHubAsset.hx | 4 +- .../system/github/GitHubContributor.hx | 2 +- .../system/github/GitHubException.hx | 2 +- .../system/github/GitHubReactions.hx | 2 +- .../system/github/GitHubRelease.hx | 2 +- .../{ => backend}/system/github/GitHubUser.hx | 2 +- .../system/interfaces/IBeatReceiver.hx | 2 +- .../system/interfaces/IOffsetCompatible.hx | 2 +- .../system/macros/DefinesMacro.hx | 2 +- .../{ => backend}/system/macros/EventMacro.hx | 2 +- .../system/macros/FunkinSaveMacro.hx | 2 +- .../system/macros/GitCommitMacro.hx | 2 +- .../system/macros/NewHaxeWarning.hx | 2 +- .../system/macros/OptionsMacro.hx | 2 +- .../system/macros/ScriptsMacro.hx | 4 +- .../system/macros/SoftcodedClassMacro.hx | 16 +++---- .../{ => backend}/system/macros/import.hx | 0 .../system/modules/AudioSwitchFix.hx | 4 +- .../system/modules/CrashHandler.hx | 4 +- .../system/modules/FunkinCache.hx | 2 +- .../funkin/{ => backend}/system/net/Socket.hx | 2 +- .../system/updating/AsyncUpdater.hx | 6 +-- .../system/updating/UpdateAvailableScreen.hx | 8 ++-- .../system/updating/UpdateScreen.hx | 8 ++-- .../system/updating/UpdateUtil.hx | 8 ++-- .../funkin/{ => backend}/utils/BitmapUtil.hx | 2 +- source/funkin/{ => backend}/utils/CoolUtil.hx | 6 +-- .../funkin/{ => backend}/utils/DiscordUtil.hx | 6 +-- .../funkin/{ => backend}/utils/EngineUtil.hx | 6 +-- .../utils/FlxInterpolateColor.hx | 2 +- .../utils/FunkinParentDisabler.hx | 2 +- source/funkin/{ => backend}/utils/IniUtil.hx | 2 +- .../{ => backend}/utils/MarkdownUtil.hx | 2 +- .../funkin/{ => backend}/utils/MemoryUtil.hx | 10 ++--- .../funkin/{ => backend}/utils/NativeAPI.hx | 4 +- source/funkin/{ => backend}/utils/NdllUtil.hx | 2 +- source/funkin/{ => backend}/utils/SysZip.hx | 2 +- .../funkin/{ => backend}/utils/ThreadUtil.hx | 2 +- source/funkin/{ => backend}/utils/XMLUtil.hx | 12 +++--- source/funkin/{ => backend}/utils/ZipUtil.hx | 2 +- .../utils/native/HiddenProcess.hx | 2 +- .../{ => backend}/utils/native/Linux.hx | 2 +- .../funkin/{ => backend}/utils/native/Mac.hx | 2 +- .../{ => backend}/utils/native/Windows.hx | 8 ++-- source/funkin/editors/DebugOptions.hx | 2 +- source/funkin/editors/charter/Charter.hx | 6 +-- source/funkin/editors/charter/CharterNote.hx | 4 +- .../editors/charter/CharterNoteGroup.hx | 2 +- .../editors/charter/CharterSelection.hx | 2 +- .../editors/charter/CharterStrumline.hx | 2 +- source/funkin/editors/ui/UICheckbox.hx | 2 +- source/funkin/editors/ui/UIState.hx | 2 +- source/funkin/editors/ui/UIText.hx | 2 +- source/funkin/editors/ui/UIWarningSubstate.hx | 2 +- source/funkin/game/Character.hx | 18 ++++---- source/funkin/game/GameOverSubstate.hx | 2 +- source/funkin/game/Note.hx | 8 ++-- source/funkin/game/NoteGroup.hx | 2 +- source/funkin/game/PlayState.hx | 16 +++---- source/funkin/game/Stage.hx | 6 +-- source/funkin/game/Strum.hx | 2 +- source/funkin/game/StrumLine.hx | 8 ++-- .../funkin/game/cutscenes/ScriptedCutscene.hx | 4 +- source/funkin/game/cutscenes/VideoCutscene.hx | 2 +- source/funkin/import.hx | 18 ++++---- source/funkin/menus/BetaWarningState.hx | 2 +- source/funkin/menus/FreeplayState.hx | 8 ++-- source/funkin/menus/MainMenuState.hx | 8 ++-- source/funkin/menus/ModSwitchMenu.hx | 2 +- source/funkin/menus/PauseSubState.hx | 8 ++-- source/funkin/menus/StoryMenuState.hx | 6 +-- source/funkin/menus/TitleState.hx | 16 +++---- .../funkin/menus/credits/CreditsCodename.hx | 10 ++--- source/funkin/menus/ui/Alphabet.hx | 4 +- source/funkin/options/Options.hx | 6 +-- source/funkin/options/OptionsMenu.hx | 2 +- source/funkin/options/PlayerSettings.hx | 2 +- source/funkin/options/TreeMenu.hx | 2 +- .../funkin/options/categories/MiscOptions.hx | 4 +- .../options/keybinds/ChangeKeybindSubState.hx | 2 +- .../funkin/options/keybinds/KeybindSetting.hx | 2 +- .../options/keybinds/KeybindsOptions.hx | 2 +- source/funkin/options/type/OptionType.hx | 2 +- source/funkin/savedata/FunkinSave.hx | 2 +- source/lime/system/System.hx | 4 +- source/lime/utils/Log.hx | 2 +- source/openfl/media/Sound.hx | 4 +- source/openfl/utils/Assets.hx | 2 +- source/scripting/CharacterScript.hx | 2 +- source/scripting/PlayStateScript.hx | 2 +- 171 files changed, 360 insertions(+), 357 deletions(-) rename source/funkin/{system => backend}/FlxAnimate.hx (98%) rename source/funkin/{system => backend}/FunkinSprite.hx (96%) rename source/funkin/{system => backend}/FunkinText.hx (94%) rename source/funkin/{system => backend}/MusicBeatGroup.hx (86%) rename source/funkin/{system => backend}/MusicBeatState.hx (94%) rename source/funkin/{system => backend}/MusicBeatSubstate.hx (95%) rename source/funkin/{system => backend}/MusicBeatTransition.hx (96%) rename source/funkin/{ => backend}/assets/AssetPaths.hx (98%) rename source/funkin/{ => backend}/assets/AssetsLibraryList.hx (96%) rename source/funkin/{ => backend}/assets/LimeLibrarySymbol.hx (95%) rename source/funkin/{ => backend}/assets/ModdableAssetsFolder.hx (97%) rename source/funkin/{ => backend}/assets/ModsAssetLibrary.hx (96%) rename source/funkin/{ => backend}/assets/ModsFolder.hx (96%) rename source/funkin/{ => backend}/assets/ModsFolderLibrary.hx (99%) rename source/funkin/{ => backend}/assets/Paths.hx (97%) rename source/funkin/{ => backend}/assets/ZipFolderLibrary.hx (96%) rename source/funkin/{ => backend}/chart/BaseGameParser.hx (99%) rename source/funkin/{ => backend}/chart/Chart.hx (98%) rename source/funkin/{ => backend}/chart/ChartData.hx (98%) rename source/funkin/{ => backend}/scripting/DummyScript.hx (94%) rename source/funkin/{ => backend}/scripting/EventManager.hx (91%) rename source/funkin/{ => backend}/scripting/GlobalScript.hx (94%) rename source/funkin/{ => backend}/scripting/HScript.hx (99%) rename source/funkin/{ => backend}/scripting/ModState.hx (85%) rename source/funkin/{ => backend}/scripting/ModSubState.hx (86%) rename source/funkin/{ => backend}/scripting/MultiThreadedScript.hx (98%) rename source/funkin/{ => backend}/scripting/Script.hx (84%) rename source/funkin/{ => backend}/scripting/ScriptPack.hx (96%) rename source/funkin/{ => backend}/scripting/events/CamMoveEvent.hx (89%) rename source/funkin/{ => backend}/scripting/events/CancellableEvent.hx (92%) rename source/funkin/{ => backend}/scripting/events/CountdownEvent.hx (96%) rename source/funkin/{ => backend}/scripting/events/DanceEvent.hx (65%) rename source/funkin/{ => backend}/scripting/events/DirectionAnimEvent.hx (86%) rename source/funkin/{ => backend}/scripting/events/DiscordPresenceUpdateEvent.hx (88%) rename source/funkin/{ => backend}/scripting/events/FreeplaySongSelectEvent.hx (89%) rename source/funkin/{ => backend}/scripting/events/InputSystemEvent.hx (95%) rename source/funkin/{ => backend}/scripting/events/MenuChangeEvent.hx (88%) rename source/funkin/{ => backend}/scripting/events/NameEvent.hx (69%) rename source/funkin/{ => backend}/scripting/events/NoteCreationEvent.hx (95%) rename source/funkin/{ => backend}/scripting/events/NoteHitEvent.hx (99%) rename source/funkin/{ => backend}/scripting/events/NoteUpdateEvent.hx (96%) rename source/funkin/{ => backend}/scripting/events/PauseCreationEvent.hx (86%) rename source/funkin/{ => backend}/scripting/events/PlayAnimEvent.hx (96%) rename source/funkin/{ => backend}/scripting/events/PointEvent.hx (77%) rename source/funkin/{ => backend}/scripting/events/RatingUpdateEvent.hx (81%) rename source/funkin/{ => backend}/scripting/events/ResizeEvent.hx (87%) rename source/funkin/{ => backend}/scripting/events/SimpleNoteEvent.hx (77%) rename source/funkin/{ => backend}/scripting/events/StateEvent.hx (80%) rename source/funkin/{ => backend}/scripting/events/StrumCreationEvent.hx (94%) rename source/funkin/{ => backend}/scripting/events/WeekSelectEvent.hx (92%) rename source/funkin/{ => backend}/shaders/BlendModeEffect.hx (95%) rename source/funkin/{ => backend}/shaders/CustomShader.hx (97%) rename source/funkin/{ => backend}/shaders/FunkinShader.hx (99%) rename source/funkin/{ => backend}/shaders/OverlayShader.hx (95%) rename source/funkin/{ => backend}/shaders/WiggleEffect.hx (98%) rename source/funkin/{ => backend}/system/CommandLineHandler.hx (94%) rename source/funkin/{ => backend}/system/Conductor.hx (97%) rename source/funkin/{ => backend}/system/Controls.hx (99%) rename source/funkin/{ => backend}/system/ErrorCode.hx (83%) rename source/funkin/{ => backend}/system/FunkinGame.hx (95%) rename source/funkin/{ => backend}/system/FunkinRatioScaleMode.hx (97%) rename source/funkin/{ => backend}/system/GraphicCacheSprite.hx (97%) rename source/funkin/{ => backend}/system/Logs.hx (96%) rename source/funkin/{ => backend}/system/Main.hx (92%) rename source/funkin/{ => backend}/system/MainState.hx (95%) rename source/funkin/{ => backend}/system/OptimizedBitmapData.hx (97%) rename source/funkin/{ => backend}/system/framerate/AssetTreeInfo.hx (90%) rename source/funkin/{ => backend}/system/framerate/CodenameBuildField.hx (80%) rename source/funkin/{ => backend}/system/framerate/ConductorInfo.hx (93%) rename source/funkin/{ => backend}/system/framerate/FlixelInfo.hx (94%) rename source/funkin/{ => backend}/system/framerate/Framerate.hx (98%) rename source/funkin/{ => backend}/system/framerate/FramerateCategory.hx (96%) rename source/funkin/{ => backend}/system/framerate/FramerateCounter.hx (95%) rename source/funkin/{ => backend}/system/framerate/MemoryCounter.hx (96%) rename source/funkin/{ => backend}/system/framerate/StatsInfo.hx (94%) rename source/funkin/{ => backend}/system/framerate/SystemInfo.hx (94%) rename source/funkin/{ => backend}/system/github/GitHub.hx (98%) rename source/funkin/{ => backend}/system/github/GitHubAsset.hx (78%) rename source/funkin/{ => backend}/system/github/GitHubContributor.hx (92%) rename source/funkin/{ => backend}/system/github/GitHubException.hx (90%) rename source/funkin/{ => backend}/system/github/GitHubReactions.hx (85%) rename source/funkin/{ => backend}/system/github/GitHubRelease.hx (95%) rename source/funkin/{ => backend}/system/github/GitHubUser.hx (98%) rename source/funkin/{ => backend}/system/interfaces/IBeatReceiver.hx (79%) rename source/funkin/{ => backend}/system/interfaces/IOffsetCompatible.hx (71%) rename source/funkin/{ => backend}/system/macros/DefinesMacro.hx (93%) rename source/funkin/{ => backend}/system/macros/EventMacro.hx (98%) rename source/funkin/{ => backend}/system/macros/FunkinSaveMacro.hx (98%) rename source/funkin/{ => backend}/system/macros/GitCommitMacro.hx (96%) rename source/funkin/{ => backend}/system/macros/NewHaxeWarning.hx (92%) rename source/funkin/{ => backend}/system/macros/OptionsMacro.hx (96%) rename source/funkin/{ => backend}/system/macros/ScriptsMacro.hx (94%) rename source/funkin/{ => backend}/system/macros/SoftcodedClassMacro.hx (87%) rename source/funkin/{ => backend}/system/macros/import.hx (100%) rename source/funkin/{ => backend}/system/modules/AudioSwitchFix.hx (94%) rename source/funkin/{ => backend}/system/modules/CrashHandler.hx (95%) rename source/funkin/{ => backend}/system/modules/FunkinCache.hx (99%) rename source/funkin/{ => backend}/system/net/Socket.hx (97%) rename source/funkin/{ => backend}/system/updating/AsyncUpdater.hx (97%) rename source/funkin/{ => backend}/system/updating/UpdateAvailableScreen.hx (95%) rename source/funkin/{ => backend}/system/updating/UpdateScreen.hx (96%) rename source/funkin/{ => backend}/system/updating/UpdateUtil.hx (93%) rename source/funkin/{ => backend}/utils/BitmapUtil.hx (98%) rename source/funkin/{ => backend}/utils/CoolUtil.hx (99%) rename source/funkin/{ => backend}/utils/DiscordUtil.hx (93%) rename source/funkin/{ => backend}/utils/EngineUtil.hx (74%) rename source/funkin/{ => backend}/utils/FlxInterpolateColor.hx (97%) rename source/funkin/{ => backend}/utils/FunkinParentDisabler.hx (98%) rename source/funkin/{ => backend}/utils/IniUtil.hx (97%) rename source/funkin/{ => backend}/utils/MarkdownUtil.hx (99%) rename source/funkin/{ => backend}/utils/MemoryUtil.hx (92%) rename source/funkin/{ => backend}/utils/NativeAPI.hx (97%) rename source/funkin/{ => backend}/utils/NdllUtil.hx (98%) rename source/funkin/{ => backend}/utils/SysZip.hx (99%) rename source/funkin/{ => backend}/utils/ThreadUtil.hx (95%) rename source/funkin/{ => backend}/utils/XMLUtil.hx (96%) rename source/funkin/{ => backend}/utils/ZipUtil.hx (99%) rename source/funkin/{ => backend}/utils/native/HiddenProcess.hx (98%) rename source/funkin/{ => backend}/utils/native/Linux.hx (92%) rename source/funkin/{ => backend}/utils/native/Mac.hx (90%) rename source/funkin/{ => backend}/utils/native/Windows.hx (94%) diff --git a/Project.xml b/Project.xml index 99ad217d..619b8369 100644 --- a/Project.xml +++ b/Project.xml @@ -3,7 +3,7 @@ @@ -68,7 +68,7 @@ - + @@ -180,10 +180,10 @@
- +
- + diff --git a/source/Main.hx b/source/Main.hx index 09935a64..dfea956d 100644 --- a/source/Main.hx +++ b/source/Main.hx @@ -1 +1 @@ -typedef Main = funkin.system.Main; \ No newline at end of file +typedef Main = funkin.backend.system.Main; \ No newline at end of file diff --git a/source/flx3d/Flx3DCamera.hx b/source/flx3d/Flx3DCamera.hx index 2ecfbf85..183b7225 100644 --- a/source/flx3d/Flx3DCamera.hx +++ b/source/flx3d/Flx3DCamera.hx @@ -10,7 +10,7 @@ import away3d.library.Asset3DLibraryBundle; import away3d.events.LoaderEvent; import away3d.loaders.AssetLoader; import away3d.loaders.misc.AssetLoaderToken; -import funkin.system.Logs; +import funkin.backend.system.Logs; import flixel.FlxG; import flx3d.Flx3DUtil; import away3d.library.assets.Asset3DType; @@ -24,7 +24,7 @@ import away3d.loaders.misc.AssetLoaderContext; import openfl.Assets; import away3d.entities.Mesh; import away3d.loaders.Loader3D; -import funkin.utils.NativeAPI.ConsoleColor; +import funkin.backend.utils.NativeAPI.ConsoleColor; import flixel.FlxCamera; import away3d.containers.View3D; diff --git a/source/flx3d/Flx3DView.hx b/source/flx3d/Flx3DView.hx index 1a24ce42..7c7ba244 100644 --- a/source/flx3d/Flx3DView.hx +++ b/source/flx3d/Flx3DView.hx @@ -10,7 +10,7 @@ import away3d.library.Asset3DLibraryBundle; import away3d.events.LoaderEvent; import away3d.loaders.AssetLoader; import away3d.loaders.misc.AssetLoaderToken; -import funkin.system.Logs; +import funkin.backend.system.Logs; import flixel.FlxG; import flx3d.Flx3DUtil; import away3d.library.assets.Asset3DType; @@ -24,7 +24,7 @@ import away3d.loaders.misc.AssetLoaderContext; import openfl.Assets; import away3d.entities.Mesh; import away3d.loaders.Loader3D; -import funkin.utils.NativeAPI.ConsoleColor; +import funkin.backend.utils.NativeAPI.ConsoleColor; // FlxView3D with helpers for easier updating diff --git a/source/funkin/system/FlxAnimate.hx b/source/funkin/backend/FlxAnimate.hx similarity index 98% rename from source/funkin/system/FlxAnimate.hx rename to source/funkin/backend/FlxAnimate.hx index 176ec3b0..4e6a0660 100644 --- a/source/funkin/system/FlxAnimate.hx +++ b/source/funkin/backend/FlxAnimate.hx @@ -1,4 +1,4 @@ -package funkin.system; +package funkin.backend; import flixel.graphics.frames.FlxFramesCollection; import openfl.geom.ColorTransform; diff --git a/source/funkin/system/FunkinSprite.hx b/source/funkin/backend/FunkinSprite.hx similarity index 96% rename from source/funkin/system/FunkinSprite.hx rename to source/funkin/backend/FunkinSprite.hx index a3b94271..fdd897ee 100644 --- a/source/funkin/system/FunkinSprite.hx +++ b/source/funkin/backend/FunkinSprite.hx @@ -1,15 +1,15 @@ -package funkin.system; +package funkin.backend; -import funkin.utils.XMLUtil.IXMLEvents; +import funkin.backend.utils.XMLUtil.IXMLEvents; import flixel.system.FlxAssets.FlxGraphicAsset; import flixel.addons.effects.FlxSkewedSprite; import haxe.io.Path; -import funkin.scripting.events.PlayAnimEvent.PlayAnimContext; -import funkin.system.interfaces.IOffsetCompatible; +import funkin.backend.scripting.events.PlayAnimEvent.PlayAnimContext; +import funkin.backend.system.interfaces.IOffsetCompatible; import flixel.math.FlxMatrix; import flixel.math.FlxRect; import flixel.math.FlxPoint; -import funkin.system.interfaces.IBeatReceiver; +import funkin.backend.system.interfaces.IBeatReceiver; @:enum abstract XMLAnimType(Int) diff --git a/source/funkin/system/FunkinText.hx b/source/funkin/backend/FunkinText.hx similarity index 94% rename from source/funkin/system/FunkinText.hx rename to source/funkin/backend/FunkinText.hx index 2fb67aa9..5b2c3280 100644 --- a/source/funkin/system/FunkinText.hx +++ b/source/funkin/backend/FunkinText.hx @@ -1,4 +1,4 @@ -package funkin.system; +package funkin.backend; import flixel.util.FlxColor; import flixel.text.FlxText; diff --git a/source/funkin/system/MusicBeatGroup.hx b/source/funkin/backend/MusicBeatGroup.hx similarity index 86% rename from source/funkin/system/MusicBeatGroup.hx rename to source/funkin/backend/MusicBeatGroup.hx index 44a01dca..ec6f2693 100644 --- a/source/funkin/system/MusicBeatGroup.hx +++ b/source/funkin/backend/MusicBeatGroup.hx @@ -1,6 +1,6 @@ -package funkin.system; +package funkin.backend; -import funkin.system.interfaces.IBeatReceiver; +import funkin.backend.system.interfaces.IBeatReceiver; class MusicBeatGroup extends FlxTypedSpriteGroup implements IBeatReceiver { public function beatHit(curBeat:Int) { diff --git a/source/funkin/system/MusicBeatState.hx b/source/funkin/backend/MusicBeatState.hx similarity index 94% rename from source/funkin/system/MusicBeatState.hx rename to source/funkin/backend/MusicBeatState.hx index 38699c72..567cfbf9 100644 --- a/source/funkin/system/MusicBeatState.hx +++ b/source/funkin/backend/MusicBeatState.hx @@ -1,14 +1,16 @@ -package funkin.system; +package funkin.backend; import flixel.addons.transition.FlxTransitionableState; -import funkin.system.framerate.Framerate; -import funkin.scripting.DummyScript; +import funkin.backend.system.framerate.Framerate; +import funkin.backend.system.GraphicCacheSprite; +import funkin.backend.system.Controls; +import funkin.backend.scripting.DummyScript; import flixel.FlxState; import flixel.FlxSubState; -import funkin.scripting.events.*; -import funkin.scripting.Script; -import funkin.system.interfaces.IBeatReceiver; -import funkin.system.Conductor; +import funkin.backend.scripting.events.*; +import funkin.backend.scripting.Script; +import funkin.backend.system.interfaces.IBeatReceiver; +import funkin.backend.system.Conductor; import funkin.options.PlayerSettings; class MusicBeatState extends FlxState implements IBeatReceiver diff --git a/source/funkin/system/MusicBeatSubstate.hx b/source/funkin/backend/MusicBeatSubstate.hx similarity index 95% rename from source/funkin/system/MusicBeatSubstate.hx rename to source/funkin/backend/MusicBeatSubstate.hx index 61b2fa03..8324e5ca 100644 --- a/source/funkin/system/MusicBeatSubstate.hx +++ b/source/funkin/backend/MusicBeatSubstate.hx @@ -1,12 +1,13 @@ -package funkin.system; +package funkin.backend; import flixel.FlxState; -import funkin.scripting.events.*; -import funkin.scripting.Script; -import funkin.scripting.DummyScript; -import funkin.system.interfaces.IBeatReceiver; -import funkin.system.Conductor.BPMChangeEvent; -import funkin.system.Conductor; +import funkin.backend.scripting.events.*; +import funkin.backend.scripting.Script; +import funkin.backend.scripting.DummyScript; +import funkin.backend.system.interfaces.IBeatReceiver; +import funkin.backend.system.Conductor.BPMChangeEvent; +import funkin.backend.system.Conductor; +import funkin.backend.system.Controls; import funkin.options.PlayerSettings; import flixel.FlxSubState; diff --git a/source/funkin/system/MusicBeatTransition.hx b/source/funkin/backend/MusicBeatTransition.hx similarity index 96% rename from source/funkin/system/MusicBeatTransition.hx rename to source/funkin/backend/MusicBeatTransition.hx index 61c0d7c2..c49f88a8 100644 --- a/source/funkin/system/MusicBeatTransition.hx +++ b/source/funkin/backend/MusicBeatTransition.hx @@ -1,8 +1,8 @@ -package funkin.system; +package funkin.backend; import flixel.tweens.FlxTween; import flixel.FlxState; -import funkin.utils.FunkinParentDisabler; +import funkin.backend.utils.FunkinParentDisabler; class MusicBeatTransition extends MusicBeatSubstate { var nextFrameSkip:Bool = false; diff --git a/source/funkin/assets/AssetPaths.hx b/source/funkin/backend/assets/AssetPaths.hx similarity index 98% rename from source/funkin/assets/AssetPaths.hx rename to source/funkin/backend/assets/AssetPaths.hx index b8094b3f..01cdcaac 100644 --- a/source/funkin/assets/AssetPaths.hx +++ b/source/funkin/backend/assets/AssetPaths.hx @@ -1,6 +1,6 @@ // UNUSED -package funkin.assets; +package funkin.backend.assets; /** * { diff --git a/source/funkin/assets/AssetsLibraryList.hx b/source/funkin/backend/assets/AssetsLibraryList.hx similarity index 96% rename from source/funkin/assets/AssetsLibraryList.hx rename to source/funkin/backend/assets/AssetsLibraryList.hx index 224afbb2..3e2dd20f 100644 --- a/source/funkin/assets/AssetsLibraryList.hx +++ b/source/funkin/backend/assets/AssetsLibraryList.hx @@ -1,13 +1,13 @@ -package funkin.assets; +package funkin.backend.assets; -import funkin.assets.ModsAssetLibrary; +import funkin.backend.assets.ModsAssetLibrary; import lime.utils.AssetLibrary; class AssetsLibraryList extends AssetLibrary { public var libraries:Array = []; - @:allow(funkin.system.Main) - @:allow(funkin.system.MainState) + @:allow(funkin.backend.system.Main) + @:allow(funkin.backend.system.MainState) private var __defaultLibraries:Array = []; public var base:AssetLibrary; diff --git a/source/funkin/assets/LimeLibrarySymbol.hx b/source/funkin/backend/assets/LimeLibrarySymbol.hx similarity index 95% rename from source/funkin/assets/LimeLibrarySymbol.hx rename to source/funkin/backend/assets/LimeLibrarySymbol.hx index 1769d250..92f77784 100644 --- a/source/funkin/assets/LimeLibrarySymbol.hx +++ b/source/funkin/backend/assets/LimeLibrarySymbol.hx @@ -1,4 +1,4 @@ -package funkin.assets; +package funkin.backend.assets; /** * COPIED DIRECTLY FROM LIME SOURCE CAUSE LIME IS SO FUCKING DUMB!! diff --git a/source/funkin/assets/ModdableAssetsFolder.hx b/source/funkin/backend/assets/ModdableAssetsFolder.hx similarity index 97% rename from source/funkin/assets/ModdableAssetsFolder.hx rename to source/funkin/backend/assets/ModdableAssetsFolder.hx index 8071f138..25dd4943 100644 --- a/source/funkin/assets/ModdableAssetsFolder.hx +++ b/source/funkin/backend/assets/ModdableAssetsFolder.hx @@ -1,4 +1,4 @@ -package funkin.assets; +package funkin.backend.assets; import lime.utils.AssetLibrary; diff --git a/source/funkin/assets/ModsAssetLibrary.hx b/source/funkin/backend/assets/ModsAssetLibrary.hx similarity index 96% rename from source/funkin/assets/ModsAssetLibrary.hx rename to source/funkin/backend/assets/ModsAssetLibrary.hx index 91ae1b9c..5861119a 100644 --- a/source/funkin/assets/ModsAssetLibrary.hx +++ b/source/funkin/backend/assets/ModsAssetLibrary.hx @@ -1,4 +1,4 @@ -package funkin.assets; +package funkin.backend.assets; import lime.utils.Log; import lime.utils.AssetLibrary; diff --git a/source/funkin/assets/ModsFolder.hx b/source/funkin/backend/assets/ModsFolder.hx similarity index 96% rename from source/funkin/assets/ModsFolder.hx rename to source/funkin/backend/assets/ModsFolder.hx index caa2334d..aa2bf064 100644 --- a/source/funkin/assets/ModsFolder.hx +++ b/source/funkin/backend/assets/ModsFolder.hx @@ -1,8 +1,8 @@ -package funkin.assets; +package funkin.backend.assets; -import funkin.system.MainState; +import funkin.backend.system.MainState; import funkin.menus.TitleState; -import funkin.system.Main; +import funkin.backend.system.Main; import openfl.utils.AssetCache; import flixel.util.FlxSignal.FlxTypedSignal; import openfl.utils.AssetManifest; diff --git a/source/funkin/assets/ModsFolderLibrary.hx b/source/funkin/backend/assets/ModsFolderLibrary.hx similarity index 99% rename from source/funkin/assets/ModsFolderLibrary.hx rename to source/funkin/backend/assets/ModsFolderLibrary.hx index 8d8ccd26..e21f6320 100644 --- a/source/funkin/assets/ModsFolderLibrary.hx +++ b/source/funkin/backend/assets/ModsFolderLibrary.hx @@ -1,4 +1,4 @@ -package funkin.assets; +package funkin.backend.assets; import lime.utils.AssetLibrary; import lime.utils.Assets as LimeAssets; diff --git a/source/funkin/assets/Paths.hx b/source/funkin/backend/assets/Paths.hx similarity index 97% rename from source/funkin/assets/Paths.hx rename to source/funkin/backend/assets/Paths.hx index 15eb5d76..daf52620 100644 --- a/source/funkin/assets/Paths.hx +++ b/source/funkin/backend/assets/Paths.hx @@ -1,13 +1,13 @@ -package funkin.assets; +package funkin.backend.assets; import flixel.graphics.frames.FlxFramesCollection; import haxe.io.Path; -import funkin.assets.LimeLibrarySymbol; +import funkin.backend.assets.LimeLibrarySymbol; import flixel.graphics.frames.FlxAtlasFrames; import openfl.utils.AssetType; import openfl.utils.Assets as OpenFlAssets; -import funkin.assets.ModsFolder; -import funkin.scripting.Script; +import funkin.backend.assets.ModsFolder; +import funkin.backend.scripting.Script; import animateatlas.AtlasFrameMaker; import flixel.graphics.frames.FlxAtlasFrames; import flixel.system.FlxAssets.FlxGraphicAsset; @@ -261,9 +261,9 @@ class Paths var content:Array = []; #if MOD_SUPPORT - if (library is funkin.assets.ModsAssetLibrary) { + if (library is funkin.backend.assets.ModsAssetLibrary) { // easy task, can immediately scan for files! - var lib = cast(library, funkin.assets.ModsAssetLibrary); + var lib = cast(library, funkin.backend.assets.ModsAssetLibrary); content = lib.getFiles(libThing.symbolName); if (addPath) for(i in 0...content.length) diff --git a/source/funkin/assets/ZipFolderLibrary.hx b/source/funkin/backend/assets/ZipFolderLibrary.hx similarity index 96% rename from source/funkin/assets/ZipFolderLibrary.hx rename to source/funkin/backend/assets/ZipFolderLibrary.hx index 3b155bf5..e5f88bfd 100644 --- a/source/funkin/assets/ZipFolderLibrary.hx +++ b/source/funkin/backend/assets/ZipFolderLibrary.hx @@ -1,4 +1,4 @@ -package funkin.assets; +package funkin.backend.assets; import lime.utils.Log; import lime.utils.AssetLibrary; @@ -22,8 +22,8 @@ import sys.FileStat; import sys.FileSystem; import sys.io.File; import haxe.zip.Reader; -import funkin.utils.SysZip; -import funkin.utils.SysZip.SysZipEntry; +import funkin.backend.utils.SysZip; +import funkin.backend.utils.SysZip.SysZipEntry; class ZipFolderLibrary extends AssetLibrary implements ModsAssetLibrary { public var zipPath:String; diff --git a/source/funkin/chart/BaseGameParser.hx b/source/funkin/backend/chart/BaseGameParser.hx similarity index 99% rename from source/funkin/chart/BaseGameParser.hx rename to source/funkin/backend/chart/BaseGameParser.hx index fcee81e3..3c56e069 100644 --- a/source/funkin/chart/BaseGameParser.hx +++ b/source/funkin/backend/chart/BaseGameParser.hx @@ -1,4 +1,4 @@ -package funkin.chart; +package funkin.backend.chart; class BaseGameParser { public static function parse(data:Dynamic, result:ChartData) { diff --git a/source/funkin/chart/Chart.hx b/source/funkin/backend/chart/Chart.hx similarity index 98% rename from source/funkin/chart/Chart.hx rename to source/funkin/backend/chart/Chart.hx index dbe842c4..8253a7a8 100644 --- a/source/funkin/chart/Chart.hx +++ b/source/funkin/backend/chart/Chart.hx @@ -1,6 +1,6 @@ -package funkin.chart; +package funkin.backend.chart; -import funkin.chart.ChartData; +import funkin.backend.chart.ChartData; import flixel.util.FlxColor; import haxe.io.Path; import haxe.Json; diff --git a/source/funkin/chart/ChartData.hx b/source/funkin/backend/chart/ChartData.hx similarity index 98% rename from source/funkin/chart/ChartData.hx rename to source/funkin/backend/chart/ChartData.hx index 4059d25a..8832b727 100644 --- a/source/funkin/chart/ChartData.hx +++ b/source/funkin/backend/chart/ChartData.hx @@ -1,4 +1,4 @@ -package funkin.chart; +package funkin.backend.chart; import flixel.util.FlxColor; diff --git a/source/funkin/scripting/DummyScript.hx b/source/funkin/backend/scripting/DummyScript.hx similarity index 94% rename from source/funkin/scripting/DummyScript.hx rename to source/funkin/backend/scripting/DummyScript.hx index 2dbf32d3..24ef2194 100644 --- a/source/funkin/scripting/DummyScript.hx +++ b/source/funkin/backend/scripting/DummyScript.hx @@ -1,4 +1,4 @@ -package funkin.scripting; +package funkin.backend.scripting; /** * Simple class for empty scripts or scripts whose language isn't imported yet. diff --git a/source/funkin/scripting/EventManager.hx b/source/funkin/backend/scripting/EventManager.hx similarity index 91% rename from source/funkin/scripting/EventManager.hx rename to source/funkin/backend/scripting/EventManager.hx index b63092f5..84e7d33f 100644 --- a/source/funkin/scripting/EventManager.hx +++ b/source/funkin/backend/scripting/EventManager.hx @@ -1,7 +1,7 @@ -package funkin.scripting; +package funkin.backend.scripting; import flixel.FlxState; -import funkin.scripting.events.*; +import funkin.backend.scripting.events.*; class EventManager { // map doesnt work for that diff --git a/source/funkin/scripting/GlobalScript.hx b/source/funkin/backend/scripting/GlobalScript.hx similarity index 94% rename from source/funkin/scripting/GlobalScript.hx rename to source/funkin/backend/scripting/GlobalScript.hx index 6a327337..14803c8b 100644 --- a/source/funkin/scripting/GlobalScript.hx +++ b/source/funkin/backend/scripting/GlobalScript.hx @@ -1,9 +1,9 @@ -package funkin.scripting; +package funkin.backend.scripting; -import funkin.scripting.events.CancellableEvent; -import funkin.system.Conductor; +import funkin.backend.scripting.events.CancellableEvent; +import funkin.backend.system.Conductor; import flixel.FlxState; -import funkin.assets.ModsFolder; +import funkin.backend.assets.ModsFolder; #if GLOBAL_SCRIPT /** * Class for THE Global Script, aka script that runs in the background at all times. diff --git a/source/funkin/scripting/HScript.hx b/source/funkin/backend/scripting/HScript.hx similarity index 99% rename from source/funkin/scripting/HScript.hx rename to source/funkin/backend/scripting/HScript.hx index 24f9cb0f..9de25980 100644 --- a/source/funkin/scripting/HScript.hx +++ b/source/funkin/backend/scripting/HScript.hx @@ -1,4 +1,4 @@ -package funkin.scripting; +package funkin.backend.scripting; import haxe.io.Path; import hscript.Expr.ClassDecl; diff --git a/source/funkin/scripting/ModState.hx b/source/funkin/backend/scripting/ModState.hx similarity index 85% rename from source/funkin/scripting/ModState.hx rename to source/funkin/backend/scripting/ModState.hx index 6ff123f6..adc0a42c 100644 --- a/source/funkin/scripting/ModState.hx +++ b/source/funkin/backend/scripting/ModState.hx @@ -1,4 +1,4 @@ -package funkin.scripting; +package funkin.backend.scripting; class ModState extends MusicBeatState { public static var lastName:String = null; diff --git a/source/funkin/scripting/ModSubState.hx b/source/funkin/backend/scripting/ModSubState.hx similarity index 86% rename from source/funkin/scripting/ModSubState.hx rename to source/funkin/backend/scripting/ModSubState.hx index c66cb9c8..5f06072c 100644 --- a/source/funkin/scripting/ModSubState.hx +++ b/source/funkin/backend/scripting/ModSubState.hx @@ -1,4 +1,4 @@ -package funkin.scripting; +package funkin.backend.scripting; class ModSubState extends MusicBeatSubstate { public static var lastName:String = null; diff --git a/source/funkin/scripting/MultiThreadedScript.hx b/source/funkin/backend/scripting/MultiThreadedScript.hx similarity index 98% rename from source/funkin/scripting/MultiThreadedScript.hx rename to source/funkin/backend/scripting/MultiThreadedScript.hx index 2bdb6cc6..49b7a163 100644 --- a/source/funkin/scripting/MultiThreadedScript.hx +++ b/source/funkin/backend/scripting/MultiThreadedScript.hx @@ -1,4 +1,4 @@ -package funkin.scripting; +package funkin.backend.scripting; #if ALLOW_MULTITHREADING import sys.thread.Thread; diff --git a/source/funkin/scripting/Script.hx b/source/funkin/backend/scripting/Script.hx similarity index 84% rename from source/funkin/scripting/Script.hx rename to source/funkin/backend/scripting/Script.hx index ff06a8a3..82e11b62 100644 --- a/source/funkin/scripting/Script.hx +++ b/source/funkin/backend/scripting/Script.hx @@ -1,4 +1,4 @@ -package funkin.scripting; +package funkin.backend.scripting; import lime.app.Application; import flixel.util.FlxDestroyUtil.IFlxDestroyable; @@ -31,7 +31,7 @@ class Script extends FlxBasic implements IFlxDestroyable { // Flixel related stuff "FlxG" => flixel.FlxG, - "FlxSprite" => funkin.system.FunkinSprite, + "FlxSprite" => funkin.backend.FunkinSprite, "FlxBasic" => flixel.FlxBasic, "FlxCamera" => flixel.FlxCamera, "state" => flixel.FlxG.state, @@ -52,13 +52,13 @@ class Script extends FlxBasic implements IFlxDestroyable { // Engine related stuff "engine" => { - commit: funkin.system.macros.GitCommitMacro.commitNumber, - hash: funkin.system.macros.GitCommitMacro.commitHash, + commit: funkin.backend.system.macros.GitCommitMacro.commitNumber, + hash: funkin.backend.system.macros.GitCommitMacro.commitHash, build: 2675, // 2675 being the last build num before it was removed name: "Codename Engine" }, - "ModState" => funkin.scripting.ModState, - "ModSubState" => funkin.scripting.ModSubState, + "ModState" => funkin.backend.scripting.ModState, + "ModSubState" => funkin.backend.scripting.ModSubState, "PlayState" => funkin.game.PlayState, "GameOverSubstate" => funkin.game.GameOverSubstate, "HealthIcon" => funkin.game.HealthIcon, @@ -75,29 +75,29 @@ class Script extends FlxBasic implements IFlxDestroyable { "StoryMenuState" => funkin.menus.StoryMenuState, "TitleState" => funkin.menus.TitleState, "Options" => funkin.options.Options, - "Paths" => funkin.assets.Paths, - "Conductor" => funkin.system.Conductor, - "FunkinShader" => funkin.shaders.FunkinShader, - "CustomShader" => funkin.shaders.CustomShader, - "FunkinText" => funkin.system.FunkinText, + "Paths" => funkin.backend.assets.Paths, + "Conductor" => funkin.backend.system.Conductor, + "FunkinShader" => funkin.backend.shaders.FunkinShader, + "CustomShader" => funkin.backend.shaders.CustomShader, + "FunkinText" => funkin.backend.FunkinText, "Alphabet" => funkin.menus.ui.Alphabet, - "CoolUtil" => funkin.utils.CoolUtil, - "IniUtil" => funkin.utils.IniUtil, - "XMLUtil" => funkin.utils.XMLUtil, - #if sys "ZipUtil" => funkin.utils.ZipUtil, #end - "MarkdownUtil" => funkin.utils.MarkdownUtil, - "EngineUtil" => funkin.utils.EngineUtil, - "MemoryUtil" => funkin.utils.MemoryUtil, - "BitmapUtil" => funkin.utils.BitmapUtil, + "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, ]; } public static function getDefaultPreprocessors():Map { - var defines = funkin.system.macros.DefinesMacro.defines; + var defines = funkin.backend.system.macros.DefinesMacro.defines; defines.set("CODENAME_ENGINE", true); defines.set("CODENAME_VER", Application.current.meta.get('version')); defines.set("CODENAME_BUILD", 2675); // 2675 being the last build num before it was removed - defines.set("CODENAME_COMMIT", funkin.system.macros.GitCommitMacro.commitNumber); + defines.set("CODENAME_COMMIT", funkin.backend.system.macros.GitCommitMacro.commitNumber); return defines; } /** diff --git a/source/funkin/scripting/ScriptPack.hx b/source/funkin/backend/scripting/ScriptPack.hx similarity index 96% rename from source/funkin/scripting/ScriptPack.hx rename to source/funkin/backend/scripting/ScriptPack.hx index 2680a6c2..893aaa98 100644 --- a/source/funkin/scripting/ScriptPack.hx +++ b/source/funkin/backend/scripting/ScriptPack.hx @@ -1,6 +1,6 @@ -package funkin.scripting; +package funkin.backend.scripting; -import funkin.scripting.events.CancellableEvent; +import funkin.backend.scripting.events.CancellableEvent; @:access(CancellableEvent) class ScriptPack extends Script { diff --git a/source/funkin/scripting/events/CamMoveEvent.hx b/source/funkin/backend/scripting/events/CamMoveEvent.hx similarity index 89% rename from source/funkin/scripting/events/CamMoveEvent.hx rename to source/funkin/backend/scripting/events/CamMoveEvent.hx index 5d2a0fa0..970c00a7 100644 --- a/source/funkin/scripting/events/CamMoveEvent.hx +++ b/source/funkin/backend/scripting/events/CamMoveEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; import funkin.game.StrumLine; import flixel.math.FlxPoint; diff --git a/source/funkin/scripting/events/CancellableEvent.hx b/source/funkin/backend/scripting/events/CancellableEvent.hx similarity index 92% rename from source/funkin/scripting/events/CancellableEvent.hx rename to source/funkin/backend/scripting/events/CancellableEvent.hx index 8f5aff09..94bf066e 100644 --- a/source/funkin/scripting/events/CancellableEvent.hx +++ b/source/funkin/backend/scripting/events/CancellableEvent.hx @@ -1,9 +1,9 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; import flixel.util.FlxDestroyUtil.IFlxDestroyable; @:allow(ScriptPack) -@:autoBuild(funkin.system.macros.EventMacro.build()) +@:autoBuild(funkin.backend.system.macros.EventMacro.build()) @:noCustomClass class CancellableEvent implements IFlxDestroyable { @:dox(hide) public var cancelled:Bool = false; diff --git a/source/funkin/scripting/events/CountdownEvent.hx b/source/funkin/backend/scripting/events/CountdownEvent.hx similarity index 96% rename from source/funkin/scripting/events/CountdownEvent.hx rename to source/funkin/backend/scripting/events/CountdownEvent.hx index b8c1f77a..36a01b87 100644 --- a/source/funkin/scripting/events/CountdownEvent.hx +++ b/source/funkin/backend/scripting/events/CountdownEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; import flixel.tweens.FlxTween; import flixel.sound.FlxSound; diff --git a/source/funkin/scripting/events/DanceEvent.hx b/source/funkin/backend/scripting/events/DanceEvent.hx similarity index 65% rename from source/funkin/scripting/events/DanceEvent.hx rename to source/funkin/backend/scripting/events/DanceEvent.hx index 869ce3b1..b2300f8f 100644 --- a/source/funkin/scripting/events/DanceEvent.hx +++ b/source/funkin/backend/scripting/events/DanceEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; final class DanceEvent extends CancellableEvent { public var danced:Bool; diff --git a/source/funkin/scripting/events/DirectionAnimEvent.hx b/source/funkin/backend/scripting/events/DirectionAnimEvent.hx similarity index 86% rename from source/funkin/scripting/events/DirectionAnimEvent.hx rename to source/funkin/backend/scripting/events/DirectionAnimEvent.hx index 44ddb38b..4b30c8a3 100644 --- a/source/funkin/scripting/events/DirectionAnimEvent.hx +++ b/source/funkin/backend/scripting/events/DirectionAnimEvent.hx @@ -1,6 +1,6 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; -import funkin.scripting.events.PlayAnimEvent.PlayAnimContext; +import funkin.backend.scripting.events.PlayAnimEvent.PlayAnimContext; final class DirectionAnimEvent extends CancellableEvent { /** diff --git a/source/funkin/scripting/events/DiscordPresenceUpdateEvent.hx b/source/funkin/backend/scripting/events/DiscordPresenceUpdateEvent.hx similarity index 88% rename from source/funkin/scripting/events/DiscordPresenceUpdateEvent.hx rename to source/funkin/backend/scripting/events/DiscordPresenceUpdateEvent.hx index a714f122..782d70a0 100644 --- a/source/funkin/scripting/events/DiscordPresenceUpdateEvent.hx +++ b/source/funkin/backend/scripting/events/DiscordPresenceUpdateEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; #if DISCORD_RPC import discord_rpc.DiscordRpc.DiscordPresenceOptions; diff --git a/source/funkin/scripting/events/FreeplaySongSelectEvent.hx b/source/funkin/backend/scripting/events/FreeplaySongSelectEvent.hx similarity index 89% rename from source/funkin/scripting/events/FreeplaySongSelectEvent.hx rename to source/funkin/backend/scripting/events/FreeplaySongSelectEvent.hx index 30296734..b97847b0 100644 --- a/source/funkin/scripting/events/FreeplaySongSelectEvent.hx +++ b/source/funkin/backend/scripting/events/FreeplaySongSelectEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; final class FreeplaySongSelectEvent extends CancellableEvent { /** diff --git a/source/funkin/scripting/events/InputSystemEvent.hx b/source/funkin/backend/scripting/events/InputSystemEvent.hx similarity index 95% rename from source/funkin/scripting/events/InputSystemEvent.hx rename to source/funkin/backend/scripting/events/InputSystemEvent.hx index 31ed3418..3855c31f 100644 --- a/source/funkin/scripting/events/InputSystemEvent.hx +++ b/source/funkin/backend/scripting/events/InputSystemEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; import funkin.game.StrumLine; diff --git a/source/funkin/scripting/events/MenuChangeEvent.hx b/source/funkin/backend/scripting/events/MenuChangeEvent.hx similarity index 88% rename from source/funkin/scripting/events/MenuChangeEvent.hx rename to source/funkin/backend/scripting/events/MenuChangeEvent.hx index 84f1bc2e..d74ef2a4 100644 --- a/source/funkin/scripting/events/MenuChangeEvent.hx +++ b/source/funkin/backend/scripting/events/MenuChangeEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; final class MenuChangeEvent extends CancellableEvent { /** diff --git a/source/funkin/scripting/events/NameEvent.hx b/source/funkin/backend/scripting/events/NameEvent.hx similarity index 69% rename from source/funkin/scripting/events/NameEvent.hx rename to source/funkin/backend/scripting/events/NameEvent.hx index 83939b19..854f1cd4 100644 --- a/source/funkin/scripting/events/NameEvent.hx +++ b/source/funkin/backend/scripting/events/NameEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; final class NameEvent extends CancellableEvent { /** diff --git a/source/funkin/scripting/events/NoteCreationEvent.hx b/source/funkin/backend/scripting/events/NoteCreationEvent.hx similarity index 95% rename from source/funkin/scripting/events/NoteCreationEvent.hx rename to source/funkin/backend/scripting/events/NoteCreationEvent.hx index cafd328d..3f7d1890 100644 --- a/source/funkin/scripting/events/NoteCreationEvent.hx +++ b/source/funkin/backend/scripting/events/NoteCreationEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; import funkin.game.Note; diff --git a/source/funkin/scripting/events/NoteHitEvent.hx b/source/funkin/backend/scripting/events/NoteHitEvent.hx similarity index 99% rename from source/funkin/scripting/events/NoteHitEvent.hx rename to source/funkin/backend/scripting/events/NoteHitEvent.hx index d82b990f..4a42733f 100644 --- a/source/funkin/scripting/events/NoteHitEvent.hx +++ b/source/funkin/backend/scripting/events/NoteHitEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; import funkin.game.Note; import funkin.game.Character; diff --git a/source/funkin/scripting/events/NoteUpdateEvent.hx b/source/funkin/backend/scripting/events/NoteUpdateEvent.hx similarity index 96% rename from source/funkin/scripting/events/NoteUpdateEvent.hx rename to source/funkin/backend/scripting/events/NoteUpdateEvent.hx index 97a39b98..45676ec5 100644 --- a/source/funkin/scripting/events/NoteUpdateEvent.hx +++ b/source/funkin/backend/scripting/events/NoteUpdateEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; import funkin.game.Note; import funkin.game.Strum; diff --git a/source/funkin/scripting/events/PauseCreationEvent.hx b/source/funkin/backend/scripting/events/PauseCreationEvent.hx similarity index 86% rename from source/funkin/scripting/events/PauseCreationEvent.hx rename to source/funkin/backend/scripting/events/PauseCreationEvent.hx index e96c1e8d..a02b0e1a 100644 --- a/source/funkin/scripting/events/PauseCreationEvent.hx +++ b/source/funkin/backend/scripting/events/PauseCreationEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; /** * CANCEL this event to prevent default behaviour! diff --git a/source/funkin/scripting/events/PlayAnimEvent.hx b/source/funkin/backend/scripting/events/PlayAnimEvent.hx similarity index 96% rename from source/funkin/scripting/events/PlayAnimEvent.hx rename to source/funkin/backend/scripting/events/PlayAnimEvent.hx index e256bfd8..7d5499ba 100644 --- a/source/funkin/scripting/events/PlayAnimEvent.hx +++ b/source/funkin/backend/scripting/events/PlayAnimEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; final class PlayAnimEvent extends CancellableEvent { /** diff --git a/source/funkin/scripting/events/PointEvent.hx b/source/funkin/backend/scripting/events/PointEvent.hx similarity index 77% rename from source/funkin/scripting/events/PointEvent.hx rename to source/funkin/backend/scripting/events/PointEvent.hx index d3c178ab..e0f011a8 100644 --- a/source/funkin/scripting/events/PointEvent.hx +++ b/source/funkin/backend/scripting/events/PointEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; final class PointEvent extends CancellableEvent { /** diff --git a/source/funkin/scripting/events/RatingUpdateEvent.hx b/source/funkin/backend/scripting/events/RatingUpdateEvent.hx similarity index 81% rename from source/funkin/scripting/events/RatingUpdateEvent.hx rename to source/funkin/backend/scripting/events/RatingUpdateEvent.hx index 8bbb7ed1..96ad7e7e 100644 --- a/source/funkin/scripting/events/RatingUpdateEvent.hx +++ b/source/funkin/backend/scripting/events/RatingUpdateEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; final class RatingUpdateEvent extends CancellableEvent { /** diff --git a/source/funkin/scripting/events/ResizeEvent.hx b/source/funkin/backend/scripting/events/ResizeEvent.hx similarity index 87% rename from source/funkin/scripting/events/ResizeEvent.hx rename to source/funkin/backend/scripting/events/ResizeEvent.hx index b522076e..970f22ad 100644 --- a/source/funkin/scripting/events/ResizeEvent.hx +++ b/source/funkin/backend/scripting/events/ResizeEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; final class ResizeEvent extends CancellableEvent { /** diff --git a/source/funkin/scripting/events/SimpleNoteEvent.hx b/source/funkin/backend/scripting/events/SimpleNoteEvent.hx similarity index 77% rename from source/funkin/scripting/events/SimpleNoteEvent.hx rename to source/funkin/backend/scripting/events/SimpleNoteEvent.hx index 48b7a832..3899958b 100644 --- a/source/funkin/scripting/events/SimpleNoteEvent.hx +++ b/source/funkin/backend/scripting/events/SimpleNoteEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; import funkin.game.Note; diff --git a/source/funkin/scripting/events/StateEvent.hx b/source/funkin/backend/scripting/events/StateEvent.hx similarity index 80% rename from source/funkin/scripting/events/StateEvent.hx rename to source/funkin/backend/scripting/events/StateEvent.hx index 6602dce7..d3f35783 100644 --- a/source/funkin/scripting/events/StateEvent.hx +++ b/source/funkin/backend/scripting/events/StateEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; import flixel.FlxState; diff --git a/source/funkin/scripting/events/StrumCreationEvent.hx b/source/funkin/backend/scripting/events/StrumCreationEvent.hx similarity index 94% rename from source/funkin/scripting/events/StrumCreationEvent.hx rename to source/funkin/backend/scripting/events/StrumCreationEvent.hx index 7c46f6cf..699f88bc 100644 --- a/source/funkin/scripting/events/StrumCreationEvent.hx +++ b/source/funkin/backend/scripting/events/StrumCreationEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; import funkin.game.Strum; diff --git a/source/funkin/scripting/events/WeekSelectEvent.hx b/source/funkin/backend/scripting/events/WeekSelectEvent.hx similarity index 92% rename from source/funkin/scripting/events/WeekSelectEvent.hx rename to source/funkin/backend/scripting/events/WeekSelectEvent.hx index 8be6e488..e255d361 100644 --- a/source/funkin/scripting/events/WeekSelectEvent.hx +++ b/source/funkin/backend/scripting/events/WeekSelectEvent.hx @@ -1,4 +1,4 @@ -package funkin.scripting.events; +package funkin.backend.scripting.events; import funkin.menus.StoryMenuState.WeekData; diff --git a/source/funkin/shaders/BlendModeEffect.hx b/source/funkin/backend/shaders/BlendModeEffect.hx similarity index 95% rename from source/funkin/shaders/BlendModeEffect.hx rename to source/funkin/backend/shaders/BlendModeEffect.hx index b28f20b0..00bdea38 100644 --- a/source/funkin/shaders/BlendModeEffect.hx +++ b/source/funkin/backend/shaders/BlendModeEffect.hx @@ -1,4 +1,4 @@ -package funkin.shaders; +package funkin.backend.shaders; import flixel.util.FlxColor; import openfl.display.ShaderParameter; diff --git a/source/funkin/shaders/CustomShader.hx b/source/funkin/backend/shaders/CustomShader.hx similarity index 97% rename from source/funkin/shaders/CustomShader.hx rename to source/funkin/backend/shaders/CustomShader.hx index 09f599cc..0a3e9a80 100644 --- a/source/funkin/shaders/CustomShader.hx +++ b/source/funkin/backend/shaders/CustomShader.hx @@ -1,4 +1,4 @@ -package funkin.shaders; +package funkin.backend.shaders; import haxe.Exception; import openfl.Assets; diff --git a/source/funkin/shaders/FunkinShader.hx b/source/funkin/backend/shaders/FunkinShader.hx similarity index 99% rename from source/funkin/shaders/FunkinShader.hx rename to source/funkin/backend/shaders/FunkinShader.hx index e0720cec..d98671af 100644 --- a/source/funkin/shaders/FunkinShader.hx +++ b/source/funkin/backend/shaders/FunkinShader.hx @@ -1,4 +1,4 @@ -package funkin.shaders; +package funkin.backend.shaders; import haxe.Exception; import hscript.IHScriptCustomBehaviour; diff --git a/source/funkin/shaders/OverlayShader.hx b/source/funkin/backend/shaders/OverlayShader.hx similarity index 95% rename from source/funkin/shaders/OverlayShader.hx rename to source/funkin/backend/shaders/OverlayShader.hx index 08eb410f..de31c9b1 100644 --- a/source/funkin/shaders/OverlayShader.hx +++ b/source/funkin/backend/shaders/OverlayShader.hx @@ -1,4 +1,4 @@ -package funkin.shaders; +package funkin.backend.shaders; import flixel.system.FlxAssets.FlxShader; diff --git a/source/funkin/shaders/WiggleEffect.hx b/source/funkin/backend/shaders/WiggleEffect.hx similarity index 98% rename from source/funkin/shaders/WiggleEffect.hx rename to source/funkin/backend/shaders/WiggleEffect.hx index bb9bdd84..43dc1caa 100644 --- a/source/funkin/shaders/WiggleEffect.hx +++ b/source/funkin/backend/shaders/WiggleEffect.hx @@ -1,4 +1,4 @@ -package funkin.shaders; +package funkin.backend.shaders; // STOLEN FROM HAXEFLIXEL DEMO LOL import flixel.system.FlxAssets.FlxShader; diff --git a/source/funkin/system/CommandLineHandler.hx b/source/funkin/backend/system/CommandLineHandler.hx similarity index 94% rename from source/funkin/system/CommandLineHandler.hx rename to source/funkin/backend/system/CommandLineHandler.hx index 979d5f3a..2a8b08e1 100644 --- a/source/funkin/system/CommandLineHandler.hx +++ b/source/funkin/backend/system/CommandLineHandler.hx @@ -1,4 +1,4 @@ -package funkin.system; +package funkin.backend.system; import sys.FileSystem; #if sys @@ -37,7 +37,7 @@ class CommandLineHandler { Sys.println("[ERROR] You need to specify the mod folder path"); Sys.exit(0); } else if (FileSystem.exists(arg)) { - funkin.assets.ModsFolder.modsPath = arg; + funkin.backend.assets.ModsFolder.modsPath = arg; } else { Sys.println('[ERROR] Mod folder at "${arg}" does not exist.'); Sys.exit(0); diff --git a/source/funkin/system/Conductor.hx b/source/funkin/backend/system/Conductor.hx similarity index 97% rename from source/funkin/system/Conductor.hx rename to source/funkin/backend/system/Conductor.hx index 8fedbbc1..7709cd91 100644 --- a/source/funkin/system/Conductor.hx +++ b/source/funkin/backend/system/Conductor.hx @@ -1,10 +1,10 @@ -package funkin.system; +package funkin.backend.system; -import funkin.chart.Chart; -import funkin.chart.ChartData; +import funkin.backend.chart.Chart; +import funkin.backend.chart.ChartData; import openfl.Lib; import flixel.FlxState; -import funkin.system.interfaces.IBeatReceiver; +import funkin.backend.system.interfaces.IBeatReceiver; import flixel.util.FlxSignal.FlxTypedSignal; /** diff --git a/source/funkin/system/Controls.hx b/source/funkin/backend/system/Controls.hx similarity index 99% rename from source/funkin/system/Controls.hx rename to source/funkin/backend/system/Controls.hx index 2e5a16e3..bc67623f 100644 --- a/source/funkin/system/Controls.hx +++ b/source/funkin/backend/system/Controls.hx @@ -1,4 +1,4 @@ -package funkin.system; +package funkin.backend.system; import flixel.input.FlxInput; import flixel.input.actions.FlxAction; diff --git a/source/funkin/system/ErrorCode.hx b/source/funkin/backend/system/ErrorCode.hx similarity index 83% rename from source/funkin/system/ErrorCode.hx rename to source/funkin/backend/system/ErrorCode.hx index 821e5027..9959df82 100644 --- a/source/funkin/system/ErrorCode.hx +++ b/source/funkin/backend/system/ErrorCode.hx @@ -1,4 +1,4 @@ -package funkin.system; +package funkin.backend.system; @:enum abstract ErrorCode(Int) { diff --git a/source/funkin/system/FunkinGame.hx b/source/funkin/backend/system/FunkinGame.hx similarity index 95% rename from source/funkin/system/FunkinGame.hx rename to source/funkin/backend/system/FunkinGame.hx index e39e9b27..04eb3417 100644 --- a/source/funkin/system/FunkinGame.hx +++ b/source/funkin/backend/system/FunkinGame.hx @@ -1,4 +1,4 @@ -package funkin.system; +package funkin.backend.system; import flixel.FlxGame; diff --git a/source/funkin/system/FunkinRatioScaleMode.hx b/source/funkin/backend/system/FunkinRatioScaleMode.hx similarity index 97% rename from source/funkin/system/FunkinRatioScaleMode.hx rename to source/funkin/backend/system/FunkinRatioScaleMode.hx index d97dacda..2ae8e3ef 100644 --- a/source/funkin/system/FunkinRatioScaleMode.hx +++ b/source/funkin/backend/system/FunkinRatioScaleMode.hx @@ -1,4 +1,4 @@ -package funkin.system; +package funkin.backend.system; import flixel.system.scaleModes.RatioScaleMode; diff --git a/source/funkin/system/GraphicCacheSprite.hx b/source/funkin/backend/system/GraphicCacheSprite.hx similarity index 97% rename from source/funkin/system/GraphicCacheSprite.hx rename to source/funkin/backend/system/GraphicCacheSprite.hx index 974e1267..78419ed3 100644 --- a/source/funkin/system/GraphicCacheSprite.hx +++ b/source/funkin/backend/system/GraphicCacheSprite.hx @@ -1,4 +1,4 @@ -package funkin.system; +package funkin.backend.system; import flixel.graphics.FlxGraphic; diff --git a/source/funkin/system/Logs.hx b/source/funkin/backend/system/Logs.hx similarity index 96% rename from source/funkin/system/Logs.hx rename to source/funkin/backend/system/Logs.hx index 17b1cb36..ed6152c2 100644 --- a/source/funkin/system/Logs.hx +++ b/source/funkin/backend/system/Logs.hx @@ -1,10 +1,10 @@ -package funkin.system; +package funkin.backend.system; import flixel.system.debug.log.LogStyle; import flixel.system.frontEnds.LogFrontEnd; import haxe.Log; -import funkin.utils.NativeAPI; -import funkin.utils.NativeAPI.ConsoleColor; +import funkin.backend.utils.NativeAPI; +import funkin.backend.utils.NativeAPI.ConsoleColor; class Logs { private static var __showing:Bool = false; diff --git a/source/funkin/system/Main.hx b/source/funkin/backend/system/Main.hx similarity index 92% rename from source/funkin/system/Main.hx rename to source/funkin/backend/system/Main.hx index 7a598a3c..20cad403 100644 --- a/source/funkin/system/Main.hx +++ b/source/funkin/backend/system/Main.hx @@ -1,12 +1,12 @@ -package funkin.system; +package funkin.backend.system; -import funkin.assets.AssetsLibraryList; -import funkin.system.framerate.SystemInfo; +import funkin.backend.assets.AssetsLibraryList; +import funkin.backend.system.framerate.SystemInfo; import openfl.utils.AssetLibrary; import openfl.utils.AssetCache; import openfl.text.TextFormat; import flixel.system.ui.FlxSoundTray; -import funkin.utils.NativeAPI; +import funkin.backend.utils.NativeAPI; import funkin.menus.BetaWarningState; import funkin.menus.TitleState; import flixel.FlxGame; @@ -23,7 +23,7 @@ import flixel.addons.transition.TransitionData; import flixel.math.FlxPoint; import flixel.math.FlxRect; import lime.app.Application; -import funkin.system.modules.*; +import funkin.backend.system.modules.*; #if ALLOW_MULTITHREADING import sys.thread.Thread; @@ -31,7 +31,7 @@ import sys.thread.Thread; #if sys import sys.io.File; #end -import funkin.assets.ModsFolder; +import funkin.backend.assets.ModsFolder; class Main extends Sprite { @@ -42,7 +42,7 @@ class Main extends Sprite public static var scaleMode:FunkinRatioScaleMode; #if !mobile - public static var framerateSprite:funkin.system.framerate.Framerate; + public static var framerateSprite:funkin.backend.system.framerate.Framerate; #end var gameWidth:Int = 1280; // Width of the game in pixels (might be less / more in actual pixels depending on your zoom). @@ -70,7 +70,7 @@ class Main extends Sprite addChild(game = new FunkinGame(gameWidth, gameHeight, MainState, framerate, framerate, skipSplash, startFullscreen)); #if !mobile - addChild(framerateSprite = new funkin.system.framerate.Framerate()); + addChild(framerateSprite = new funkin.backend.system.framerate.Framerate()); framerateSprite.scaleX = framerateSprite.scaleY = stage.window.scale; SystemInfo.init(); #end @@ -116,7 +116,7 @@ class Main extends Sprite Paths.assetsTree = new AssetsLibraryList(); #if UPDATE_CHECKING - funkin.system.updating.UpdateUtil.init(); + funkin.backend.system.updating.UpdateUtil.init(); #end CrashHandler.init(); Logs.init(); @@ -124,7 +124,7 @@ class Main extends Sprite ModsFolder.init(); DiscordUtil.init(); #if GLOBAL_SCRIPT - funkin.scripting.GlobalScript.init(); + funkin.backend.scripting.GlobalScript.init(); #end #if sys diff --git a/source/funkin/system/MainState.hx b/source/funkin/backend/system/MainState.hx similarity index 95% rename from source/funkin/system/MainState.hx rename to source/funkin/backend/system/MainState.hx index 17bc9d3d..0c03257b 100644 --- a/source/funkin/system/MainState.hx +++ b/source/funkin/backend/system/MainState.hx @@ -1,9 +1,9 @@ -package funkin.system; +package funkin.backend.system; #if MOD_SUPPORT import sys.FileSystem; #end -import funkin.assets.ModsFolder; +import funkin.backend.assets.ModsFolder; import funkin.menus.TitleState; import funkin.menus.BetaWarningState; import flixel.FlxState; diff --git a/source/funkin/system/OptimizedBitmapData.hx b/source/funkin/backend/system/OptimizedBitmapData.hx similarity index 97% rename from source/funkin/system/OptimizedBitmapData.hx rename to source/funkin/backend/system/OptimizedBitmapData.hx index 052189eb..ce494287 100644 --- a/source/funkin/system/OptimizedBitmapData.hx +++ b/source/funkin/backend/system/OptimizedBitmapData.hx @@ -1,4 +1,4 @@ -package funkin.system; +package funkin.backend.system; import lime.graphics.Image; import openfl.geom.Rectangle; diff --git a/source/funkin/system/framerate/AssetTreeInfo.hx b/source/funkin/backend/system/framerate/AssetTreeInfo.hx similarity index 90% rename from source/funkin/system/framerate/AssetTreeInfo.hx rename to source/funkin/backend/system/framerate/AssetTreeInfo.hx index a6063bf1..7417e124 100644 --- a/source/funkin/system/framerate/AssetTreeInfo.hx +++ b/source/funkin/backend/system/framerate/AssetTreeInfo.hx @@ -1,6 +1,6 @@ -package funkin.system.framerate; +package funkin.backend.system.framerate; -import funkin.assets.ModsAssetLibrary; +import funkin.backend.assets.ModsAssetLibrary; class AssetTreeInfo extends FramerateCategory { public function new() { diff --git a/source/funkin/system/framerate/CodenameBuildField.hx b/source/funkin/backend/system/framerate/CodenameBuildField.hx similarity index 80% rename from source/funkin/system/framerate/CodenameBuildField.hx rename to source/funkin/backend/system/framerate/CodenameBuildField.hx index 1fbe7e97..ad783ccb 100644 --- a/source/funkin/system/framerate/CodenameBuildField.hx +++ b/source/funkin/backend/system/framerate/CodenameBuildField.hx @@ -1,9 +1,9 @@ -package funkin.system.framerate; +package funkin.backend.system.framerate; import openfl.text.TextFormat; import openfl.display.Sprite; import openfl.text.TextField; -import funkin.system.macros.GitCommitMacro; +import funkin.backend.system.macros.GitCommitMacro; class CodenameBuildField extends TextField { public function new() { diff --git a/source/funkin/system/framerate/ConductorInfo.hx b/source/funkin/backend/system/framerate/ConductorInfo.hx similarity index 93% rename from source/funkin/system/framerate/ConductorInfo.hx rename to source/funkin/backend/system/framerate/ConductorInfo.hx index 11155c5c..eaec638f 100644 --- a/source/funkin/system/framerate/ConductorInfo.hx +++ b/source/funkin/backend/system/framerate/ConductorInfo.hx @@ -1,4 +1,4 @@ -package funkin.system.framerate; +package funkin.backend.system.framerate; class ConductorInfo extends FramerateCategory { diff --git a/source/funkin/system/framerate/FlixelInfo.hx b/source/funkin/backend/system/framerate/FlixelInfo.hx similarity index 94% rename from source/funkin/system/framerate/FlixelInfo.hx rename to source/funkin/backend/system/framerate/FlixelInfo.hx index f945ec78..03da6c2e 100644 --- a/source/funkin/system/framerate/FlixelInfo.hx +++ b/source/funkin/backend/system/framerate/FlixelInfo.hx @@ -1,4 +1,4 @@ -package funkin.system.framerate; +package funkin.backend.system.framerate; class FlixelInfo extends FramerateCategory { public function new() { diff --git a/source/funkin/system/framerate/Framerate.hx b/source/funkin/backend/system/framerate/Framerate.hx similarity index 98% rename from source/funkin/system/framerate/Framerate.hx rename to source/funkin/backend/system/framerate/Framerate.hx index e551182a..3ef031fe 100644 --- a/source/funkin/system/framerate/Framerate.hx +++ b/source/funkin/backend/system/framerate/Framerate.hx @@ -1,4 +1,4 @@ -package funkin.system.framerate; +package funkin.backend.system.framerate; import openfl.display.Bitmap; import openfl.display.BitmapData; diff --git a/source/funkin/system/framerate/FramerateCategory.hx b/source/funkin/backend/system/framerate/FramerateCategory.hx similarity index 96% rename from source/funkin/system/framerate/FramerateCategory.hx rename to source/funkin/backend/system/framerate/FramerateCategory.hx index c8c139b9..fcc44fde 100644 --- a/source/funkin/system/framerate/FramerateCategory.hx +++ b/source/funkin/backend/system/framerate/FramerateCategory.hx @@ -1,4 +1,4 @@ -package funkin.system.framerate; +package funkin.backend.system.framerate; import openfl.display.Bitmap; import openfl.text.TextFormat; diff --git a/source/funkin/system/framerate/FramerateCounter.hx b/source/funkin/backend/system/framerate/FramerateCounter.hx similarity index 95% rename from source/funkin/system/framerate/FramerateCounter.hx rename to source/funkin/backend/system/framerate/FramerateCounter.hx index 5ab9b629..55cc0f97 100644 --- a/source/funkin/system/framerate/FramerateCounter.hx +++ b/source/funkin/backend/system/framerate/FramerateCounter.hx @@ -1,4 +1,4 @@ -package funkin.system.framerate; +package funkin.backend.system.framerate; import openfl.text.TextFormat; import openfl.display.Sprite; diff --git a/source/funkin/system/framerate/MemoryCounter.hx b/source/funkin/backend/system/framerate/MemoryCounter.hx similarity index 96% rename from source/funkin/system/framerate/MemoryCounter.hx rename to source/funkin/backend/system/framerate/MemoryCounter.hx index fdfb8fca..863bdb8c 100644 --- a/source/funkin/system/framerate/MemoryCounter.hx +++ b/source/funkin/backend/system/framerate/MemoryCounter.hx @@ -1,4 +1,4 @@ -package funkin.system.framerate; +package funkin.backend.system.framerate; import openfl.text.TextFormat; import openfl.display.Sprite; diff --git a/source/funkin/system/framerate/StatsInfo.hx b/source/funkin/backend/system/framerate/StatsInfo.hx similarity index 94% rename from source/funkin/system/framerate/StatsInfo.hx rename to source/funkin/backend/system/framerate/StatsInfo.hx index 462942b1..77a9cc9e 100644 --- a/source/funkin/system/framerate/StatsInfo.hx +++ b/source/funkin/backend/system/framerate/StatsInfo.hx @@ -1,4 +1,4 @@ -package funkin.system.framerate; +package funkin.backend.system.framerate; #if (gl_stats && !disable_cffi && (!html5 || !canvas)) import openfl.display._internal.stats.Context3DStats; diff --git a/source/funkin/system/framerate/SystemInfo.hx b/source/funkin/backend/system/framerate/SystemInfo.hx similarity index 94% rename from source/funkin/system/framerate/SystemInfo.hx rename to source/funkin/backend/system/framerate/SystemInfo.hx index 9211cb8f..cbef09f0 100644 --- a/source/funkin/system/framerate/SystemInfo.hx +++ b/source/funkin/backend/system/framerate/SystemInfo.hx @@ -1,7 +1,7 @@ -package funkin.system.framerate; +package funkin.backend.system.framerate; -import funkin.utils.native.HiddenProcess; -import funkin.utils.MemoryUtil; +import funkin.backend.utils.native.HiddenProcess; +import funkin.backend.utils.MemoryUtil; using StringTools; diff --git a/source/funkin/system/github/GitHub.hx b/source/funkin/backend/system/github/GitHub.hx similarity index 98% rename from source/funkin/system/github/GitHub.hx rename to source/funkin/backend/system/github/GitHub.hx index 003a44af..2d900518 100644 --- a/source/funkin/system/github/GitHub.hx +++ b/source/funkin/backend/system/github/GitHub.hx @@ -1,4 +1,4 @@ -package funkin.system.github; +package funkin.backend.system.github; #if GITHUB_API import haxe.Json; diff --git a/source/funkin/system/github/GitHubAsset.hx b/source/funkin/backend/system/github/GitHubAsset.hx similarity index 78% rename from source/funkin/system/github/GitHubAsset.hx rename to source/funkin/backend/system/github/GitHubAsset.hx index 4f503132..15c8ac78 100644 --- a/source/funkin/system/github/GitHubAsset.hx +++ b/source/funkin/backend/system/github/GitHubAsset.hx @@ -1,6 +1,6 @@ -package funkin.system.github; +package funkin.backend.system.github; -import funkin.system.github.GitHubUser; +import funkin.backend.system.github.GitHubUser; typedef GitHubAsset = { var url:String; diff --git a/source/funkin/system/github/GitHubContributor.hx b/source/funkin/backend/system/github/GitHubContributor.hx similarity index 92% rename from source/funkin/system/github/GitHubContributor.hx rename to source/funkin/backend/system/github/GitHubContributor.hx index d11113b1..85576935 100644 --- a/source/funkin/system/github/GitHubContributor.hx +++ b/source/funkin/backend/system/github/GitHubContributor.hx @@ -1,4 +1,4 @@ -package funkin.system.github; +package funkin.backend.system.github; typedef GitHubContributor = { var login:String; diff --git a/source/funkin/system/github/GitHubException.hx b/source/funkin/backend/system/github/GitHubException.hx similarity index 90% rename from source/funkin/system/github/GitHubException.hx rename to source/funkin/backend/system/github/GitHubException.hx index 9f664ef5..676bb153 100644 --- a/source/funkin/system/github/GitHubException.hx +++ b/source/funkin/backend/system/github/GitHubException.hx @@ -1,4 +1,4 @@ -package funkin.system.github; +package funkin.backend.system.github; import haxe.Exception; diff --git a/source/funkin/system/github/GitHubReactions.hx b/source/funkin/backend/system/github/GitHubReactions.hx similarity index 85% rename from source/funkin/system/github/GitHubReactions.hx rename to source/funkin/backend/system/github/GitHubReactions.hx index 99a1dd82..b1a56739 100644 --- a/source/funkin/system/github/GitHubReactions.hx +++ b/source/funkin/backend/system/github/GitHubReactions.hx @@ -1,4 +1,4 @@ -package funkin.system.github; +package funkin.backend.system.github; typedef GitHubReactions = { var url:String; diff --git a/source/funkin/system/github/GitHubRelease.hx b/source/funkin/backend/system/github/GitHubRelease.hx similarity index 95% rename from source/funkin/system/github/GitHubRelease.hx rename to source/funkin/backend/system/github/GitHubRelease.hx index e3d6421e..a0bf72ea 100644 --- a/source/funkin/system/github/GitHubRelease.hx +++ b/source/funkin/backend/system/github/GitHubRelease.hx @@ -1,4 +1,4 @@ -package funkin.system.github; +package funkin.backend.system.github; typedef GitHubRelease = { /** diff --git a/source/funkin/system/github/GitHubUser.hx b/source/funkin/backend/system/github/GitHubUser.hx similarity index 98% rename from source/funkin/system/github/GitHubUser.hx rename to source/funkin/backend/system/github/GitHubUser.hx index e4277720..4f817891 100644 --- a/source/funkin/system/github/GitHubUser.hx +++ b/source/funkin/backend/system/github/GitHubUser.hx @@ -1,4 +1,4 @@ -package funkin.system.github; +package funkin.backend.system.github; typedef GitHubUser = { diff --git a/source/funkin/system/interfaces/IBeatReceiver.hx b/source/funkin/backend/system/interfaces/IBeatReceiver.hx similarity index 79% rename from source/funkin/system/interfaces/IBeatReceiver.hx rename to source/funkin/backend/system/interfaces/IBeatReceiver.hx index e36c1a55..eb06627e 100644 --- a/source/funkin/system/interfaces/IBeatReceiver.hx +++ b/source/funkin/backend/system/interfaces/IBeatReceiver.hx @@ -1,4 +1,4 @@ -package funkin.system.interfaces; +package funkin.backend.system.interfaces; interface IBeatReceiver { public function measureHit(curMeasure:Int):Void; diff --git a/source/funkin/system/interfaces/IOffsetCompatible.hx b/source/funkin/backend/system/interfaces/IOffsetCompatible.hx similarity index 71% rename from source/funkin/system/interfaces/IOffsetCompatible.hx rename to source/funkin/backend/system/interfaces/IOffsetCompatible.hx index ccf2316e..c3717523 100644 --- a/source/funkin/system/interfaces/IOffsetCompatible.hx +++ b/source/funkin/backend/system/interfaces/IOffsetCompatible.hx @@ -1,4 +1,4 @@ -package funkin.system.interfaces; +package funkin.backend.system.interfaces; interface IOffsetCompatible { public function addOffset(anim:String, x:Float = 0, y:Float = 0):Void; diff --git a/source/funkin/system/macros/DefinesMacro.hx b/source/funkin/backend/system/macros/DefinesMacro.hx similarity index 93% rename from source/funkin/system/macros/DefinesMacro.hx rename to source/funkin/backend/system/macros/DefinesMacro.hx index b08099bd..b7a8b96e 100644 --- a/source/funkin/system/macros/DefinesMacro.hx +++ b/source/funkin/backend/system/macros/DefinesMacro.hx @@ -1,4 +1,4 @@ -package funkin.system.macros; +package funkin.backend.system.macros; #if macro import sys.io.Process; diff --git a/source/funkin/system/macros/EventMacro.hx b/source/funkin/backend/system/macros/EventMacro.hx similarity index 98% rename from source/funkin/system/macros/EventMacro.hx rename to source/funkin/backend/system/macros/EventMacro.hx index 60cf3808..3a0f72dc 100644 --- a/source/funkin/system/macros/EventMacro.hx +++ b/source/funkin/backend/system/macros/EventMacro.hx @@ -1,4 +1,4 @@ -package funkin.system.macros; +package funkin.backend.system.macros; #if macro /** diff --git a/source/funkin/system/macros/FunkinSaveMacro.hx b/source/funkin/backend/system/macros/FunkinSaveMacro.hx similarity index 98% rename from source/funkin/system/macros/FunkinSaveMacro.hx rename to source/funkin/backend/system/macros/FunkinSaveMacro.hx index 97e5af66..f1c2207d 100644 --- a/source/funkin/system/macros/FunkinSaveMacro.hx +++ b/source/funkin/backend/system/macros/FunkinSaveMacro.hx @@ -1,4 +1,4 @@ -package funkin.system.macros; +package funkin.backend.system.macros; #if macro /** diff --git a/source/funkin/system/macros/GitCommitMacro.hx b/source/funkin/backend/system/macros/GitCommitMacro.hx similarity index 96% rename from source/funkin/system/macros/GitCommitMacro.hx rename to source/funkin/backend/system/macros/GitCommitMacro.hx index dd5da3c6..c03988ce 100644 --- a/source/funkin/system/macros/GitCommitMacro.hx +++ b/source/funkin/backend/system/macros/GitCommitMacro.hx @@ -1,4 +1,4 @@ -package funkin.system.macros; +package funkin.backend.system.macros; #if macro import sys.io.Process; diff --git a/source/funkin/system/macros/NewHaxeWarning.hx b/source/funkin/backend/system/macros/NewHaxeWarning.hx similarity index 92% rename from source/funkin/system/macros/NewHaxeWarning.hx rename to source/funkin/backend/system/macros/NewHaxeWarning.hx index 76fbd12d..88a00e9a 100644 --- a/source/funkin/system/macros/NewHaxeWarning.hx +++ b/source/funkin/backend/system/macros/NewHaxeWarning.hx @@ -1,4 +1,4 @@ -package funkin.system.macros; +package funkin.backend.system.macros; #if macro class NewHaxeWarning { diff --git a/source/funkin/system/macros/OptionsMacro.hx b/source/funkin/backend/system/macros/OptionsMacro.hx similarity index 96% rename from source/funkin/system/macros/OptionsMacro.hx rename to source/funkin/backend/system/macros/OptionsMacro.hx index b68920fc..b3503f5d 100644 --- a/source/funkin/system/macros/OptionsMacro.hx +++ b/source/funkin/backend/system/macros/OptionsMacro.hx @@ -1,4 +1,4 @@ -package funkin.system.macros; +package funkin.backend.system.macros; #if macro using StringTools; diff --git a/source/funkin/system/macros/ScriptsMacro.hx b/source/funkin/backend/system/macros/ScriptsMacro.hx similarity index 94% rename from source/funkin/system/macros/ScriptsMacro.hx rename to source/funkin/backend/system/macros/ScriptsMacro.hx index 0a9a0c9f..87f6d3f8 100644 --- a/source/funkin/system/macros/ScriptsMacro.hx +++ b/source/funkin/backend/system/macros/ScriptsMacro.hx @@ -1,4 +1,4 @@ -package funkin.system.macros; +package funkin.backend.system.macros; #if macro import haxe.macro.Context; @@ -21,7 +21,7 @@ class ScriptsMacro { "flixel.addons.util", // OTHER LIBRARIES & STUFF "away3d", "flx3d", #if sys "sys", #end "openfl.net", - "funkin.system.net", + "funkin.backend.system.net", // BASE HAXE "DateTools", "EReg", "Lambda", "StringBuf", "haxe.crypto", "haxe.display", "haxe.exceptions", "haxe.extern", "scripting" ]) diff --git a/source/funkin/system/macros/SoftcodedClassMacro.hx b/source/funkin/backend/system/macros/SoftcodedClassMacro.hx similarity index 87% rename from source/funkin/system/macros/SoftcodedClassMacro.hx rename to source/funkin/backend/system/macros/SoftcodedClassMacro.hx index 2126432e..5f52c0c8 100644 --- a/source/funkin/system/macros/SoftcodedClassMacro.hx +++ b/source/funkin/backend/system/macros/SoftcodedClassMacro.hx @@ -1,17 +1,17 @@ -package funkin.system.macros; +package funkin.backend.system.macros; using StringTools; class SoftcodedClassMacro { #if macro private static var nonAllowedSuffixes:Array = ["__Softcoded", "_HSC", "_HSX", "_Impl_"]; public static function init() { - Compiler.addGlobalMetadata('funkin.game.cutscenes', '@:build(funkin.system.macros.SoftcodedClassMacro.build())'); - Compiler.addGlobalMetadata('funkin.game', '@:build(funkin.system.macros.SoftcodedClassMacro.build())'); - Compiler.addGlobalMetadata('funkin.menus', '@:build(funkin.system.macros.SoftcodedClassMacro.build())'); - Compiler.addGlobalMetadata('funkin.options', '@:build(funkin.system.macros.SoftcodedClassMacro.build())'); - Compiler.addGlobalMetadata('funkin.scripting', '@:build(funkin.system.macros.SoftcodedClassMacro.build())'); - Compiler.addGlobalMetadata('funkin.shaders', '@:build(funkin.system.macros.SoftcodedClassMacro.build())'); - Compiler.addGlobalMetadata('flixel', '@:build(funkin.system.macros.SoftcodedClassMacro.build())', false); + Compiler.addGlobalMetadata('funkin.game.cutscenes', '@:build(funkin.backend.system.macros.SoftcodedClassMacro.build())'); + Compiler.addGlobalMetadata('funkin.game', '@:build(funkin.backend.system.macros.SoftcodedClassMacro.build())'); + Compiler.addGlobalMetadata('funkin.menus', '@:build(funkin.backend.system.macros.SoftcodedClassMacro.build())'); + Compiler.addGlobalMetadata('funkin.options', '@:build(funkin.backend.system.macros.SoftcodedClassMacro.build())'); + Compiler.addGlobalMetadata('funkin.backend.scripting', '@:build(funkin.backend.system.macros.SoftcodedClassMacro.build())'); + Compiler.addGlobalMetadata('funkin.backend.shaders', '@:build(funkin.backend.system.macros.SoftcodedClassMacro.build())'); + Compiler.addGlobalMetadata('flixel', '@:build(funkin.backend.system.macros.SoftcodedClassMacro.build())', false); } public static function build():Array { diff --git a/source/funkin/system/macros/import.hx b/source/funkin/backend/system/macros/import.hx similarity index 100% rename from source/funkin/system/macros/import.hx rename to source/funkin/backend/system/macros/import.hx diff --git a/source/funkin/system/modules/AudioSwitchFix.hx b/source/funkin/backend/system/modules/AudioSwitchFix.hx similarity index 94% rename from source/funkin/system/modules/AudioSwitchFix.hx rename to source/funkin/backend/system/modules/AudioSwitchFix.hx index 5fc832d1..db8360c1 100644 --- a/source/funkin/system/modules/AudioSwitchFix.hx +++ b/source/funkin/backend/system/modules/AudioSwitchFix.hx @@ -1,9 +1,9 @@ -package funkin.system.modules; +package funkin.backend.system.modules; import lime.media.AudioManager; import flixel.sound.FlxSound; import flixel.FlxState; -import funkin.utils.NativeAPI; +import funkin.backend.utils.NativeAPI; /** * if youre stealing this keep this comment at least please lol diff --git a/source/funkin/system/modules/CrashHandler.hx b/source/funkin/backend/system/modules/CrashHandler.hx similarity index 95% rename from source/funkin/system/modules/CrashHandler.hx rename to source/funkin/backend/system/modules/CrashHandler.hx index 1359f2a3..0deef13a 100644 --- a/source/funkin/system/modules/CrashHandler.hx +++ b/source/funkin/backend/system/modules/CrashHandler.hx @@ -1,7 +1,7 @@ -package funkin.system.modules; +package funkin.backend.system.modules; import lime.system.System; -import funkin.utils.NativeAPI; +import funkin.backend.utils.NativeAPI; import openfl.Lib; import openfl.events.UncaughtErrorEvent; import openfl.events.ErrorEvent; diff --git a/source/funkin/system/modules/FunkinCache.hx b/source/funkin/backend/system/modules/FunkinCache.hx similarity index 99% rename from source/funkin/system/modules/FunkinCache.hx rename to source/funkin/backend/system/modules/FunkinCache.hx index 7f66f9f1..a7559281 100644 --- a/source/funkin/system/modules/FunkinCache.hx +++ b/source/funkin/backend/system/modules/FunkinCache.hx @@ -1,4 +1,4 @@ -package funkin.system.modules; +package funkin.backend.system.modules; import openfl.utils.AssetCache; import openfl.display.BitmapData; diff --git a/source/funkin/system/net/Socket.hx b/source/funkin/backend/system/net/Socket.hx similarity index 97% rename from source/funkin/system/net/Socket.hx rename to source/funkin/backend/system/net/Socket.hx index 6b8f06ac..4aefdabe 100644 --- a/source/funkin/system/net/Socket.hx +++ b/source/funkin/backend/system/net/Socket.hx @@ -1,4 +1,4 @@ -package funkin.system.net; +package funkin.backend.system.net; #if sys import sys.net.Host; diff --git a/source/funkin/system/updating/AsyncUpdater.hx b/source/funkin/backend/system/updating/AsyncUpdater.hx similarity index 97% rename from source/funkin/system/updating/AsyncUpdater.hx rename to source/funkin/backend/system/updating/AsyncUpdater.hx index 68e871ed..ce119a5a 100644 --- a/source/funkin/system/updating/AsyncUpdater.hx +++ b/source/funkin/backend/system/updating/AsyncUpdater.hx @@ -1,9 +1,9 @@ -package funkin.system.updating; +package funkin.backend.system.updating; import openfl.Lib; import sys.io.Process; import haxe.zip.Reader; -import funkin.utils.ZipUtil; +import funkin.backend.utils.ZipUtil; import haxe.io.Path; import openfl.utils.ByteArray; import sys.io.File; @@ -13,7 +13,7 @@ import openfl.events.ProgressEvent; import openfl.net.URLRequest; import openfl.net.URLLoader; import sys.FileSystem; -import funkin.system.github.GitHubRelease; +import funkin.backend.system.github.GitHubRelease; class AsyncUpdater { // NON ASYNC STUFF diff --git a/source/funkin/system/updating/UpdateAvailableScreen.hx b/source/funkin/backend/system/updating/UpdateAvailableScreen.hx similarity index 95% rename from source/funkin/system/updating/UpdateAvailableScreen.hx rename to source/funkin/backend/system/updating/UpdateAvailableScreen.hx index d6a66c7a..5b076058 100644 --- a/source/funkin/system/updating/UpdateAvailableScreen.hx +++ b/source/funkin/backend/system/updating/UpdateAvailableScreen.hx @@ -1,10 +1,10 @@ -package funkin.system.updating; +package funkin.backend.system.updating; -import funkin.utils.MarkdownUtil; +import funkin.backend.utils.MarkdownUtil; import funkin.menus.MainMenuState; import flixel.math.FlxPoint; -import funkin.system.updating.UpdateUtil.UpdateCheckCallback; -import funkin.system.FunkinText; +import funkin.backend.system.updating.UpdateUtil.UpdateCheckCallback; +import funkin.backend.FunkinText; import flixel.text.FlxText; import flixel.addons.transition.FlxTransitionableState; import flixel.tweens.FlxTween; diff --git a/source/funkin/system/updating/UpdateScreen.hx b/source/funkin/backend/system/updating/UpdateScreen.hx similarity index 96% rename from source/funkin/system/updating/UpdateScreen.hx rename to source/funkin/backend/system/updating/UpdateScreen.hx index 32725943..d57a3d4a 100644 --- a/source/funkin/system/updating/UpdateScreen.hx +++ b/source/funkin/backend/system/updating/UpdateScreen.hx @@ -1,12 +1,12 @@ -package funkin.system.updating; +package funkin.backend.system.updating; -import funkin.shaders.CustomShader; -import funkin.system.FunkinText; +import funkin.backend.shaders.CustomShader; +import funkin.backend.FunkinText; import funkin.menus.TitleState; import flixel.math.FlxRect; import flixel.sound.FlxSound; import flixel.ui.FlxBar; -import funkin.system.updating.UpdateUtil.UpdateCheckCallback; +import funkin.backend.system.updating.UpdateUtil.UpdateCheckCallback; class UpdateScreen extends MusicBeatState { public var updater:AsyncUpdater; diff --git a/source/funkin/system/updating/UpdateUtil.hx b/source/funkin/backend/system/updating/UpdateUtil.hx similarity index 93% rename from source/funkin/system/updating/UpdateUtil.hx rename to source/funkin/backend/system/updating/UpdateUtil.hx index 6363f8aa..44b37beb 100644 --- a/source/funkin/system/updating/UpdateUtil.hx +++ b/source/funkin/backend/system/updating/UpdateUtil.hx @@ -1,12 +1,12 @@ -package funkin.system.updating; +package funkin.backend.system.updating; import sys.FileSystem; import haxe.io.Path; -import funkin.system.github.GitHubRelease; -import funkin.system.github.GitHub; +import funkin.backend.system.github.GitHubRelease; +import funkin.backend.system.github.GitHub; import lime.app.Application; -using funkin.system.github.GitHub; +using funkin.backend.system.github.GitHub; class UpdateUtil { public static final repoOwner:String = "YoshiCrafter29"; diff --git a/source/funkin/utils/BitmapUtil.hx b/source/funkin/backend/utils/BitmapUtil.hx similarity index 98% rename from source/funkin/utils/BitmapUtil.hx rename to source/funkin/backend/utils/BitmapUtil.hx index 2346cbee..298b4843 100644 --- a/source/funkin/utils/BitmapUtil.hx +++ b/source/funkin/backend/utils/BitmapUtil.hx @@ -1,4 +1,4 @@ -package funkin.utils; +package funkin.backend.utils; import openfl.display.BitmapData; import flixel.util.FlxColor; diff --git a/source/funkin/utils/CoolUtil.hx b/source/funkin/backend/utils/CoolUtil.hx similarity index 99% rename from source/funkin/utils/CoolUtil.hx rename to source/funkin/backend/utils/CoolUtil.hx index 1d87e053..daebfe72 100644 --- a/source/funkin/utils/CoolUtil.hx +++ b/source/funkin/backend/utils/CoolUtil.hx @@ -1,9 +1,9 @@ -package funkin.utils; +package funkin.backend.utils; import flixel.tweens.FlxTween; import flixel.system.frontEnds.SoundFrontEnd; import flixel.sound.FlxSound; -import funkin.system.Conductor; +import funkin.backend.system.Conductor; import flixel.sound.FlxSoundGroup; import haxe.Json; import funkin.menus.StoryMenuState.WeekData; @@ -17,7 +17,7 @@ import flixel.util.FlxAxes; import flixel.graphics.frames.FlxFrame; import flixel.graphics.frames.FlxFramesCollection; import flash.geom.ColorTransform; -import funkin.chart.Chart; +import funkin.backend.chart.Chart; import haxe.CallStack; using StringTools; diff --git a/source/funkin/utils/DiscordUtil.hx b/source/funkin/backend/utils/DiscordUtil.hx similarity index 93% rename from source/funkin/utils/DiscordUtil.hx rename to source/funkin/backend/utils/DiscordUtil.hx index d1ab858f..31ec1383 100644 --- a/source/funkin/utils/DiscordUtil.hx +++ b/source/funkin/backend/utils/DiscordUtil.hx @@ -1,6 +1,6 @@ -package funkin.utils; +package funkin.backend.utils; -import funkin.scripting.events.DiscordPresenceUpdateEvent; +import funkin.backend.scripting.events.DiscordPresenceUpdateEvent; import haxe.Json; import flixel.sound.FlxSound; #if DISCORD_RPC @@ -96,7 +96,7 @@ class DiscordUtil { data.largeImageText = DiscordUtil.data.logoText; #if GLOBAL_SCRIPT - var event = funkin.scripting.GlobalScript.event("onDiscordPresenceUpdate", EventManager.get(DiscordPresenceUpdateEvent).recycle(data)); + var event = funkin.backend.scripting.GlobalScript.event("onDiscordPresenceUpdate", EventManager.get(DiscordPresenceUpdateEvent).recycle(data)); if (event.cancelled) return; #end diff --git a/source/funkin/utils/EngineUtil.hx b/source/funkin/backend/utils/EngineUtil.hx similarity index 74% rename from source/funkin/utils/EngineUtil.hx rename to source/funkin/backend/utils/EngineUtil.hx index cb6d68e6..d3d9b561 100644 --- a/source/funkin/utils/EngineUtil.hx +++ b/source/funkin/backend/utils/EngineUtil.hx @@ -1,7 +1,7 @@ -package funkin.utils; +package funkin.backend.utils; -import funkin.scripting.Script; -import funkin.scripting.MultiThreadedScript; +import funkin.backend.scripting.Script; +import funkin.backend.scripting.MultiThreadedScript; class EngineUtil { /** diff --git a/source/funkin/utils/FlxInterpolateColor.hx b/source/funkin/backend/utils/FlxInterpolateColor.hx similarity index 97% rename from source/funkin/utils/FlxInterpolateColor.hx rename to source/funkin/backend/utils/FlxInterpolateColor.hx index 370e0707..6f309ba1 100644 --- a/source/funkin/utils/FlxInterpolateColor.hx +++ b/source/funkin/backend/utils/FlxInterpolateColor.hx @@ -1,4 +1,4 @@ -package funkin.utils; +package funkin.backend.utils; import flixel.util.FlxColor; diff --git a/source/funkin/utils/FunkinParentDisabler.hx b/source/funkin/backend/utils/FunkinParentDisabler.hx similarity index 98% rename from source/funkin/utils/FunkinParentDisabler.hx rename to source/funkin/backend/utils/FunkinParentDisabler.hx index 943354dc..f9071759 100644 --- a/source/funkin/utils/FunkinParentDisabler.hx +++ b/source/funkin/backend/utils/FunkinParentDisabler.hx @@ -1,4 +1,4 @@ -package funkin.utils; +package funkin.backend.utils; import flixel.sound.FlxSound; import flixel.util.FlxTimer; diff --git a/source/funkin/utils/IniUtil.hx b/source/funkin/backend/utils/IniUtil.hx similarity index 97% rename from source/funkin/utils/IniUtil.hx rename to source/funkin/backend/utils/IniUtil.hx index 662156f6..7f090554 100644 --- a/source/funkin/utils/IniUtil.hx +++ b/source/funkin/backend/utils/IniUtil.hx @@ -1,4 +1,4 @@ -package funkin.utils; +package funkin.backend.utils; /** diff --git a/source/funkin/utils/MarkdownUtil.hx b/source/funkin/backend/utils/MarkdownUtil.hx similarity index 99% rename from source/funkin/utils/MarkdownUtil.hx rename to source/funkin/backend/utils/MarkdownUtil.hx index 3b50aa2b..7ba67558 100644 --- a/source/funkin/utils/MarkdownUtil.hx +++ b/source/funkin/backend/utils/MarkdownUtil.hx @@ -1,4 +1,4 @@ -package funkin.utils; +package funkin.backend.utils; import flixel.util.FlxColor; import flixel.text.FlxText; diff --git a/source/funkin/utils/MemoryUtil.hx b/source/funkin/backend/utils/MemoryUtil.hx similarity index 92% rename from source/funkin/utils/MemoryUtil.hx rename to source/funkin/backend/utils/MemoryUtil.hx index b58fca7e..8be10133 100644 --- a/source/funkin/utils/MemoryUtil.hx +++ b/source/funkin/backend/utils/MemoryUtil.hx @@ -1,6 +1,6 @@ -package funkin.utils; +package funkin.backend.utils; -import funkin.utils.native.HiddenProcess; +import funkin.backend.utils.native.HiddenProcess; #if cpp import cpp.vm.Gc; #elseif hl @@ -66,11 +66,11 @@ class MemoryUtil { public static function getTotalMem():Float { #if windows - return funkin.utils.native.Windows.getTotalRam(); + return funkin.backend.utils.native.Windows.getTotalRam(); #elseif mac - return funkin.utils.native.Mac.getTotalRam(); + return funkin.backend.utils.native.Mac.getTotalRam(); #elseif linux - return funkin.utils.native.Linux.getTotalRam(); + return funkin.backend.utils.native.Linux.getTotalRam(); #else return 0; #end diff --git a/source/funkin/utils/NativeAPI.hx b/source/funkin/backend/utils/NativeAPI.hx similarity index 97% rename from source/funkin/utils/NativeAPI.hx rename to source/funkin/backend/utils/NativeAPI.hx index 42a87dbf..aa088fd1 100644 --- a/source/funkin/utils/NativeAPI.hx +++ b/source/funkin/backend/utils/NativeAPI.hx @@ -1,6 +1,6 @@ -package funkin.utils; +package funkin.backend.utils; -import funkin.utils.native.*; +import funkin.backend.utils.native.*; /** * Class for Windows-only functions, such as transparent windows, message boxes, and more. diff --git a/source/funkin/utils/NdllUtil.hx b/source/funkin/backend/utils/NdllUtil.hx similarity index 98% rename from source/funkin/utils/NdllUtil.hx rename to source/funkin/backend/utils/NdllUtil.hx index a23fd527..0c75ca77 100644 --- a/source/funkin/utils/NdllUtil.hx +++ b/source/funkin/backend/utils/NdllUtil.hx @@ -1,4 +1,4 @@ -package funkin.utils; +package funkin.backend.utils; import lime.app.Application; diff --git a/source/funkin/utils/SysZip.hx b/source/funkin/backend/utils/SysZip.hx similarity index 99% rename from source/funkin/utils/SysZip.hx rename to source/funkin/backend/utils/SysZip.hx index b89f6b36..3d6ad3ad 100644 --- a/source/funkin/utils/SysZip.hx +++ b/source/funkin/backend/utils/SysZip.hx @@ -1,4 +1,4 @@ -package funkin.utils; +package funkin.backend.utils; #if sys import haxe.io.Input; diff --git a/source/funkin/utils/ThreadUtil.hx b/source/funkin/backend/utils/ThreadUtil.hx similarity index 95% rename from source/funkin/utils/ThreadUtil.hx rename to source/funkin/backend/utils/ThreadUtil.hx index 3415f49c..fe2cb5bf 100644 --- a/source/funkin/utils/ThreadUtil.hx +++ b/source/funkin/backend/utils/ThreadUtil.hx @@ -1,4 +1,4 @@ -package funkin.utils; +package funkin.backend.utils; #if ALLOW_MULTITHREADING class ThreadUtil { diff --git a/source/funkin/utils/XMLUtil.hx b/source/funkin/backend/utils/XMLUtil.hx similarity index 96% rename from source/funkin/utils/XMLUtil.hx rename to source/funkin/backend/utils/XMLUtil.hx index f5779218..66464dd2 100644 --- a/source/funkin/utils/XMLUtil.hx +++ b/source/funkin/backend/utils/XMLUtil.hx @@ -1,11 +1,11 @@ -package funkin.utils; +package funkin.backend.utils; -import funkin.system.FunkinSprite; -import funkin.system.ErrorCode; -import funkin.system.FunkinSprite.XMLAnimType; -import funkin.system.interfaces.IBeatReceiver; +import funkin.backend.FunkinSprite; +import funkin.backend.system.ErrorCode; +import funkin.backend.FunkinSprite.XMLAnimType; +import funkin.backend.system.interfaces.IBeatReceiver; import haxe.xml.Access; -import funkin.system.interfaces.IOffsetCompatible; +import funkin.backend.system.interfaces.IOffsetCompatible; using StringTools; /** diff --git a/source/funkin/utils/ZipUtil.hx b/source/funkin/backend/utils/ZipUtil.hx similarity index 99% rename from source/funkin/utils/ZipUtil.hx rename to source/funkin/backend/utils/ZipUtil.hx index a4fa8e8e..eef06a6d 100644 --- a/source/funkin/utils/ZipUtil.hx +++ b/source/funkin/backend/utils/ZipUtil.hx @@ -1,4 +1,4 @@ -package funkin.utils; +package funkin.backend.utils; #if sys #if (!macro && sys) diff --git a/source/funkin/utils/native/HiddenProcess.hx b/source/funkin/backend/utils/native/HiddenProcess.hx similarity index 98% rename from source/funkin/utils/native/HiddenProcess.hx rename to source/funkin/backend/utils/native/HiddenProcess.hx index 96c976f7..9babd4f6 100644 --- a/source/funkin/utils/native/HiddenProcess.hx +++ b/source/funkin/backend/utils/native/HiddenProcess.hx @@ -1,4 +1,4 @@ -package funkin.utils.native; +package funkin.backend.utils.native; #if cpp /* diff --git a/source/funkin/utils/native/Linux.hx b/source/funkin/backend/utils/native/Linux.hx similarity index 92% rename from source/funkin/utils/native/Linux.hx rename to source/funkin/backend/utils/native/Linux.hx index a723a840..01e6a84b 100644 --- a/source/funkin/utils/native/Linux.hx +++ b/source/funkin/backend/utils/native/Linux.hx @@ -1,4 +1,4 @@ -package funkin.utils.native; +package funkin.backend.utils.native; #if linux @:cppFileCode("#include ") diff --git a/source/funkin/utils/native/Mac.hx b/source/funkin/backend/utils/native/Mac.hx similarity index 90% rename from source/funkin/utils/native/Mac.hx rename to source/funkin/backend/utils/native/Mac.hx index c0a49c2d..fa68700a 100644 --- a/source/funkin/utils/native/Mac.hx +++ b/source/funkin/backend/utils/native/Mac.hx @@ -1,4 +1,4 @@ -package funkin.utils.native; +package funkin.backend.utils.native; #if mac @:cppFileCode("#include ") diff --git a/source/funkin/utils/native/Windows.hx b/source/funkin/backend/utils/native/Windows.hx similarity index 94% rename from source/funkin/utils/native/Windows.hx rename to source/funkin/backend/utils/native/Windows.hx index ce842e42..ad38b385 100644 --- a/source/funkin/utils/native/Windows.hx +++ b/source/funkin/backend/utils/native/Windows.hx @@ -1,6 +1,6 @@ -package funkin.utils.native; +package funkin.backend.utils.native; -import funkin.utils.NativeAPI.MessageBoxIcon; +import funkin.backend.utils.NativeAPI.MessageBoxIcon; #if windows @:buildXml(' @@ -105,7 +105,7 @@ class AudioFixClient : public IMMNotificationClient { EDataFlow flow, ERole role, LPCWSTR pwstrDeviceId) { - ::funkin::_hx_system::Main_obj::audioDisconnected = true; + ::funkin::backend::_hx_system::Main_obj::audioDisconnected = true; return S_OK; }; }; @@ -124,7 +124,7 @@ class Windows { if (!curAudioFix) curAudioFix = new AudioFixClient(); ') public static function registerAudio() { - funkin.system.Main.audioDisconnected = false; + funkin.backend.system.Main.audioDisconnected = false; } @:functionCode(' diff --git a/source/funkin/editors/DebugOptions.hx b/source/funkin/editors/DebugOptions.hx index 3ce4861c..734342c4 100644 --- a/source/funkin/editors/DebugOptions.hx +++ b/source/funkin/editors/DebugOptions.hx @@ -3,7 +3,7 @@ package funkin.editors; import funkin.options.type.*; import funkin.options.OptionsScreen; import funkin.options.TreeMenu; -import funkin.utils.NativeAPI; +import funkin.backend.utils.NativeAPI; class DebugOptions extends TreeMenu { public override function create() { diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx index 55b437d9..2d87b8f6 100644 --- a/source/funkin/editors/charter/Charter.hx +++ b/source/funkin/editors/charter/Charter.hx @@ -6,9 +6,9 @@ import flixel.sound.FlxSound; import flixel.util.FlxSort; import flixel.math.FlxPoint; import funkin.editors.charter.CharterBackdrop.CharterBackdropDummy; -import funkin.system.Conductor; -import funkin.chart.*; -import funkin.chart.ChartData; +import funkin.backend.system.Conductor; +import funkin.backend.chart.*; +import funkin.backend.chart.ChartData; import openfl.display.BitmapData; import flixel.util.FlxColor; import flixel.addons.display.FlxBackdrop; diff --git a/source/funkin/editors/charter/CharterNote.hx b/source/funkin/editors/charter/CharterNote.hx index e98e65d5..89b56a43 100644 --- a/source/funkin/editors/charter/CharterNote.hx +++ b/source/funkin/editors/charter/CharterNote.hx @@ -1,8 +1,8 @@ package funkin.editors.charter; -import funkin.system.Conductor; +import funkin.backend.system.Conductor; import flixel.tweens.FlxTween; -import funkin.shaders.CustomShader; +import funkin.backend.shaders.CustomShader; import flixel.util.FlxColor; class CharterNote extends UISprite { diff --git a/source/funkin/editors/charter/CharterNoteGroup.hx b/source/funkin/editors/charter/CharterNoteGroup.hx index eaa75299..a65a454e 100644 --- a/source/funkin/editors/charter/CharterNoteGroup.hx +++ b/source/funkin/editors/charter/CharterNoteGroup.hx @@ -1,6 +1,6 @@ package funkin.editors.charter; -import funkin.system.Conductor; +import funkin.backend.system.Conductor; class CharterNoteGroup extends FlxTypedGroup { var __loopSprite:CharterNote; diff --git a/source/funkin/editors/charter/CharterSelection.hx b/source/funkin/editors/charter/CharterSelection.hx index 02908d8b..e5cb026b 100644 --- a/source/funkin/editors/charter/CharterSelection.hx +++ b/source/funkin/editors/charter/CharterSelection.hx @@ -1,6 +1,6 @@ package funkin.editors.charter; -import funkin.system.framerate.Framerate; +import funkin.backend.system.framerate.Framerate; import flixel.util.FlxColor; import funkin.menus.FreeplayState.FreeplaySonglist; import funkin.editors.EditorTreeMenu; diff --git a/source/funkin/editors/charter/CharterStrumline.hx b/source/funkin/editors/charter/CharterStrumline.hx index 3c9e6da7..043b6890 100644 --- a/source/funkin/editors/charter/CharterStrumline.hx +++ b/source/funkin/editors/charter/CharterStrumline.hx @@ -3,7 +3,7 @@ package funkin.editors.charter; import funkin.editors.ui.UIContextMenu.UIContextMenuOption; import funkin.editors.ui.UITopMenu.UITopMenuButton; import funkin.game.HealthIcon; -import funkin.chart.ChartData.ChartStrumLine; +import funkin.backend.chart.ChartData.ChartStrumLine; class CharterStrumline extends UISprite { public var strumLine:ChartStrumLine; diff --git a/source/funkin/editors/ui/UICheckbox.hx b/source/funkin/editors/ui/UICheckbox.hx index 2d8d264a..8a0b1a55 100644 --- a/source/funkin/editors/ui/UICheckbox.hx +++ b/source/funkin/editors/ui/UICheckbox.hx @@ -1,6 +1,6 @@ package funkin.editors.ui; -import funkin.system.FunkinText; +import funkin.backend.FunkinText; class UICheckbox extends UISprite { public var checked:Bool = false; diff --git a/source/funkin/editors/ui/UIState.hx b/source/funkin/editors/ui/UIState.hx index 5c70edb5..af77d6f8 100644 --- a/source/funkin/editors/ui/UIState.hx +++ b/source/funkin/editors/ui/UIState.hx @@ -3,7 +3,7 @@ package funkin.editors.ui; import lime.ui.KeyModifier; import lime.ui.KeyCode; import openfl.events.KeyboardEvent; -import funkin.system.framerate.Framerate; +import funkin.backend.system.framerate.Framerate; import funkin.editors.ui.UIContextMenu.UIContextMenuCallback; import openfl.ui.Mouse; import funkin.editors.ui.UIContextMenu.UIContextMenuOption; diff --git a/source/funkin/editors/ui/UIText.hx b/source/funkin/editors/ui/UIText.hx index 490d7ae6..2b376a42 100644 --- a/source/funkin/editors/ui/UIText.hx +++ b/source/funkin/editors/ui/UIText.hx @@ -1,7 +1,7 @@ package funkin.editors.ui; import flixel.util.FlxColor; -import funkin.system.FunkinText; +import funkin.backend.FunkinText; class UIText extends FunkinText { // PUTTING THIS HERE IN CASE IMMA MAKE FUTURE CHANGES diff --git a/source/funkin/editors/ui/UIWarningSubstate.hx b/source/funkin/editors/ui/UIWarningSubstate.hx index 0f440d58..1ad656fb 100644 --- a/source/funkin/editors/ui/UIWarningSubstate.hx +++ b/source/funkin/editors/ui/UIWarningSubstate.hx @@ -2,7 +2,7 @@ package funkin.editors.ui; import flixel.tweens.FlxTween; import flixel.tweens.FlxEase; -import funkin.shaders.CustomShader; +import funkin.backend.shaders.CustomShader; class UIWarningSubstate extends MusicBeatSubstate { var camShaders:Array = []; diff --git a/source/funkin/game/Character.hx b/source/funkin/game/Character.hx index e601c80e..548315fd 100644 --- a/source/funkin/game/Character.hx +++ b/source/funkin/game/Character.hx @@ -1,11 +1,11 @@ package funkin.game; -import funkin.system.FunkinSprite; +import funkin.backend.FunkinSprite; import flixel.graphics.frames.FlxFrame; import flixel.math.FlxPoint; -import funkin.system.interfaces.IBeatReceiver; -import funkin.system.interfaces.IOffsetCompatible; -import funkin.utils.XMLUtil; +import funkin.backend.system.interfaces.IBeatReceiver; +import funkin.backend.system.interfaces.IOffsetCompatible; +import funkin.backend.utils.XMLUtil; import flixel.animation.FlxBaseAnimation; import flixel.graphics.frames.FlxAtlasFrames; @@ -14,14 +14,14 @@ import flixel.math.FlxRect; import haxe.xml.Access; import haxe.Exception; import haxe.io.Path; -import funkin.system.Conductor; +import funkin.backend.system.Conductor; import flash.geom.ColorTransform; -import funkin.scripting.DummyScript; -import funkin.scripting.Script; -import funkin.scripting.events.*; -import funkin.scripting.events.PlayAnimEvent.PlayAnimContext; +import funkin.backend.scripting.DummyScript; +import funkin.backend.scripting.Script; +import funkin.backend.scripting.events.*; +import funkin.backend.scripting.events.PlayAnimEvent.PlayAnimContext; using StringTools; @:allow(funkin.desktop.editors.CharacterEditor) diff --git a/source/funkin/game/GameOverSubstate.hx b/source/funkin/game/GameOverSubstate.hx index 3c26bcbf..35b1218c 100644 --- a/source/funkin/game/GameOverSubstate.hx +++ b/source/funkin/game/GameOverSubstate.hx @@ -8,7 +8,7 @@ import flixel.util.FlxColor; import flixel.util.FlxTimer; import funkin.menus.StoryMenuState; import funkin.menus.FreeplayState; -import funkin.system.Conductor; +import funkin.backend.system.Conductor; class GameOverSubstate extends MusicBeatSubstate { diff --git a/source/funkin/game/Note.hx b/source/funkin/game/Note.hx index 4634ff33..29849376 100644 --- a/source/funkin/game/Note.hx +++ b/source/funkin/game/Note.hx @@ -1,13 +1,13 @@ package funkin.game; -import funkin.chart.Chart; -import funkin.chart.ChartData; +import funkin.backend.chart.Chart; +import funkin.backend.chart.ChartData; import flixel.graphics.frames.FlxAtlasFrames; import flixel.util.FlxColor; import flixel.math.FlxRect; import flixel.math.FlxPoint; -import funkin.system.Conductor; -import funkin.scripting.events.*; +import funkin.backend.system.Conductor; +import funkin.backend.scripting.events.*; using StringTools; diff --git a/source/funkin/game/NoteGroup.hx b/source/funkin/game/NoteGroup.hx index 73005039..daf5de14 100644 --- a/source/funkin/game/NoteGroup.hx +++ b/source/funkin/game/NoteGroup.hx @@ -1,7 +1,7 @@ package funkin.game; import flixel.util.FlxSort; -import funkin.system.Conductor; +import funkin.backend.system.Conductor; class NoteGroup extends FlxTypedGroup { var __loopSprite:Note; diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 54e90819..c14a2f7a 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -2,15 +2,15 @@ package funkin.game; import funkin.savedata.FunkinSave; import flixel.graphics.FlxGraphic; -import funkin.chart.Chart; -import funkin.chart.ChartData; +import funkin.backend.chart.Chart; +import funkin.backend.chart.ChartData; import funkin.game.SplashHandler; -import funkin.scripting.DummyScript; +import funkin.backend.scripting.DummyScript; import funkin.menus.StoryMenuState.WeekData; -import funkin.system.FunkinText; +import funkin.backend.FunkinText; import flixel.group.FlxSpriteGroup; -import funkin.scripting.Script; -import funkin.scripting.ScriptPack; +import funkin.backend.scripting.Script; +import funkin.backend.scripting.ScriptPack; import flixel.FlxSubState; import flixel.addons.transition.FlxTransitionableState; import flixel.math.FlxPoint; @@ -23,11 +23,11 @@ import flixel.util.FlxSort; import flixel.util.FlxTimer; import haxe.io.Path; import lime.utils.Assets; -import funkin.system.Conductor; +import funkin.backend.system.Conductor; import funkin.game.cutscenes.*; import funkin.menus.*; -import funkin.scripting.events.*; +import funkin.backend.scripting.events.*; using StringTools; diff --git a/source/funkin/game/Stage.hx b/source/funkin/game/Stage.hx index 460419ac..56f705be 100644 --- a/source/funkin/game/Stage.hx +++ b/source/funkin/game/Stage.hx @@ -1,11 +1,11 @@ package funkin.game; import flixel.math.FlxPoint; -import funkin.system.MusicBeatGroup; +import funkin.backend.MusicBeatGroup; import flixel.FlxState; import haxe.xml.Access; -import funkin.system.interfaces.IBeatReceiver; -import funkin.scripting.Script; +import funkin.backend.system.interfaces.IBeatReceiver; +import funkin.backend.scripting.Script; import haxe.io.Path; using StringTools; diff --git a/source/funkin/game/Strum.hx b/source/funkin/game/Strum.hx index bcd95f2c..578a7a10 100644 --- a/source/funkin/game/Strum.hx +++ b/source/funkin/game/Strum.hx @@ -1,7 +1,7 @@ package funkin.game; import flixel.math.FlxPoint; -import funkin.system.Conductor; +import funkin.backend.system.Conductor; class Strum extends FlxSprite { public var cpu = false; diff --git a/source/funkin/game/StrumLine.hx b/source/funkin/game/StrumLine.hx index 25e11077..bfa440f7 100644 --- a/source/funkin/game/StrumLine.hx +++ b/source/funkin/game/StrumLine.hx @@ -2,10 +2,10 @@ package funkin.game; import flixel.util.FlxSignal.FlxTypedSignal; -import funkin.scripting.events.*; -import funkin.system.Conductor; -import funkin.chart.ChartData; -import funkin.system.Controls; +import funkin.backend.scripting.events.*; +import funkin.backend.system.Conductor; +import funkin.backend.chart.ChartData; +import funkin.backend.system.Controls; import flixel.tweens.FlxTween; class StrumLine extends FlxTypedGroup { diff --git a/source/funkin/game/cutscenes/ScriptedCutscene.hx b/source/funkin/game/cutscenes/ScriptedCutscene.hx index 057ded48..65d48958 100644 --- a/source/funkin/game/cutscenes/ScriptedCutscene.hx +++ b/source/funkin/game/cutscenes/ScriptedCutscene.hx @@ -1,8 +1,8 @@ package funkin.game.cutscenes; -import funkin.scripting.DummyScript; +import funkin.backend.scripting.DummyScript; import flixel.addons.transition.FlxTransitionableState; -import funkin.scripting.Script; +import funkin.backend.scripting.Script; /** * Substate made for scripted cutscenes. diff --git a/source/funkin/game/cutscenes/VideoCutscene.hx b/source/funkin/game/cutscenes/VideoCutscene.hx index 8062724f..0a8031e6 100644 --- a/source/funkin/game/cutscenes/VideoCutscene.hx +++ b/source/funkin/game/cutscenes/VideoCutscene.hx @@ -6,7 +6,7 @@ import flixel.addons.display.FlxBackdrop; #if sys import sys.io.File; #end -import funkin.system.FunkinText; +import funkin.backend.FunkinText; import haxe.xml.Access; diff --git a/source/funkin/import.hx b/source/funkin/import.hx index 32619853..4ef601e8 100644 --- a/source/funkin/import.hx +++ b/source/funkin/import.hx @@ -1,14 +1,14 @@ #if !macro -import funkin.assets.Paths; -import funkin.system.MusicBeatState; -import funkin.system.MusicBeatSubstate; -import funkin.system.MusicBeatGroup; -import funkin.system.FunkinSprite; -import funkin.utils.*; -import funkin.system.Logs; +import funkin.backend.assets.Paths; +import funkin.backend.MusicBeatState; +import funkin.backend.MusicBeatSubstate; +import funkin.backend.MusicBeatGroup; +import funkin.backend.FunkinSprite; +import funkin.backend.utils.*; +import funkin.backend.system.Logs; import funkin.options.Options; import funkin.game.PlayState; -import funkin.scripting.EventManager; +import funkin.backend.scripting.EventManager; import openfl.utils.Assets; @@ -26,5 +26,5 @@ import flixel.group.FlxGroup.FlxTypedGroup; import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; using StringTools; -using funkin.utils.CoolUtil; +using funkin.backend.utils.CoolUtil; #end diff --git a/source/funkin/menus/BetaWarningState.hx b/source/funkin/menus/BetaWarningState.hx index 8a1f1d7e..b2d9fad3 100644 --- a/source/funkin/menus/BetaWarningState.hx +++ b/source/funkin/menus/BetaWarningState.hx @@ -3,7 +3,7 @@ package funkin.menus; import flixel.addons.transition.FlxTransitionableState; import flixel.util.FlxColor; import flixel.text.FlxText; -import funkin.system.FunkinText; +import funkin.backend.FunkinText; class BetaWarningState extends MusicBeatState { var titleAlphabet:Alphabet; diff --git a/source/funkin/menus/FreeplayState.hx b/source/funkin/menus/FreeplayState.hx index 7847723a..58cd4d3f 100644 --- a/source/funkin/menus/FreeplayState.hx +++ b/source/funkin/menus/FreeplayState.hx @@ -1,7 +1,7 @@ package funkin.menus; -import funkin.chart.Chart; -import funkin.chart.ChartData; +import funkin.backend.chart.Chart; +import funkin.backend.chart.ChartData; import haxe.io.Path; import flash.text.TextField; import flixel.FlxState; @@ -12,7 +12,7 @@ import lime.utils.Assets; import funkin.game.HealthIcon; import funkin.savedata.FunkinSave; import haxe.Json; -import funkin.scripting.events.*; +import funkin.backend.scripting.events.*; using StringTools; @@ -423,7 +423,7 @@ class FreeplaySonglist { public function new() {} - public function getSongsFromSource(source:funkin.assets.AssetsLibraryList.AssetSource, useTxt:Bool = true) { + public function getSongsFromSource(source:funkin.backend.assets.AssetsLibraryList.AssetSource, useTxt:Bool = true) { var path:String = Paths.txt('freeplaySonglist'); var songsFound:Array = []; if (useTxt && Paths.assetsTree.existsSpecific(path, "TEXT", source)) { diff --git a/source/funkin/menus/MainMenuState.hx b/source/funkin/menus/MainMenuState.hx index 45f7ae1d..bbb850c5 100644 --- a/source/funkin/menus/MainMenuState.hx +++ b/source/funkin/menus/MainMenuState.hx @@ -1,7 +1,7 @@ package funkin.menus; import haxe.Json; -import funkin.system.FunkinText; +import funkin.backend.FunkinText; // import funkin.menus.credits.CreditsMain; import flixel.FlxState; import flixel.addons.transition.FlxTransitionableState; @@ -11,7 +11,7 @@ import flixel.text.FlxText; import flixel.tweens.FlxTween; import flixel.util.FlxColor; import lime.app.Application; -import funkin.scripting.events.*; +import funkin.backend.scripting.events.*; import funkin.options.OptionsMenu; @@ -76,7 +76,7 @@ class MainMenuState extends MusicBeatState FlxG.camera.follow(camFollow, null, 0.06); - var versionShit:FunkinText = new FunkinText(5, FlxG.height - 2, 0, 'Codename Engine v${Application.current.meta.get('version')}\nBeta: Commit ${funkin.system.macros.GitCommitMacro.commitNumber} (${funkin.system.macros.GitCommitMacro.commitHash})\n[TAB] Open Mods menu\n'); + var versionShit:FunkinText = new FunkinText(5, FlxG.height - 2, 0, 'Codename Engine v${Application.current.meta.get('version')}\nBeta: Commit ${funkin.backend.system.macros.GitCommitMacro.commitNumber} (${funkin.backend.system.macros.GitCommitMacro.commitHash})\n[TAB] Open Mods menu\n'); versionShit.scrollFactor.set(); versionShit.y -= versionShit.height; add(versionShit); @@ -104,7 +104,7 @@ class MainMenuState extends MusicBeatState FlxG.switchState(new funkin.desktop.DesktopMain()); if (FlxG.keys.justPressed.EIGHT) { #if sys - sys.io.File.saveContent("chart.json", Json.stringify(funkin.chart.Chart.parse("dadbattle", "hard"))); + sys.io.File.saveContent("chart.json", Json.stringify(funkin.backend.chart.Chart.parse("dadbattle", "hard"))); #end } */ diff --git a/source/funkin/menus/ModSwitchMenu.hx b/source/funkin/menus/ModSwitchMenu.hx index 93938757..0b4d7ea2 100644 --- a/source/funkin/menus/ModSwitchMenu.hx +++ b/source/funkin/menus/ModSwitchMenu.hx @@ -2,7 +2,7 @@ package funkin.menus; #if MOD_SUPPORT import haxe.io.Path; -import funkin.assets.ModsFolder; +import funkin.backend.assets.ModsFolder; import sys.FileSystem; import flixel.tweens.FlxTween; diff --git a/source/funkin/menus/PauseSubState.hx b/source/funkin/menus/PauseSubState.hx index a8693399..ba33cf6d 100644 --- a/source/funkin/menus/PauseSubState.hx +++ b/source/funkin/menus/PauseSubState.hx @@ -1,9 +1,9 @@ package funkin.menus; import funkin.options.OptionsMenu; -import funkin.scripting.events.PauseCreationEvent; -import funkin.scripting.events.NameEvent; -import funkin.scripting.Script; +import funkin.backend.scripting.events.PauseCreationEvent; +import funkin.backend.scripting.events.NameEvent; +import funkin.backend.scripting.Script; import flixel.FlxSubState; import flixel.addons.transition.FlxTransitionableState; import flixel.input.keyboard.FlxKey; @@ -13,7 +13,7 @@ import flixel.tweens.FlxTween; import flixel.util.FlxColor; import funkin.options.keybinds.KeybindsOptions; import funkin.menus.StoryMenuState; -import funkin.utils.FunkinParentDisabler; +import funkin.backend.utils.FunkinParentDisabler; class PauseSubState extends MusicBeatSubstate { diff --git a/source/funkin/menus/StoryMenuState.hx b/source/funkin/menus/StoryMenuState.hx index 1fb0900b..495edaf9 100644 --- a/source/funkin/menus/StoryMenuState.hx +++ b/source/funkin/menus/StoryMenuState.hx @@ -2,13 +2,13 @@ package funkin.menus; import funkin.savedata.FunkinSave; import haxe.io.Path; -import funkin.scripting.events.*; +import funkin.backend.scripting.events.*; import flixel.util.FlxTimer; import flixel.math.FlxPoint; import flixel.graphics.frames.FlxFramesCollection; import flixel.tweens.FlxTween; import flixel.util.FlxColor; -import funkin.system.FunkinText; +import funkin.backend.FunkinText; import haxe.xml.Access; import flixel.text.FlxText; @@ -300,7 +300,7 @@ class StoryMenuState extends MusicBeatState { characters[charName] = charObj; } - public function getWeeksFromSource(weeks:Array, source:funkin.assets.AssetsLibraryList.AssetSource) { + public function getWeeksFromSource(weeks:Array, source:funkin.backend.assets.AssetsLibraryList.AssetSource) { var path:String = Paths.txt('freeplaySonglist'); var weeksFound:Array = []; if (Paths.assetsTree.existsSpecific(path, "TEXT", source)) { diff --git a/source/funkin/menus/TitleState.hx b/source/funkin/menus/TitleState.hx index 748f957f..d830c0b0 100644 --- a/source/funkin/menus/TitleState.hx +++ b/source/funkin/menus/TitleState.hx @@ -1,8 +1,8 @@ package funkin.menus; -import funkin.system.github.GitHub; -import funkin.system.MusicBeatGroup; -import funkin.utils.XMLUtil; +import funkin.backend.system.github.GitHub; +import funkin.backend.MusicBeatGroup; +import funkin.backend.utils.XMLUtil; import flixel.util.typeLimit.OneOfThree; import flixel.util.typeLimit.OneOfTwo; import flixel.FlxState; @@ -21,14 +21,14 @@ import flixel.text.FlxText; import flixel.tweens.FlxTween; import flixel.util.FlxColor; import flixel.util.FlxTimer; -import funkin.system.Conductor; +import funkin.backend.system.Conductor; import openfl.Assets; import haxe.xml.Access; using StringTools; -@:allow(funkin.assets.ModsFolder) -@:allow(funkin.system.MainState) +@:allow(funkin.backend.assets.ModsFolder) +@:allow(funkin.backend.system.MainState) class TitleState extends MusicBeatState { static var initialized:Bool = false; @@ -187,11 +187,11 @@ class TitleState extends MusicBeatState function goToMainMenu() { #if UPDATE_CHECKING - var report = hasCheckedUpdates ? null : funkin.system.updating.UpdateUtil.checkForUpdates(); + var report = hasCheckedUpdates ? null : funkin.backend.system.updating.UpdateUtil.checkForUpdates(); hasCheckedUpdates = true; if (report != null && report.newUpdate) { - FlxG.switchState(new funkin.system.updating.UpdateAvailableScreen(report)); + FlxG.switchState(new funkin.backend.system.updating.UpdateAvailableScreen(report)); } else { FlxG.switchState(new MainMenuState()); } diff --git a/source/funkin/menus/credits/CreditsCodename.hx b/source/funkin/menus/credits/CreditsCodename.hx index ade9cc16..9bf25465 100644 --- a/source/funkin/menus/credits/CreditsCodename.hx +++ b/source/funkin/menus/credits/CreditsCodename.hx @@ -1,18 +1,18 @@ package funkin.menus.credits; -import funkin.system.FunkinText; +import funkin.backend.FunkinText; import flixel.util.FlxColor; -import funkin.shaders.CustomShader; +import funkin.backend.shaders.CustomShader; import funkin.options.type.TextOption; import funkin.options.OptionsScreen; import flixel.graphics.FlxGraphic; import openfl.display.BitmapData; import flixel.addons.transition.FlxTransitionableState; -import funkin.system.github.GitHub; -import funkin.system.github.GitHubContributor; +import funkin.backend.system.github.GitHub; +import funkin.backend.system.github.GitHubContributor; import funkin.menus.MainMenuState; -using funkin.utils.BitmapUtil; +using funkin.backend.utils.BitmapUtil; class CreditsCodename extends OptionsScreen { public var contributorsSprites:Array = []; diff --git a/source/funkin/menus/ui/Alphabet.hx b/source/funkin/menus/ui/Alphabet.hx index b0a1cd59..c885898e 100644 --- a/source/funkin/menus/ui/Alphabet.hx +++ b/source/funkin/menus/ui/Alphabet.hx @@ -2,8 +2,8 @@ package funkin.menus.ui; import openfl.utils.AssetLibrary; import haxe.xml.Access; -import funkin.assets.LimeLibrarySymbol; -import funkin.assets.ModsAssetLibrary; +import funkin.backend.assets.LimeLibrarySymbol; +import funkin.backend.assets.ModsAssetLibrary; import flixel.graphics.frames.FlxAtlasFrames; import flixel.group.FlxSpriteGroup; import flixel.util.FlxTimer; diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx index 79bc6b7a..ba27502e 100644 --- a/source/funkin/options/Options.hx +++ b/source/funkin/options/Options.hx @@ -1,12 +1,12 @@ package funkin.options; -import funkin.system.Controls; +import funkin.backend.system.Controls; import openfl.Lib; import flixel.util.FlxSave; import flixel.input.keyboard.FlxKey; -@:build(funkin.system.macros.OptionsMacro.build()) -@:build(funkin.system.macros.FunkinSaveMacro.build("__save", "__flush", "__load")) +@:build(funkin.backend.system.macros.OptionsMacro.build()) +@:build(funkin.backend.system.macros.FunkinSaveMacro.build("__save", "__flush", "__load")) class Options { @:dox(hide) @:doNotSave diff --git a/source/funkin/options/OptionsMenu.hx b/source/funkin/options/OptionsMenu.hx index 7cf25875..9e722c61 100644 --- a/source/funkin/options/OptionsMenu.hx +++ b/source/funkin/options/OptionsMenu.hx @@ -67,7 +67,7 @@ class OptionsMenu extends TreeMenu { })]); var xmlPath = Paths.xml("config/options"); - for(source in [funkin.assets.AssetsLibraryList.AssetSource.SOURCE, funkin.assets.AssetsLibraryList.AssetSource.MODS]) { + for(source in [funkin.backend.assets.AssetsLibraryList.AssetSource.SOURCE, funkin.backend.assets.AssetsLibraryList.AssetSource.MODS]) { if (Paths.assetsTree.existsSpecific(xmlPath, "TEXT", source)) { var access:Access = null; try { diff --git a/source/funkin/options/PlayerSettings.hx b/source/funkin/options/PlayerSettings.hx index 05a004ac..1a8750cb 100644 --- a/source/funkin/options/PlayerSettings.hx +++ b/source/funkin/options/PlayerSettings.hx @@ -1,6 +1,6 @@ package funkin.options; -import funkin.system.Controls; +import funkin.backend.system.Controls; import flixel.util.FlxSignal; // import ui.DeviceManager; diff --git a/source/funkin/options/TreeMenu.hx b/source/funkin/options/TreeMenu.hx index fb82b996..669bdb4b 100644 --- a/source/funkin/options/TreeMenu.hx +++ b/source/funkin/options/TreeMenu.hx @@ -1,7 +1,7 @@ package funkin.options; import flixel.FlxState; -import funkin.system.FunkinText; +import funkin.backend.FunkinText; import flixel.tweens.FlxTween; import funkin.menus.MainMenuState; import funkin.options.type.TextOption; diff --git a/source/funkin/options/categories/MiscOptions.hx b/source/funkin/options/categories/MiscOptions.hx index 27ddfe0b..374826d0 100644 --- a/source/funkin/options/categories/MiscOptions.hx +++ b/source/funkin/options/categories/MiscOptions.hx @@ -13,9 +13,9 @@ class MiscOptions extends OptionsScreen { "Check for Updates", "Select this option to check for new engine updates.", function() { - var report = funkin.system.updating.UpdateUtil.checkForUpdates(); + var report = funkin.backend.system.updating.UpdateUtil.checkForUpdates(); if (report.newUpdate) { - FlxG.switchState(new funkin.system.updating.UpdateAvailableScreen(report)); + FlxG.switchState(new funkin.backend.system.updating.UpdateAvailableScreen(report)); } else { CoolUtil.playMenuSFX(CANCEL); updateDescText("No update found."); diff --git a/source/funkin/options/keybinds/ChangeKeybindSubState.hx b/source/funkin/options/keybinds/ChangeKeybindSubState.hx index d0b2ac7c..57a01e24 100644 --- a/source/funkin/options/keybinds/ChangeKeybindSubState.hx +++ b/source/funkin/options/keybinds/ChangeKeybindSubState.hx @@ -1,7 +1,7 @@ package funkin.options.keybinds; import flixel.effects.FlxFlicker; -import funkin.system.Controls; +import funkin.backend.system.Controls; import flixel.addons.transition.FlxTransitionableState; import flixel.util.FlxColor; import flixel.input.keyboard.FlxKey; diff --git a/source/funkin/options/keybinds/KeybindSetting.hx b/source/funkin/options/keybinds/KeybindSetting.hx index 353c6847..37dd9913 100644 --- a/source/funkin/options/keybinds/KeybindSetting.hx +++ b/source/funkin/options/keybinds/KeybindSetting.hx @@ -1,7 +1,7 @@ package funkin.options.keybinds; import flixel.effects.FlxFlicker; -import funkin.system.Controls; +import funkin.backend.system.Controls; import flixel.addons.transition.FlxTransitionableState; import flixel.util.FlxColor; import flixel.input.keyboard.FlxKey; diff --git a/source/funkin/options/keybinds/KeybindsOptions.hx b/source/funkin/options/keybinds/KeybindsOptions.hx index b0a0fc4c..9176d27b 100644 --- a/source/funkin/options/keybinds/KeybindsOptions.hx +++ b/source/funkin/options/keybinds/KeybindsOptions.hx @@ -1,6 +1,6 @@ package funkin.options.keybinds; -import funkin.system.Controls; +import funkin.backend.system.Controls; import flixel.addons.transition.FlxTransitionableState; import flixel.util.FlxColor; import flixel.input.keyboard.FlxKey; diff --git a/source/funkin/options/type/OptionType.hx b/source/funkin/options/type/OptionType.hx index b8a74441..7014791b 100644 --- a/source/funkin/options/type/OptionType.hx +++ b/source/funkin/options/type/OptionType.hx @@ -1,6 +1,6 @@ package funkin.options.type; -import funkin.system.Controls; +import funkin.backend.system.Controls; import flixel.group.FlxSpriteGroup; import funkin.options.OptionsScreen; diff --git a/source/funkin/savedata/FunkinSave.hx b/source/funkin/savedata/FunkinSave.hx index 82e26c5c..76a66729 100644 --- a/source/funkin/savedata/FunkinSave.hx +++ b/source/funkin/savedata/FunkinSave.hx @@ -9,7 +9,7 @@ import flixel.util.FlxSave; * Just add your save variables the way you would do in the Options.hx file. * The macro will automatically generate the `flush` and `load` functions. */ -@:build(funkin.system.macros.FunkinSaveMacro.build("save", "flush", "load")) +@:build(funkin.backend.system.macros.FunkinSaveMacro.build("save", "flush", "load")) class FunkinSave { public static var highscores:Map = []; diff --git a/source/lime/system/System.hx b/source/lime/system/System.hx index f29f9836..f14348be 100644 --- a/source/lime/system/System.hx +++ b/source/lime/system/System.hx @@ -529,8 +529,8 @@ class System // executes first!! #if sys - funkin.utils.NativeAPI.registerAsDPICompatible(); - funkin.system.CommandLineHandler.parseCommandLine(Sys.args()); + funkin.backend.utils.NativeAPI.registerAsDPICompatible(); + funkin.backend.system.CommandLineHandler.parseCommandLine(Sys.args()); #end if (__applicationEntryPoint == null) diff --git a/source/lime/utils/Log.hx b/source/lime/utils/Log.hx index fea038af..ebf2c764 100644 --- a/source/lime/utils/Log.hx +++ b/source/lime/utils/Log.hx @@ -1,7 +1,7 @@ package lime.utils; import haxe.PosInfos; -import funkin.system.Logs as FunkinLogs; +import funkin.backend.system.Logs as FunkinLogs; #if !lime_debug @:fileXml('tags="haxe,release"') diff --git a/source/openfl/media/Sound.hx b/source/openfl/media/Sound.hx index 8e950058..32a471ff 100644 --- a/source/openfl/media/Sound.hx +++ b/source/openfl/media/Sound.hx @@ -636,8 +636,8 @@ class Sound extends EventDispatcher return null; } - if (changeID < funkin.system.Main.changeID) { - changeID = funkin.system.Main.changeID; + if (changeID < funkin.backend.system.Main.changeID) { + changeID = funkin.backend.system.Main.changeID; regen(); } diff --git a/source/openfl/utils/Assets.hx b/source/openfl/utils/Assets.hx index a44c816f..f28eea05 100644 --- a/source/openfl/utils/Assets.hx +++ b/source/openfl/utils/Assets.hx @@ -1,7 +1,7 @@ package openfl.utils; import funkin.options.Options; -import funkin.system.OptimizedBitmapData; +import funkin.backend.system.OptimizedBitmapData; import openfl.utils._internal.Log; import openfl.display.BitmapData; import openfl.display.MovieClip; diff --git a/source/scripting/CharacterScript.hx b/source/scripting/CharacterScript.hx index 0f3d1faf..c4d3f2c9 100644 --- a/source/scripting/CharacterScript.hx +++ b/source/scripting/CharacterScript.hx @@ -1,6 +1,6 @@ package scripting; -import funkin.scripting.events.*; +import funkin.backend.scripting.events.*; /** * Contains all callbacks you can add in a Character script. diff --git a/source/scripting/PlayStateScript.hx b/source/scripting/PlayStateScript.hx index d6129ccf..25cad34f 100644 --- a/source/scripting/PlayStateScript.hx +++ b/source/scripting/PlayStateScript.hx @@ -1,6 +1,6 @@ package scripting; -import funkin.scripting.events.*; +import funkin.backend.scripting.events.*; /** * Contains all callbacks you can add in modcharts and stage scripts.