From 0a911ae607fcad9f3da539b74fcfc9f1526979aa Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Wed, 12 Feb 2025 20:35:37 -0500 Subject: [PATCH] remove a buncho unused imports --- source/funkin/InitState.hx | 1 - source/funkin/PlayerSettings.hx | 4 +-- source/funkin/api/discord/DiscordClient.hx | 2 +- source/funkin/api/newgrounds/Leaderboards.hx | 4 +-- .../funkin/api/newgrounds/NewgroundsClient.hx | 2 +- source/funkin/audio/FlxStreamSound.hx | 3 -- source/funkin/audio/FunkinSound.hx | 2 -- source/funkin/audio/SoundGroup.hx | 1 - source/funkin/audio/visualize/ABotVis.hx | 1 - .../audio/visualize/PolygonSpectogram.hx | 2 +- .../data/dialogue/speaker/SpeakerRegistry.hx | 1 - source/funkin/data/event/SongEventRegistry.hx | 1 - source/funkin/data/event/SongEventSchema.hx | 6 ---- source/funkin/data/stage/StageRegistry.hx | 19 +++++++++-- .../funkin/data/story/level/LevelRegistry.hx | 1 - source/funkin/effects/FunkTrail.hx | 2 +- source/funkin/graphics/FlxFilteredSprite.hx | 6 ---- source/funkin/graphics/FunkinSprite.hx | 2 +- .../graphics/adobeanimate/FlxAtlasSprite.hx | 3 -- source/funkin/graphics/shaders/BlueFade.hx | 1 - .../graphics/shaders/RuntimeRainShader.hx | 1 - source/funkin/graphics/shaders/TextureSwap.hx | 1 - .../funkin/graphics/shaders/TitleOutline.hx | 1 - source/funkin/graphics/video/FlxVideo.hx | 2 -- source/funkin/input/Controls.hx | 8 +---- source/funkin/modding/events/ScriptEvent.hx | 1 - source/funkin/play/Countdown.hx | 4 --- source/funkin/play/GitarooPause.hx | 3 +- source/funkin/play/PauseSubState.hx | 9 +----- source/funkin/play/ResultState.hx | 7 +--- .../play/components/ClearPercentCounter.hx | 6 ---- source/funkin/play/components/PopUpStuff.hx | 5 --- source/funkin/play/components/TallyCounter.hx | 4 --- source/funkin/play/cutscene/VideoCutscene.hx | 1 - .../play/cutscene/dialogue/Conversation.hx | 5 --- .../funkin/play/event/FocusCameraSongEvent.hx | 2 -- .../play/event/PlayAnimationSongEvent.hx | 2 -- source/funkin/play/event/ScriptedSongEvent.hx | 1 - source/funkin/play/event/ScrollSpeedEvent.hx | 4 --- .../play/event/SetCameraBopSongEvent.hx | 5 --- .../funkin/play/event/ZoomCameraSongEvent.hx | 4 --- source/funkin/play/notes/NoteHoldCover.hx | 3 -- source/funkin/play/notes/NoteSplash.hx | 2 -- source/funkin/play/notes/NoteSprite.hx | 2 -- source/funkin/play/notes/Strumline.hx | 6 ---- source/funkin/play/notes/SustainTrail.hx | 9 ++---- source/funkin/play/notes/notekind/NoteKind.hx | 1 - .../funkin/play/notes/notestyle/NoteStyle.hx | 5 ++- source/funkin/play/song/SongSerializer.hx | 4 --- source/funkin/play/stage/Bopper.hx | 2 -- source/funkin/play/stage/Stage.hx | 7 +--- source/funkin/ui/AtlasText.hx | 2 +- source/funkin/ui/MusicBeatState.hx | 1 - source/funkin/ui/MusicBeatSubState.hx | 1 - source/funkin/ui/PixelatedIcon.hx | 1 - source/funkin/ui/charSelect/CharSelectGF.hx | 3 -- .../funkin/ui/charSelect/CharSelectPlayer.hx | 2 -- .../ui/charSelect/CharSelectSubState.hx | 5 --- .../ui/charSelect/CharacterUnlockState.hx | 2 -- source/funkin/ui/charSelect/IntroSubState.hx | 1 - source/funkin/ui/debug/DebugMenuSubState.hx | 1 - source/funkin/ui/debug/MemoryCounter.hx | 1 - source/funkin/ui/debug/WaveformTestState.hx | 1 - .../ui/debug/anim/DebugBoundingState.hx | 7 ---- .../ui/debug/charting/ChartEditorState.hx | 28 ---------------- .../commands/SetAudioOffsetCommand.hx | 6 ---- .../components/ChartEditorEventSprite.hx | 3 -- .../components/ChartEditorHoldNoteSprite.hx | 4 --- .../components/ChartEditorNoteSprite.hx | 2 -- .../components/ChartEditorPlaybarHead.hx | 1 - .../ChartEditorSelectionSquareSprite.hx | 1 - .../ChartEditorDefaultContextMenu.hx | 3 -- .../ChartEditorEventContextMenu.hx | 2 -- .../ChartEditorHoldNoteContextMenu.hx | 2 -- .../ChartEditorNoteContextMenu.hx | 2 -- .../ChartEditorSelectionContextMenu.hx | 2 -- .../charting/dialogs/ChartEditorBaseDialog.hx | 1 - .../charting/dialogs/ChartEditorBaseMenu.hx | 5 --- .../ChartEditorCharacterIconSelectorMenu.hx | 3 -- .../dialogs/ChartEditorUploadChartDialog.hx | 4 +-- .../dialogs/ChartEditorUploadVocalsDialog.hx | 2 -- .../dialogs/ChartEditorWelcomeDialog.hx | 5 --- .../handlers/ChartEditorDialogHandler.hx | 13 +------- .../ChartEditorImportExportHandler.hx | 1 - .../handlers/ChartEditorToolboxHandler.hx | 32 ------------------- .../toolboxes/ChartEditorBaseToolbox.hx | 3 -- .../toolboxes/ChartEditorDifficultyToolbox.hx | 16 ---------- .../toolboxes/ChartEditorEventDataToolbox.hx | 10 ------ .../toolboxes/ChartEditorFreeplayToolbox.hx | 6 ---- .../toolboxes/ChartEditorMetadataToolbox.hx | 4 --- .../toolboxes/ChartEditorOffsetsToolbox.hx | 6 ---- .../charting/util/ChartEditorDropdowns.hx | 1 - .../debug/dialogue/ConversationDebugState.hx | 10 ------ .../funkin/ui/debug/latency/LatencyState.hx | 9 ------ .../ui/debug/stage/StageBuilderState.hx | 1 - .../ui/debug/stage/StageOffsetSubState.hx | 7 ++-- .../ui/debug/stageeditor/StageEditorObject.hx | 1 - .../ui/debug/stageeditor/StageEditorState.hx | 7 +--- .../stageeditor/components/FindObjDialog.hx | 2 -- .../components/LoadFromUrlDialog.hx | 1 - .../stageeditor/components/NewObjDialog.hx | 6 ---- .../stageeditor/components/WelcomeDialog.hx | 3 -- .../stageeditor/handlers/AssetDataHandler.hx | 4 --- .../stageeditor/handlers/StageDataHandler.hx | 2 -- .../toolboxes/StageEditorCharacterToolbox.hx | 6 ---- .../toolboxes/StageEditorObjectToolbox.hx | 4 --- source/funkin/ui/freeplay/AlbumRoll.hx | 4 --- source/funkin/ui/freeplay/BGScrollingText.hx | 4 --- source/funkin/ui/freeplay/FreeplayDJ.hx | 5 --- source/funkin/ui/freeplay/FreeplayState.hx | 9 ------ source/funkin/ui/freeplay/FreeplayStyle.hx | 1 - source/funkin/ui/freeplay/LetterSort.hx | 5 --- source/funkin/ui/freeplay/SongMenuItem.hx | 7 ---- .../ui/freeplay/backcards/BackingCard.hx | 9 ------ .../ui/freeplay/backcards/BoyfriendCard.hx | 13 -------- .../ui/freeplay/backcards/NewCharacterCard.hx | 17 ---------- .../funkin/ui/freeplay/backcards/PicoCard.hx | 16 ---------- .../ui/haxeui/FlxGamepadActionInputSource.hx | 1 - source/funkin/ui/haxeui/HaxeUISubState.hx | 1 - .../ui/haxeui/components/CharacterPlayer.hx | 1 - source/funkin/ui/mainmenu/MainMenuState.hx | 12 ++----- source/funkin/ui/options/ControlsMenu.hx | 13 ++++---- source/funkin/ui/options/FunkinSoundTray.hx | 4 --- source/funkin/ui/options/ModMenu.hx | 2 +- source/funkin/ui/options/OptionsState.hx | 3 -- source/funkin/ui/options/PreferencesMenu.hx | 2 -- .../ui/options/items/EnumPreferenceItem.hx | 4 +-- .../ui/options/items/NumberPreferenceItem.hx | 2 +- source/funkin/ui/story/LevelProp.hx | 2 +- source/funkin/ui/story/LevelTitle.hx | 2 +- source/funkin/ui/title/TitleState.hx | 7 ---- source/funkin/ui/transition/LoadingState.hx | 1 - .../funkin/ui/transition/StickerSubState.hx | 8 ----- .../ui/transition/preload/FunkinPreloader.hx | 10 ------ .../ui/transition/preload/VFDOverlay.hx | 2 -- source/funkin/util/FlxGamepadUtil.hx | 1 - source/funkin/util/FlxTweenUtil.hx | 2 -- source/funkin/util/InputUtil.hx | 3 +- source/funkin/util/ReflectUtil.hx | 2 +- source/funkin/util/SerializerUtil.hx | 1 - source/funkin/util/VersionUtil.hx | 3 +- source/funkin/util/macro/ClassMacro.hx | 3 +- .../util/plugins/NewgroundsMedalPlugin.hx | 1 - .../funkin/util/plugins/ScreenshotPlugin.hx | 6 +--- 144 files changed, 58 insertions(+), 571 deletions(-) diff --git a/source/funkin/InitState.hx b/source/funkin/InitState.hx index e63719430..32ec56c70 100644 --- a/source/funkin/InitState.hx +++ b/source/funkin/InitState.hx @@ -35,7 +35,6 @@ import funkin.util.TimerUtil; import funkin.util.TrackerUtil; import funkin.util.WindowUtil; import openfl.display.BitmapData; -import funkin.api.newgrounds.Medals; #if FEATURE_DISCORD_RPC import funkin.api.discord.DiscordClient; #end diff --git a/source/funkin/PlayerSettings.hx b/source/funkin/PlayerSettings.hx index b4c871c29..45629eb80 100644 --- a/source/funkin/PlayerSettings.hx +++ b/source/funkin/PlayerSettings.hx @@ -2,11 +2,9 @@ package funkin; import funkin.save.Save; import funkin.input.Controls; -import flixel.FlxCamera; import funkin.input.PreciseInputManager; -import flixel.input.actions.FlxActionInput; import flixel.input.gamepad.FlxGamepad; -import flixel.util.FlxSignal; +import flixel.util.FlxSignal.FlxTypedSignal; /** * A core class which represents the current player(s) and their controls and other configuration. diff --git a/source/funkin/api/discord/DiscordClient.hx b/source/funkin/api/discord/DiscordClient.hx index 3be2d4c87..15171b76f 100644 --- a/source/funkin/api/discord/DiscordClient.hx +++ b/source/funkin/api/discord/DiscordClient.hx @@ -2,7 +2,7 @@ package funkin.api.discord; #if FEATURE_DISCORD_RPC import hxdiscord_rpc.Discord; -import hxdiscord_rpc.Types; +import hxdiscord_rpc.Types.DiscordEventHandlers; import sys.thread.Thread; class DiscordClient diff --git a/source/funkin/api/newgrounds/Leaderboards.hx b/source/funkin/api/newgrounds/Leaderboards.hx index b6b6751d9..4af7e1b49 100644 --- a/source/funkin/api/newgrounds/Leaderboards.hx +++ b/source/funkin/api/newgrounds/Leaderboards.hx @@ -1,11 +1,9 @@ package funkin.api.newgrounds; #if FEATURE_NEWGROUNDS -import io.newgrounds.Call; +import io.newgrounds.Call.CallError; import io.newgrounds.objects.ScoreBoard as LeaderboardData; import io.newgrounds.objects.events.Outcome; -import io.newgrounds.objects.events.Response; -import io.newgrounds.objects.events.Result; class Leaderboards { diff --git a/source/funkin/api/newgrounds/NewgroundsClient.hx b/source/funkin/api/newgrounds/NewgroundsClient.hx index 9633f0e02..d74221b3c 100644 --- a/source/funkin/api/newgrounds/NewgroundsClient.hx +++ b/source/funkin/api/newgrounds/NewgroundsClient.hx @@ -1,7 +1,7 @@ package funkin.api.newgrounds; import funkin.save.Save; -import funkin.api.newgrounds.Medals; +import funkin.api.newgrounds.Medals.Medal; #if FEATURE_NEWGROUNDS import io.newgrounds.Call.CallError; import io.newgrounds.NG; diff --git a/source/funkin/audio/FlxStreamSound.hx b/source/funkin/audio/FlxStreamSound.hx index a572ad436..62d3f6a1d 100644 --- a/source/funkin/audio/FlxStreamSound.hx +++ b/source/funkin/audio/FlxStreamSound.hx @@ -1,9 +1,6 @@ package funkin.audio; import flash.media.Sound; -#if flash11 -import flash.utils.ByteArray; -#end import flixel.sound.FlxSound; import flixel.system.FlxAssets.FlxSoundAsset; import openfl.Assets; diff --git a/source/funkin/audio/FunkinSound.hx b/source/funkin/audio/FunkinSound.hx index 92da2b50a..5628f1547 100644 --- a/source/funkin/audio/FunkinSound.hx +++ b/source/funkin/audio/FunkinSound.hx @@ -13,8 +13,6 @@ import funkin.data.song.SongRegistry; import funkin.util.tools.ICloneable; import funkin.util.flixel.sound.FlxPartialSound; import funkin.Paths.PathsFunction; -import openfl.Assets; -import lime.app.Future; import lime.app.Promise; import openfl.media.SoundMixer; diff --git a/source/funkin/audio/SoundGroup.hx b/source/funkin/audio/SoundGroup.hx index 5d53fedd6..e58d266dd 100644 --- a/source/funkin/audio/SoundGroup.hx +++ b/source/funkin/audio/SoundGroup.hx @@ -1,7 +1,6 @@ package funkin.audio; import flixel.group.FlxGroup.FlxTypedGroup; -import funkin.audio.FunkinSound; import flixel.tweens.FlxTween; /** diff --git a/source/funkin/audio/visualize/ABotVis.hx b/source/funkin/audio/visualize/ABotVis.hx index f496f22c5..731473d35 100644 --- a/source/funkin/audio/visualize/ABotVis.hx +++ b/source/funkin/audio/visualize/ABotVis.hx @@ -6,7 +6,6 @@ import flixel.graphics.frames.FlxAtlasFrames; import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; import flixel.sound.FlxSound; import funkin.vis.dsp.SpectralAnalyzer; -import funkin.vis.audioclip.frontends.LimeAudioClip; using Lambda; diff --git a/source/funkin/audio/visualize/PolygonSpectogram.hx b/source/funkin/audio/visualize/PolygonSpectogram.hx index 948027a8d..cf255052c 100644 --- a/source/funkin/audio/visualize/PolygonSpectogram.hx +++ b/source/funkin/audio/visualize/PolygonSpectogram.hx @@ -4,7 +4,7 @@ import flixel.math.FlxMath; import flixel.math.FlxPoint; import flixel.sound.FlxSound; import flixel.util.FlxColor; -import funkin.audio.visualize.VisShit; +import funkin.audio.visualize.VisShit.CurAudioInfo; import funkin.graphics.rendering.MeshRender; import lime.utils.Int16Array; diff --git a/source/funkin/data/dialogue/speaker/SpeakerRegistry.hx b/source/funkin/data/dialogue/speaker/SpeakerRegistry.hx index 89144f843..1692ee0a1 100644 --- a/source/funkin/data/dialogue/speaker/SpeakerRegistry.hx +++ b/source/funkin/data/dialogue/speaker/SpeakerRegistry.hx @@ -1,7 +1,6 @@ package funkin.data.dialogue.speaker; import funkin.play.cutscene.dialogue.Speaker; -import funkin.data.dialogue.speaker.SpeakerData; import funkin.play.cutscene.dialogue.ScriptedSpeaker; class SpeakerRegistry extends BaseRegistry diff --git a/source/funkin/data/event/SongEventRegistry.hx b/source/funkin/data/event/SongEventRegistry.hx index 5ee2d39fa..772465cf2 100644 --- a/source/funkin/data/event/SongEventRegistry.hx +++ b/source/funkin/data/event/SongEventRegistry.hx @@ -1,7 +1,6 @@ package funkin.data.event; import funkin.play.event.SongEvent; -import funkin.data.event.SongEventSchema; import funkin.data.song.SongData.SongEventData; import funkin.util.macro.ClassMacro; import funkin.play.event.ScriptedSongEvent; diff --git a/source/funkin/data/event/SongEventSchema.hx b/source/funkin/data/event/SongEventSchema.hx index 9591e601e..72dac337f 100644 --- a/source/funkin/data/event/SongEventSchema.hx +++ b/source/funkin/data/event/SongEventSchema.hx @@ -1,11 +1,5 @@ package funkin.data.event; -import funkin.play.event.SongEvent; -import funkin.data.event.SongEventSchema; -import funkin.data.song.SongData.SongEventData; -import funkin.util.macro.ClassMacro; -import funkin.play.event.ScriptedSongEvent; - @:forward(name, title, type, keys, min, max, step, units, defaultValue, iterator) abstract SongEventSchema(SongEventSchemaRaw) { diff --git a/source/funkin/data/stage/StageRegistry.hx b/source/funkin/data/stage/StageRegistry.hx index 0c546d0ab..36cb5c272 100644 --- a/source/funkin/data/stage/StageRegistry.hx +++ b/source/funkin/data/stage/StageRegistry.hx @@ -1,6 +1,5 @@ package funkin.data.stage; -import funkin.data.stage.StageData; import funkin.play.stage.Stage; import funkin.play.stage.ScriptedStage; @@ -93,8 +92,22 @@ class StageRegistry extends BaseRegistry public function listBaseGameStageIds():Array { return [ - "mainStage", "mainStageErect", "spookyMansion", "phillyTrain", "phillyTrainErect", "limoRide", "limoRideErect", "mallXmas", "mallXmasErect", "mallEvil", - "school", "schoolEvil", "tankmanBattlefield", "phillyStreets", "phillyStreetsErect", "phillyBlazin", + "mainStage", + "mainStageErect", + "spookyMansion", + "phillyTrain", + "phillyTrainErect", + "limoRide", + "limoRideErect", + "mallXmas", + "mallXmasErect", + "mallEvil", + "school", + "schoolEvil", + "tankmanBattlefield", + "phillyStreets", + "phillyStreetsErect", + "phillyBlazin", ]; } diff --git a/source/funkin/data/story/level/LevelRegistry.hx b/source/funkin/data/story/level/LevelRegistry.hx index 7ddccce08..969baeb83 100644 --- a/source/funkin/data/story/level/LevelRegistry.hx +++ b/source/funkin/data/story/level/LevelRegistry.hx @@ -2,7 +2,6 @@ package funkin.data.story.level; import funkin.util.SortUtil; import funkin.ui.story.Level; -import funkin.data.story.level.LevelData; import funkin.ui.story.ScriptedLevel; class LevelRegistry extends BaseRegistry diff --git a/source/funkin/effects/FunkTrail.hx b/source/funkin/effects/FunkTrail.hx index 9633f830f..3fd4c04c2 100644 --- a/source/funkin/effects/FunkTrail.hx +++ b/source/funkin/effects/FunkTrail.hx @@ -3,7 +3,7 @@ package funkin.effects; import flixel.addons.effects.FlxTrail; import funkin.play.stage.Bopper; import flixel.FlxSprite; -import flixel.system.FlxAssets; +import flixel.system.FlxAssets.FlxGraphicAsset; /** * An offshoot of FlxTrail, but accomodates the way Funkin diff --git a/source/funkin/graphics/FlxFilteredSprite.hx b/source/funkin/graphics/FlxFilteredSprite.hx index ea0376c3d..1323f32c6 100644 --- a/source/funkin/graphics/FlxFilteredSprite.hx +++ b/source/funkin/graphics/FlxFilteredSprite.hx @@ -7,23 +7,17 @@ import flixel.FlxSprite; import flixel.graphics.FlxGraphic; import flixel.graphics.frames.FlxFrame; import flixel.math.FlxMatrix; -import flixel.math.FlxPoint; import flixel.math.FlxRect; -import flixel.util.FlxColor; import lime.graphics.cairo.Cairo; import openfl.display.BitmapData; import openfl.display.BlendMode; import openfl.display.DisplayObjectRenderer; import openfl.display.Graphics; import openfl.display.OpenGLRenderer; -import openfl.display._internal.Context3DGraphics; import openfl.display3D.Context3D; -import openfl.display3D.Context3DClearMask; import openfl.filters.BitmapFilter; -import openfl.filters.BlurFilter; import openfl.geom.ColorTransform; import openfl.geom.Matrix; -import openfl.geom.Point; import openfl.geom.Rectangle; #if (js && html5) import lime._internal.graphics.ImageCanvasUtil; diff --git a/source/funkin/graphics/FunkinSprite.hx b/source/funkin/graphics/FunkinSprite.hx index 647957a0f..3425bbd57 100644 --- a/source/funkin/graphics/FunkinSprite.hx +++ b/source/funkin/graphics/FunkinSprite.hx @@ -9,7 +9,7 @@ import funkin.graphics.framebuffer.FixedBitmapData; import openfl.display.BitmapData; import flixel.math.FlxRect; import flixel.math.FlxPoint; -import flixel.graphics.frames.FlxFrame; +import flixel.graphics.frames.FlxFrame.FlxFrameAngle; import flixel.FlxCamera; /** diff --git a/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx b/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx index 5b95139df..7ebb785dc 100644 --- a/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx +++ b/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx @@ -3,13 +3,10 @@ package funkin.graphics.adobeanimate; import flixel.util.FlxSignal.FlxTypedSignal; import flxanimate.FlxAnimate; import flxanimate.FlxAnimate.Settings; -import flxanimate.frames.FlxAnimateFrames; import flixel.graphics.frames.FlxFrame; import flixel.system.FlxAssets.FlxGraphicAsset; -import openfl.display.BitmapData; import flixel.math.FlxPoint; import flxanimate.animate.FlxKeyFrame; -import flixel.graphics.FlxGraphic; /** * A sprite which provides convenience functions for rendering a texture atlas with animations. diff --git a/source/funkin/graphics/shaders/BlueFade.hx b/source/funkin/graphics/shaders/BlueFade.hx index f57bcfbf1..086750923 100644 --- a/source/funkin/graphics/shaders/BlueFade.hx +++ b/source/funkin/graphics/shaders/BlueFade.hx @@ -1,7 +1,6 @@ package funkin.graphics.shaders; import flixel.system.FlxAssets.FlxShader; -import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; class BlueFade extends FlxShader diff --git a/source/funkin/graphics/shaders/RuntimeRainShader.hx b/source/funkin/graphics/shaders/RuntimeRainShader.hx index 5d8df3f2c..aab6807f6 100644 --- a/source/funkin/graphics/shaders/RuntimeRainShader.hx +++ b/source/funkin/graphics/shaders/RuntimeRainShader.hx @@ -1,6 +1,5 @@ package funkin.graphics.shaders; -import flixel.system.FlxAssets.FlxShader; import openfl.display.BitmapData; import openfl.display.ShaderParameter; import openfl.display.ShaderParameterType; diff --git a/source/funkin/graphics/shaders/TextureSwap.hx b/source/funkin/graphics/shaders/TextureSwap.hx index ee2ca05d5..e5f5ea8d1 100644 --- a/source/funkin/graphics/shaders/TextureSwap.hx +++ b/source/funkin/graphics/shaders/TextureSwap.hx @@ -1,7 +1,6 @@ package funkin.graphics.shaders; import flixel.system.FlxAssets.FlxShader; -import flixel.util.FlxColor; import openfl.display.BitmapData; class TextureSwap extends FlxShader diff --git a/source/funkin/graphics/shaders/TitleOutline.hx b/source/funkin/graphics/shaders/TitleOutline.hx index db60fc3ae..ad688a503 100644 --- a/source/funkin/graphics/shaders/TitleOutline.hx +++ b/source/funkin/graphics/shaders/TitleOutline.hx @@ -1,6 +1,5 @@ package funkin.graphics.shaders; -import flixel.math.FlxPoint; import flixel.system.FlxAssets.FlxShader; class TitleOutline extends FlxShader diff --git a/source/funkin/graphics/video/FlxVideo.hx b/source/funkin/graphics/video/FlxVideo.hx index 15c5daea3..7efd72ca1 100644 --- a/source/funkin/graphics/video/FlxVideo.hx +++ b/source/funkin/graphics/video/FlxVideo.hx @@ -1,9 +1,7 @@ package funkin.graphics.video; import flixel.util.FlxColor; -import flixel.util.FlxSignal.FlxTypedSignal; import funkin.audio.FunkinSound; -import openfl.display3D.textures.TextureBase; import openfl.events.NetStatusEvent; import openfl.media.SoundTransform; import openfl.media.Video; diff --git a/source/funkin/input/Controls.hx b/source/funkin/input/Controls.hx index 207bd7b46..0ffee7c69 100644 --- a/source/funkin/input/Controls.hx +++ b/source/funkin/input/Controls.hx @@ -2,23 +2,17 @@ package funkin.input; import flixel.input.gamepad.FlxGamepad; import flixel.util.FlxDirectionFlags; -import flixel.FlxObject; -import flixel.input.FlxInput; +import flixel.input.FlxInput.FlxInputState; import flixel.input.actions.FlxAction; import flixel.input.actions.FlxActionInput; -import flixel.input.actions.FlxActionInputAnalog.FlxActionInputAnalogClickAndDragMouseMotion; import flixel.input.actions.FlxActionInputDigital; import flixel.input.actions.FlxActionManager; import flixel.input.actions.FlxActionSet; import flixel.input.android.FlxAndroidKey; -import flixel.input.gamepad.FlxGamepadButton; import flixel.input.gamepad.FlxGamepadInputID; import flixel.input.keyboard.FlxKey; -import flixel.input.mouse.FlxMouseButton.FlxMouseButtonID; import flixel.math.FlxAngle; import flixel.math.FlxPoint; -import flixel.util.FlxColor; -import flixel.util.FlxTimer; import lime.ui.Haptic; /** diff --git a/source/funkin/modding/events/ScriptEvent.hx b/source/funkin/modding/events/ScriptEvent.hx index 7ece8d2dc..43f8fc28b 100644 --- a/source/funkin/modding/events/ScriptEvent.hx +++ b/source/funkin/modding/events/ScriptEvent.hx @@ -8,7 +8,6 @@ import funkin.play.notes.NoteSprite; import funkin.play.cutscene.dialogue.Conversation; import funkin.play.Countdown.CountdownStep; import funkin.play.notes.NoteDirection; -import openfl.events.EventType; import openfl.events.KeyboardEvent; /** diff --git a/source/funkin/play/Countdown.hx b/source/funkin/play/Countdown.hx index 94a7548b9..9a9a14f10 100644 --- a/source/funkin/play/Countdown.hx +++ b/source/funkin/play/Countdown.hx @@ -2,10 +2,6 @@ package funkin.play; import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; -import flixel.FlxSprite; -import funkin.graphics.FunkinSprite; -import funkin.modding.events.ScriptEventDispatcher; -import funkin.modding.module.ModuleHandler; import funkin.modding.events.ScriptEvent; import funkin.modding.events.ScriptEvent.CountdownScriptEvent; import flixel.util.FlxTimer; diff --git a/source/funkin/play/GitarooPause.hx b/source/funkin/play/GitarooPause.hx index 6abe78cd8..5c5c2aea1 100644 --- a/source/funkin/play/GitarooPause.hx +++ b/source/funkin/play/GitarooPause.hx @@ -1,8 +1,7 @@ package funkin.play; import flixel.FlxSprite; -import flixel.graphics.frames.FlxAtlasFrames; -import funkin.play.PlayState; +import funkin.play.PlayState.PlayStateParams; import funkin.graphics.FunkinSprite; import funkin.ui.MusicBeatState; import flixel.addons.transition.FlxTransitionableState; diff --git a/source/funkin/play/PauseSubState.hx b/source/funkin/play/PauseSubState.hx index 586dce231..227fe48f6 100644 --- a/source/funkin/play/PauseSubState.hx +++ b/source/funkin/play/PauseSubState.hx @@ -5,26 +5,19 @@ import funkin.ui.story.StoryMenuState; import funkin.data.freeplay.player.PlayerRegistry; import flixel.addons.transition.FlxTransitionableState; import flixel.FlxG; -import flixel.FlxSprite; -import flixel.group.FlxGroup.FlxTypedGroup; -import flixel.group.FlxSpriteGroup; +import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; import flixel.math.FlxMath; -import flixel.sound.FlxSound; import flixel.text.FlxText; import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; import flixel.util.FlxColor; -import flixel.util.FlxTimer; import funkin.audio.FunkinSound; import funkin.data.song.SongRegistry; import funkin.ui.freeplay.FreeplayState; import funkin.graphics.FunkinSprite; import funkin.play.cutscene.VideoCutscene; -import funkin.play.PlayState; import funkin.ui.AtlasText; -import funkin.ui.debug.latency.LatencyState; import funkin.ui.MusicBeatSubState; -import funkin.ui.transition.StickerSubState; /** * Parameters for initializing the PauseSubState. diff --git a/source/funkin/play/ResultState.hx b/source/funkin/play/ResultState.hx index 83c676e65..c485a6d34 100644 --- a/source/funkin/play/ResultState.hx +++ b/source/funkin/play/ResultState.hx @@ -1,10 +1,8 @@ package funkin.play; -import funkin.util.MathUtil; import funkin.ui.story.StoryMenuState; import funkin.graphics.adobeanimate.FlxAtlasSprite; import flixel.FlxSprite; -import flixel.FlxState; import flixel.FlxSubState; import funkin.graphics.FunkinSprite; import flixel.effects.FlxFlicker; @@ -14,10 +12,8 @@ import flixel.math.FlxPoint; import funkin.ui.MusicBeatSubState; import flixel.math.FlxRect; import flixel.text.FlxBitmapText; -import funkin.ui.freeplay.FreeplayScore; -import flixel.text.FlxText; import funkin.data.freeplay.player.PlayerRegistry; -import funkin.data.freeplay.player.PlayerData; +import funkin.data.freeplay.player.PlayerData.PlayerResultsAnimationData; import funkin.ui.freeplay.charselect.PlayableCharacter; import flixel.util.FlxColor; import flixel.tweens.FlxEase; @@ -28,7 +24,6 @@ import flixel.addons.display.FlxBackdrop; import funkin.audio.FunkinSound; import flixel.util.FlxGradient; import flixel.util.FlxTimer; -import funkin.save.Save; import funkin.play.scoring.Scoring; import funkin.save.Save.SaveScoreData; import funkin.graphics.shaders.LeftMaskShader; diff --git a/source/funkin/play/components/ClearPercentCounter.hx b/source/funkin/play/components/ClearPercentCounter.hx index e3d3795d9..67c633a99 100644 --- a/source/funkin/play/components/ClearPercentCounter.hx +++ b/source/funkin/play/components/ClearPercentCounter.hx @@ -3,13 +3,7 @@ package funkin.play.components; import funkin.graphics.FunkinSprite; import funkin.graphics.shaders.PureColor; import flixel.FlxSprite; -import flixel.group.FlxGroup.FlxTypedGroup; import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; -import flixel.math.FlxMath; -import flixel.tweens.FlxEase; -import flixel.tweens.FlxTween; -import flixel.text.FlxText.FlxTextAlign; -import funkin.util.MathUtil; import flixel.util.FlxColor; /** diff --git a/source/funkin/play/components/PopUpStuff.hx b/source/funkin/play/components/PopUpStuff.hx index 1ab7f1210..07318f684 100644 --- a/source/funkin/play/components/PopUpStuff.hx +++ b/source/funkin/play/components/PopUpStuff.hx @@ -1,14 +1,9 @@ package funkin.play.components; -import flixel.FlxSprite; import flixel.group.FlxGroup.FlxTypedGroup; import flixel.tweens.FlxTween; -import flixel.util.FlxDirection; import funkin.graphics.FunkinSprite; -import funkin.play.PlayState; -import funkin.util.TimerUtil; import funkin.util.EaseUtil; -import funkin.data.notestyle.NoteStyleRegistry; import funkin.play.notes.notestyle.NoteStyle; @:nullSafety diff --git a/source/funkin/play/components/TallyCounter.hx b/source/funkin/play/components/TallyCounter.hx index 35a8f3f51..777ff5fe8 100644 --- a/source/funkin/play/components/TallyCounter.hx +++ b/source/funkin/play/components/TallyCounter.hx @@ -1,11 +1,7 @@ package funkin.play.components; import flixel.FlxSprite; -import flixel.group.FlxGroup.FlxTypedGroup; import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; -import flixel.math.FlxMath; -import flixel.tweens.FlxEase; -import flixel.tweens.FlxTween; import flixel.text.FlxText.FlxTextAlign; import funkin.util.MathUtil; diff --git a/source/funkin/play/cutscene/VideoCutscene.hx b/source/funkin/play/cutscene/VideoCutscene.hx index f785b5d8e..ab22119d3 100644 --- a/source/funkin/play/cutscene/VideoCutscene.hx +++ b/source/funkin/play/cutscene/VideoCutscene.hx @@ -6,7 +6,6 @@ import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; import flixel.util.FlxColor; import flixel.util.FlxSignal; -import flixel.util.FlxTimer; #if html5 import funkin.graphics.video.FlxVideo; #end diff --git a/source/funkin/play/cutscene/dialogue/Conversation.hx b/source/funkin/play/cutscene/dialogue/Conversation.hx index 0910a399b..fd7504725 100644 --- a/source/funkin/play/cutscene/dialogue/Conversation.hx +++ b/source/funkin/play/cutscene/dialogue/Conversation.hx @@ -1,7 +1,5 @@ package funkin.play.cutscene.dialogue; -import flixel.addons.display.FlxPieDial; -import flixel.FlxSprite; import flixel.group.FlxSpriteGroup; import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; @@ -11,9 +9,7 @@ import funkin.audio.FunkinSound; import funkin.data.dialogue.conversation.ConversationData; import funkin.data.dialogue.conversation.ConversationData.DialogueEntryData; import funkin.data.dialogue.conversation.ConversationRegistry; -import funkin.data.dialogue.dialoguebox.DialogueBoxData; import funkin.data.dialogue.dialoguebox.DialogueBoxRegistry; -import funkin.data.dialogue.speaker.SpeakerData; import funkin.data.dialogue.speaker.SpeakerRegistry; import funkin.data.IRegistryEntry; import funkin.graphics.FunkinSprite; @@ -21,7 +17,6 @@ import funkin.modding.events.ScriptEvent; import funkin.modding.events.ScriptEventDispatcher; import funkin.modding.IScriptedClass.IDialogueScriptedClass; import funkin.modding.IScriptedClass.IEventHandler; -import funkin.play.cutscene.dialogue.DialogueBox; import funkin.util.SortUtil; import funkin.util.EaseUtil; diff --git a/source/funkin/play/event/FocusCameraSongEvent.hx b/source/funkin/play/event/FocusCameraSongEvent.hx index ecb41de98..3198e0792 100644 --- a/source/funkin/play/event/FocusCameraSongEvent.hx +++ b/source/funkin/play/event/FocusCameraSongEvent.hx @@ -2,10 +2,8 @@ package funkin.play.event; import flixel.tweens.FlxEase; // Data from the chart -import funkin.data.song.SongData; import funkin.data.song.SongData.SongEventData; // Data from the event schema -import funkin.play.event.SongEvent; import funkin.data.event.SongEventSchema; import funkin.data.event.SongEventSchema.SongEventFieldType; diff --git a/source/funkin/play/event/PlayAnimationSongEvent.hx b/source/funkin/play/event/PlayAnimationSongEvent.hx index 57240d399..cfcaf3c3f 100644 --- a/source/funkin/play/event/PlayAnimationSongEvent.hx +++ b/source/funkin/play/event/PlayAnimationSongEvent.hx @@ -3,10 +3,8 @@ package funkin.play.event; import flixel.FlxSprite; import funkin.play.character.BaseCharacter; // Data from the chart -import funkin.data.song.SongData; import funkin.data.song.SongData.SongEventData; // Data from the event schema -import funkin.play.event.SongEvent; import funkin.data.event.SongEventSchema; import funkin.data.event.SongEventSchema.SongEventFieldType; diff --git a/source/funkin/play/event/ScriptedSongEvent.hx b/source/funkin/play/event/ScriptedSongEvent.hx index d85a1c838..493e3534e 100644 --- a/source/funkin/play/event/ScriptedSongEvent.hx +++ b/source/funkin/play/event/ScriptedSongEvent.hx @@ -1,6 +1,5 @@ package funkin.play.event; -import funkin.play.song.Song; import polymod.hscript.HScriptedClass; /** diff --git a/source/funkin/play/event/ScrollSpeedEvent.hx b/source/funkin/play/event/ScrollSpeedEvent.hx index c752d2f6d..bc0e99ba5 100644 --- a/source/funkin/play/event/ScrollSpeedEvent.hx +++ b/source/funkin/play/event/ScrollSpeedEvent.hx @@ -1,13 +1,9 @@ package funkin.play.event; -import flixel.tweens.FlxTween; -import flixel.FlxCamera; import flixel.tweens.FlxEase; // Data from the chart -import funkin.data.song.SongData; import funkin.data.song.SongData.SongEventData; // Data from the event schema -import funkin.play.event.SongEvent; import funkin.data.event.SongEventSchema; import funkin.data.event.SongEventSchema.SongEventFieldType; diff --git a/source/funkin/play/event/SetCameraBopSongEvent.hx b/source/funkin/play/event/SetCameraBopSongEvent.hx index f3efc04e3..5f5694ce3 100644 --- a/source/funkin/play/event/SetCameraBopSongEvent.hx +++ b/source/funkin/play/event/SetCameraBopSongEvent.hx @@ -1,13 +1,8 @@ package funkin.play.event; -import flixel.tweens.FlxTween; -import flixel.FlxCamera; -import flixel.tweens.FlxEase; // Data from the chart -import funkin.data.song.SongData; import funkin.data.song.SongData.SongEventData; // Data from the event schema -import funkin.play.event.SongEvent; import funkin.data.event.SongEventSchema; import funkin.data.event.SongEventSchema.SongEventFieldType; diff --git a/source/funkin/play/event/ZoomCameraSongEvent.hx b/source/funkin/play/event/ZoomCameraSongEvent.hx index ee2eea8ad..0c34028c8 100644 --- a/source/funkin/play/event/ZoomCameraSongEvent.hx +++ b/source/funkin/play/event/ZoomCameraSongEvent.hx @@ -1,13 +1,9 @@ package funkin.play.event; -import flixel.tweens.FlxTween; -import flixel.FlxCamera; import flixel.tweens.FlxEase; // Data from the chart -import funkin.data.song.SongData; import funkin.data.song.SongData.SongEventData; // Data from the event schema -import funkin.play.event.SongEvent; import funkin.data.event.SongEventSchema; import funkin.data.event.SongEventSchema.SongEventFieldType; diff --git a/source/funkin/play/notes/NoteHoldCover.hx b/source/funkin/play/notes/NoteHoldCover.hx index 7bed8a08c..0d7842ad9 100644 --- a/source/funkin/play/notes/NoteHoldCover.hx +++ b/source/funkin/play/notes/NoteHoldCover.hx @@ -1,11 +1,8 @@ package funkin.play.notes; import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; -import funkin.play.notes.NoteDirection; import flixel.graphics.frames.FlxFramesCollection; import funkin.util.assets.FlxAnimationUtil; -import flixel.FlxG; -import flixel.graphics.frames.FlxAtlasFrames; import flixel.FlxSprite; class NoteHoldCover extends FlxTypedSpriteGroup diff --git a/source/funkin/play/notes/NoteSplash.hx b/source/funkin/play/notes/NoteSplash.hx index 2411e5615..ddcfc4162 100644 --- a/source/funkin/play/notes/NoteSplash.hx +++ b/source/funkin/play/notes/NoteSplash.hx @@ -1,9 +1,7 @@ package funkin.play.notes; -import funkin.play.notes.NoteDirection; import flixel.graphics.frames.FlxFramesCollection; import flixel.FlxG; -import flixel.graphics.frames.FlxAtlasFrames; import flixel.FlxSprite; class NoteSplash extends FlxSprite diff --git a/source/funkin/play/notes/NoteSprite.hx b/source/funkin/play/notes/NoteSprite.hx index e8cacaa4d..4fa0a4052 100644 --- a/source/funkin/play/notes/NoteSprite.hx +++ b/source/funkin/play/notes/NoteSprite.hx @@ -3,8 +3,6 @@ package funkin.play.notes; import funkin.data.song.SongData.SongNoteData; import funkin.data.song.SongData.NoteParamData; import funkin.play.notes.notestyle.NoteStyle; -import flixel.graphics.frames.FlxAtlasFrames; -import flixel.FlxSprite; import funkin.graphics.FunkinSprite; import funkin.graphics.shaders.HSVShader; diff --git a/source/funkin/play/notes/Strumline.hx b/source/funkin/play/notes/Strumline.hx index add5e9407..bebf08e9a 100644 --- a/source/funkin/play/notes/Strumline.hx +++ b/source/funkin/play/notes/Strumline.hx @@ -9,14 +9,8 @@ import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; import flixel.util.FlxSort; import funkin.graphics.FunkinSprite; -import funkin.play.notes.NoteHoldCover; -import funkin.play.notes.NoteSplash; -import funkin.play.notes.NoteSprite; -import funkin.play.notes.SustainTrail; import funkin.data.song.SongData.SongNoteData; -import funkin.ui.options.PreferencesMenu; import funkin.util.SortUtil; -import funkin.modding.events.ScriptEvent; import funkin.play.notes.notekind.NoteKindManager; /** diff --git a/source/funkin/play/notes/SustainTrail.hx b/source/funkin/play/notes/SustainTrail.hx index 52241ea9c..937bc0ceb 100644 --- a/source/funkin/play/notes/SustainTrail.hx +++ b/source/funkin/play/notes/SustainTrail.hx @@ -1,14 +1,11 @@ package funkin.play.notes; import funkin.play.notes.notestyle.NoteStyle; -import funkin.play.notes.NoteDirection; import funkin.data.song.SongData.SongNoteData; -import flixel.util.FlxDirectionFlags; import flixel.FlxSprite; import flixel.graphics.FlxGraphic; -import flixel.graphics.tile.FlxDrawTrianglesItem; +import flixel.graphics.tile.FlxDrawTrianglesItem.DrawData; import flixel.math.FlxMath; -import funkin.ui.options.PreferencesMenu; /** * This is based heavily on the `FlxStrip` class. It uses `drawTriangles()` to clip a sustain note @@ -90,7 +87,7 @@ class SustainTrail extends FlxSprite * Whether the note will recieve custom vertex data */ public var customVertexData:Bool = false; - + public var isPixel:Bool; public var noteStyleOffsets:Array; @@ -176,7 +173,7 @@ class SustainTrail extends FlxSprite this.uvtData = new DrawData(uvtData.length, false, uvtData); } } - + /** * Creates hold note graphic and applies correct zooming * @param noteStyle The note style diff --git a/source/funkin/play/notes/notekind/NoteKind.hx b/source/funkin/play/notes/notekind/NoteKind.hx index c1c6e815a..6f0ecb7ad 100644 --- a/source/funkin/play/notes/notekind/NoteKind.hx +++ b/source/funkin/play/notes/notekind/NoteKind.hx @@ -2,7 +2,6 @@ package funkin.play.notes.notekind; import funkin.modding.IScriptedClass.INoteScriptedClass; import funkin.modding.events.ScriptEvent; -import flixel.math.FlxMath; /** * Class for note scripts diff --git a/source/funkin/play/notes/notestyle/NoteStyle.hx b/source/funkin/play/notes/notestyle/NoteStyle.hx index dd0885751..78523343c 100644 --- a/source/funkin/play/notes/notestyle/NoteStyle.hx +++ b/source/funkin/play/notes/notestyle/NoteStyle.hx @@ -2,13 +2,11 @@ package funkin.play.notes.notestyle; import funkin.play.Countdown; import flixel.graphics.frames.FlxAtlasFrames; -import flixel.graphics.frames.FlxFramesCollection; import funkin.data.animation.AnimationData; import funkin.data.IRegistryEntry; import funkin.graphics.FunkinSprite; import funkin.data.notestyle.NoteStyleData; import funkin.data.notestyle.NoteStyleRegistry; -import funkin.data.notestyle.NoteStyleRegistry; import funkin.util.assets.FlxAnimationUtil; using funkin.data.animation.AnimationData.AnimationDataUtil; @@ -36,7 +34,8 @@ class NoteStyle implements IRegistryEntry */ var fallback(get, never):Null; - function get_fallback():Null { + function get_fallback():Null + { if (_data == null || _data.fallback == null) return null; return NoteStyleRegistry.instance.fetchEntry(_data.fallback); } diff --git a/source/funkin/play/song/SongSerializer.hx b/source/funkin/play/song/SongSerializer.hx index 10296e5b4..3c6c18ab2 100644 --- a/source/funkin/play/song/SongSerializer.hx +++ b/source/funkin/play/song/SongSerializer.hx @@ -2,11 +2,7 @@ package funkin.play.song; import funkin.data.song.SongData.SongChartData; import funkin.data.song.SongData.SongMetadata; -import funkin.util.SerializerUtil; import funkin.util.FileUtil; -import lime.utils.Bytes; -import openfl.events.Event; -import openfl.events.IOErrorEvent; import openfl.net.FileReference; /** diff --git a/source/funkin/play/stage/Bopper.hx b/source/funkin/play/stage/Bopper.hx index 29e7b5b64..5690a8fb0 100644 --- a/source/funkin/play/stage/Bopper.hx +++ b/source/funkin/play/stage/Bopper.hx @@ -1,12 +1,10 @@ package funkin.play.stage; -import flixel.FlxSprite; import flixel.FlxCamera; import flixel.math.FlxPoint; import flixel.util.FlxTimer; import funkin.modding.IScriptedClass.IPlayStateScriptedClass; import funkin.modding.events.ScriptEvent; -import funkin.play.stage.StageProp; typedef AnimationFrameCallback = String->Int->Int->Void; typedef AnimationFinishedCallback = String->Void; diff --git a/source/funkin/play/stage/Stage.hx b/source/funkin/play/stage/Stage.hx index 155447867..85dfa6360 100644 --- a/source/funkin/play/stage/Stage.hx +++ b/source/funkin/play/stage/Stage.hx @@ -3,26 +3,21 @@ package funkin.play.stage; import openfl.display.BlendMode; import funkin.graphics.framebuffer.FrameBufferManager; import flixel.util.FlxColor; -import funkin.graphics.framebuffer.SpriteCopy; import funkin.graphics.FunkinCamera; -import flixel.FlxCamera; import flixel.FlxSprite; import flixel.group.FlxSpriteGroup; import flixel.math.FlxPoint; import flixel.system.FlxAssets.FlxShader; import flixel.util.FlxSort; import openfl.display.BitmapData; -import flixel.util.FlxColor; -import funkin.modding.IScriptedClass; +import funkin.modding.IScriptedClass.IPlayStateScriptedClass; import funkin.modding.events.ScriptEvent; -import funkin.modding.events.ScriptEventType; import funkin.modding.events.ScriptEventDispatcher; import funkin.play.character.BaseCharacter; import funkin.data.IRegistryEntry; import funkin.data.stage.StageData; import funkin.data.stage.StageData.StageDataCharacter; import funkin.data.stage.StageRegistry; -import funkin.play.stage.StageProp; import funkin.util.SortUtil; import funkin.util.assets.FlxAnimationUtil; diff --git a/source/funkin/ui/AtlasText.hx b/source/funkin/ui/AtlasText.hx index ef74abc1e..fdb8e5de7 100644 --- a/source/funkin/ui/AtlasText.hx +++ b/source/funkin/ui/AtlasText.hx @@ -2,7 +2,7 @@ package funkin.ui; import flixel.FlxSprite; import flixel.graphics.frames.FlxAtlasFrames; -import flixel.group.FlxSpriteGroup; +import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; import flixel.util.FlxStringUtil; /** diff --git a/source/funkin/ui/MusicBeatState.hx b/source/funkin/ui/MusicBeatState.hx index 31e3bec50..99591345f 100644 --- a/source/funkin/ui/MusicBeatState.hx +++ b/source/funkin/ui/MusicBeatState.hx @@ -2,7 +2,6 @@ package funkin.ui; import funkin.modding.IScriptedClass.IEventHandler; import funkin.ui.mainmenu.MainMenuState; -import flixel.FlxState; import flixel.FlxSubState; import flixel.addons.transition.FlxTransitionableState; import flixel.text.FlxText; diff --git a/source/funkin/ui/MusicBeatSubState.hx b/source/funkin/ui/MusicBeatSubState.hx index d046ab94b..59fdb7e99 100644 --- a/source/funkin/ui/MusicBeatSubState.hx +++ b/source/funkin/ui/MusicBeatSubState.hx @@ -1,6 +1,5 @@ package funkin.ui; -import flixel.addons.transition.FlxTransitionableState; import flixel.FlxSubState; import flixel.text.FlxText; import funkin.ui.mainmenu.MainMenuState; diff --git a/source/funkin/ui/PixelatedIcon.hx b/source/funkin/ui/PixelatedIcon.hx index 6e6fb90c8..a37261411 100644 --- a/source/funkin/ui/PixelatedIcon.hx +++ b/source/funkin/ui/PixelatedIcon.hx @@ -1,6 +1,5 @@ package funkin.ui; -import flixel.FlxSprite; import funkin.graphics.FlxFilteredSprite; /** diff --git a/source/funkin/ui/charSelect/CharSelectGF.hx b/source/funkin/ui/charSelect/CharSelectGF.hx index 89fc6deb0..8e8cf5994 100644 --- a/source/funkin/ui/charSelect/CharSelectGF.hx +++ b/source/funkin/ui/charSelect/CharSelectGF.hx @@ -1,14 +1,11 @@ package funkin.ui.charSelect; import funkin.graphics.adobeanimate.FlxAtlasSprite; -import flixel.tweens.FlxTween; -import flixel.tweens.FlxEase; import flixel.math.FlxMath; import funkin.util.FramesJSFLParser; import funkin.util.FramesJSFLParser.FramesJSFLInfo; import funkin.util.FramesJSFLParser.FramesJSFLFrame; import funkin.modding.IScriptedClass.IBPMSyncedScriptedClass; -import flixel.math.FlxMath; import funkin.modding.events.ScriptEvent; import funkin.vis.dsp.SpectralAnalyzer; import funkin.data.freeplay.player.PlayerRegistry; diff --git a/source/funkin/ui/charSelect/CharSelectPlayer.hx b/source/funkin/ui/charSelect/CharSelectPlayer.hx index 1eef52bed..23184e40d 100644 --- a/source/funkin/ui/charSelect/CharSelectPlayer.hx +++ b/source/funkin/ui/charSelect/CharSelectPlayer.hx @@ -1,8 +1,6 @@ package funkin.ui.charSelect; -import flixel.FlxSprite; import funkin.graphics.adobeanimate.FlxAtlasSprite; -import flxanimate.animate.FlxKeyFrame; import funkin.modding.IScriptedClass.IBPMSyncedScriptedClass; import funkin.modding.events.ScriptEvent; diff --git a/source/funkin/ui/charSelect/CharSelectSubState.hx b/source/funkin/ui/charSelect/CharSelectSubState.hx index 4eb975e8a..507a7ce44 100644 --- a/source/funkin/ui/charSelect/CharSelectSubState.hx +++ b/source/funkin/ui/charSelect/CharSelectSubState.hx @@ -3,18 +3,15 @@ package funkin.ui.charSelect; import openfl.filters.BitmapFilter; import flixel.FlxObject; import flixel.FlxSprite; -import flixel.group.FlxGroup; import flixel.group.FlxGroup.FlxTypedGroup; import flixel.group.FlxSpriteGroup; import flixel.math.FlxPoint; import flixel.sound.FlxSound; import flixel.system.debug.watch.Tracker.TrackerProfile; -import flixel.text.FlxText; import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; import flixel.util.FlxTimer; import funkin.audio.FunkinSound; -import funkin.data.freeplay.player.PlayerData; import funkin.data.freeplay.player.PlayerRegistry; import funkin.graphics.adobeanimate.FlxAtlasSprite; import openfl.filters.DropShadowFilter; @@ -30,11 +27,9 @@ import funkin.ui.PixelatedIcon; import funkin.util.MathUtil; import funkin.vis.dsp.SpectralAnalyzer; import openfl.display.BlendMode; -import funkin.save.Save; import openfl.filters.ShaderFilter; import funkin.util.FramesJSFLParser; import funkin.util.FramesJSFLParser.FramesJSFLInfo; -import funkin.util.FramesJSFLParser.FramesJSFLFrame; import funkin.graphics.FunkinSprite; class CharSelectSubState extends MusicBeatSubState diff --git a/source/funkin/ui/charSelect/CharacterUnlockState.hx b/source/funkin/ui/charSelect/CharacterUnlockState.hx index b32a35145..730bd6c2c 100644 --- a/source/funkin/ui/charSelect/CharacterUnlockState.hx +++ b/source/funkin/ui/charSelect/CharacterUnlockState.hx @@ -7,11 +7,9 @@ import flixel.text.FlxText; import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; import flixel.util.FlxColor; -import funkin.play.character.CharacterData; import funkin.play.character.CharacterData.CharacterDataParser; import funkin.play.components.HealthIcon; import funkin.ui.freeplay.charselect.PlayableCharacter; -import funkin.data.freeplay.player.PlayerData; import funkin.data.freeplay.player.PlayerRegistry; import funkin.ui.mainmenu.MainMenuState; diff --git a/source/funkin/ui/charSelect/IntroSubState.hx b/source/funkin/ui/charSelect/IntroSubState.hx index 239d49deb..51a4a52a7 100644 --- a/source/funkin/ui/charSelect/IntroSubState.hx +++ b/source/funkin/ui/charSelect/IntroSubState.hx @@ -7,7 +7,6 @@ import funkin.graphics.video.FlxVideo; import funkin.graphics.video.FunkinVideoSprite; #end import funkin.ui.MusicBeatSubState; -import funkin.audio.FunkinSound; import funkin.save.Save; /** diff --git a/source/funkin/ui/debug/DebugMenuSubState.hx b/source/funkin/ui/debug/DebugMenuSubState.hx index 4cf78a85d..bc9517f82 100644 --- a/source/funkin/ui/debug/DebugMenuSubState.hx +++ b/source/funkin/ui/debug/DebugMenuSubState.hx @@ -7,7 +7,6 @@ import funkin.ui.MusicBeatSubState; import funkin.audio.FunkinSound; import funkin.ui.TextMenuList; import funkin.ui.debug.charting.ChartEditorState; -import funkin.ui.MusicBeatSubState; import funkin.util.logging.CrashHandler; import flixel.addons.transition.FlxTransitionableState; import funkin.util.FileUtil; diff --git a/source/funkin/ui/debug/MemoryCounter.hx b/source/funkin/ui/debug/MemoryCounter.hx index 50421f398..18b3961b9 100644 --- a/source/funkin/ui/debug/MemoryCounter.hx +++ b/source/funkin/ui/debug/MemoryCounter.hx @@ -2,7 +2,6 @@ package funkin.ui.debug; import funkin.util.MemoryUtil; import openfl.text.TextFormat; -import openfl.system.System; import openfl.text.TextField; class MemoryCounter extends TextField diff --git a/source/funkin/ui/debug/WaveformTestState.hx b/source/funkin/ui/debug/WaveformTestState.hx index f3566db85..fb5817bce 100644 --- a/source/funkin/ui/debug/WaveformTestState.hx +++ b/source/funkin/ui/debug/WaveformTestState.hx @@ -5,7 +5,6 @@ import flixel.FlxSprite; import flixel.util.FlxColor; import funkin.audio.FunkinSound; import funkin.audio.waveform.WaveformData; -import funkin.audio.waveform.WaveformSprite; import funkin.audio.waveform.WaveformDataParser; import funkin.graphics.rendering.MeshRender; diff --git a/source/funkin/ui/debug/anim/DebugBoundingState.hx b/source/funkin/ui/debug/anim/DebugBoundingState.hx index 157d20aa1..16da8caad 100644 --- a/source/funkin/ui/debug/anim/DebugBoundingState.hx +++ b/source/funkin/ui/debug/anim/DebugBoundingState.hx @@ -31,13 +31,6 @@ import openfl.net.FileReference; using flixel.util.FlxSpriteUtil; -#if web -import js.html.FileList; -#end -#if sys -import sys.io.File; -#end - class DebugBoundingState extends FlxState { /* diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx index a7a514eae..a38551773 100644 --- a/source/funkin/ui/debug/charting/ChartEditorState.hx +++ b/source/funkin/ui/debug/charting/ChartEditorState.hx @@ -14,13 +14,7 @@ import flixel.input.mouse.FlxMouseEvent; import flixel.math.FlxMath; import flixel.math.FlxPoint; import flixel.math.FlxRect; -import flixel.sound.FlxSound; -import flixel.system.debug.log.LogStyle; -import flixel.system.FlxAssets.FlxSoundAsset; import flixel.text.FlxText; -import flixel.tweens.FlxEase; -import flixel.tweens.FlxTween; -import flixel.tweens.misc.VarTween; import flixel.util.FlxColor; import flixel.util.FlxSort; import flixel.util.FlxTimer; @@ -29,7 +23,6 @@ import funkin.audio.visualize.PolygonSpectogram; import funkin.audio.VoicesGroup; import funkin.audio.waveform.WaveformSprite; import funkin.data.notestyle.NoteStyleRegistry; -import funkin.data.song.SongData.SongCharacterData; import funkin.data.song.SongData.SongChartData; import funkin.data.song.SongData.SongEventData; import funkin.data.song.SongData.SongMetadata; @@ -37,22 +30,17 @@ import funkin.data.song.SongData.SongNoteData; import funkin.data.song.SongData.SongOffsets; import funkin.data.song.SongData.NoteParamData; import funkin.data.song.SongDataUtils; -import funkin.data.song.SongRegistry; -import funkin.data.stage.StageData; import funkin.graphics.FunkinCamera; import funkin.graphics.FunkinSprite; import funkin.input.Cursor; -import funkin.input.TurboActionHandler; import funkin.input.TurboButtonHandler; import funkin.input.TurboKeyHandler; import funkin.modding.events.ScriptEvent; import funkin.play.notes.notekind.NoteKindManager; import funkin.play.character.BaseCharacter.CharacterType; -import funkin.play.character.CharacterData; import funkin.play.character.CharacterData.CharacterDataParser; import funkin.play.components.HealthIcon; import funkin.play.notes.NoteSprite; -import funkin.play.PlayState; import funkin.play.PlayStatePlaylist; import funkin.play.song.Song; import funkin.save.Save; @@ -83,13 +71,10 @@ import funkin.ui.debug.charting.components.ChartEditorNotePreview; import funkin.ui.debug.charting.components.ChartEditorNoteSprite; import funkin.ui.debug.charting.components.ChartEditorPlaybarHead; import funkin.ui.debug.charting.components.ChartEditorSelectionSquareSprite; -import funkin.ui.debug.charting.handlers.ChartEditorShortcutHandler; -import funkin.ui.debug.charting.toolboxes.ChartEditorBaseToolbox; import funkin.ui.debug.charting.toolboxes.ChartEditorDifficultyToolbox; import funkin.ui.debug.charting.toolboxes.ChartEditorFreeplayToolbox; import funkin.ui.debug.charting.toolboxes.ChartEditorOffsetsToolbox; import funkin.ui.haxeui.components.CharacterPlayer; -import funkin.ui.haxeui.HaxeUIState; import funkin.ui.mainmenu.MainMenuState; import funkin.ui.transition.LoadingState; import funkin.util.Constants; @@ -101,28 +86,15 @@ import funkin.util.WindowUtil; import haxe.DynamicAccess; import haxe.io.Bytes; import haxe.io.Path; -import haxe.ui.backend.flixel.UIRuntimeState; import haxe.ui.backend.flixel.UIState; import haxe.ui.components.Button; -import haxe.ui.components.DropDown; -import haxe.ui.components.Image; import haxe.ui.components.Label; -import haxe.ui.components.NumberStepper; import haxe.ui.components.Slider; -import haxe.ui.components.TextField; -import haxe.ui.containers.Box; import haxe.ui.containers.dialogs.CollapsibleDialog; -import haxe.ui.containers.Frame; -import haxe.ui.containers.Grid; -import haxe.ui.containers.HBox; import haxe.ui.containers.menus.Menu; import haxe.ui.containers.menus.MenuBar; import haxe.ui.containers.menus.MenuCheckBox; import haxe.ui.containers.menus.MenuItem; -import haxe.ui.containers.ScrollView; -import haxe.ui.containers.TreeView; -import haxe.ui.containers.TreeViewNode; -import haxe.ui.core.Component; import haxe.ui.core.Screen; import haxe.ui.events.DragEvent; import haxe.ui.events.MouseEvent; diff --git a/source/funkin/ui/debug/charting/commands/SetAudioOffsetCommand.hx b/source/funkin/ui/debug/charting/commands/SetAudioOffsetCommand.hx index ca1fda6b9..606d544cc 100644 --- a/source/funkin/ui/debug/charting/commands/SetAudioOffsetCommand.hx +++ b/source/funkin/ui/debug/charting/commands/SetAudioOffsetCommand.hx @@ -1,11 +1,5 @@ package funkin.ui.debug.charting.commands; -import funkin.data.song.SongData.SongNoteData; -import funkin.data.song.SongData.SongEventData; -import funkin.data.song.SongDataUtils; -import flixel.tweens.FlxEase; -import flixel.tweens.FlxTween; - /** * Command that copies a given set of notes and song events to the clipboard, * without deleting them from the chart editor. diff --git a/source/funkin/ui/debug/charting/components/ChartEditorEventSprite.hx b/source/funkin/ui/debug/charting/components/ChartEditorEventSprite.hx index 4c4a8d200..645e51625 100644 --- a/source/funkin/ui/debug/charting/components/ChartEditorEventSprite.hx +++ b/source/funkin/ui/debug/charting/components/ChartEditorEventSprite.hx @@ -4,11 +4,8 @@ import funkin.data.event.SongEventRegistry; import flixel.graphics.frames.FlxAtlasFrames; import openfl.display.BitmapData; import flixel.FlxObject; -import flixel.FlxBasic; import flixel.FlxSprite; import flixel.graphics.frames.FlxFramesCollection; -import flixel.graphics.frames.FlxTileFrames; -import flixel.math.FlxPoint; import funkin.data.song.SongData.SongEventData; import haxe.ui.tooltips.ToolTipRegionOptions; import funkin.util.HaxeUIUtil; diff --git a/source/funkin/ui/debug/charting/components/ChartEditorHoldNoteSprite.hx b/source/funkin/ui/debug/charting/components/ChartEditorHoldNoteSprite.hx index ff8446c49..e4012d552 100644 --- a/source/funkin/ui/debug/charting/components/ChartEditorHoldNoteSprite.hx +++ b/source/funkin/ui/debug/charting/components/ChartEditorHoldNoteSprite.hx @@ -4,10 +4,6 @@ import funkin.play.notes.Strumline; import funkin.data.notestyle.NoteStyleRegistry; import funkin.play.notes.notestyle.NoteStyle; import flixel.FlxObject; -import flixel.FlxSprite; -import flixel.graphics.frames.FlxFramesCollection; -import flixel.graphics.frames.FlxTileFrames; -import flixel.math.FlxPoint; import funkin.play.notes.SustainTrail; import funkin.data.song.SongData.SongNoteData; import flixel.math.FlxMath; diff --git a/source/funkin/ui/debug/charting/components/ChartEditorNoteSprite.hx b/source/funkin/ui/debug/charting/components/ChartEditorNoteSprite.hx index c8f40da62..17cd2bc64 100644 --- a/source/funkin/ui/debug/charting/components/ChartEditorNoteSprite.hx +++ b/source/funkin/ui/debug/charting/components/ChartEditorNoteSprite.hx @@ -5,8 +5,6 @@ import flixel.FlxSprite; import flixel.graphics.frames.FlxFramesCollection; import flixel.graphics.frames.FlxAtlasFrames; import flixel.graphics.frames.FlxFrame; -import flixel.graphics.frames.FlxTileFrames; -import flixel.math.FlxPoint; import funkin.data.animation.AnimationData; import funkin.data.song.SongData.SongNoteData; import funkin.data.notestyle.NoteStyleRegistry; diff --git a/source/funkin/ui/debug/charting/components/ChartEditorPlaybarHead.hx b/source/funkin/ui/debug/charting/components/ChartEditorPlaybarHead.hx index e08d71029..7e62912d9 100644 --- a/source/funkin/ui/debug/charting/components/ChartEditorPlaybarHead.hx +++ b/source/funkin/ui/debug/charting/components/ChartEditorPlaybarHead.hx @@ -1,7 +1,6 @@ package funkin.ui.debug.charting.components; import haxe.ui.containers.Box; -import haxe.ui.components.HorizontalSlider; /** * The component which contains the playhead for the chart editor. diff --git a/source/funkin/ui/debug/charting/components/ChartEditorSelectionSquareSprite.hx b/source/funkin/ui/debug/charting/components/ChartEditorSelectionSquareSprite.hx index 14266b71a..eec96b450 100644 --- a/source/funkin/ui/debug/charting/components/ChartEditorSelectionSquareSprite.hx +++ b/source/funkin/ui/debug/charting/components/ChartEditorSelectionSquareSprite.hx @@ -1,7 +1,6 @@ package funkin.ui.debug.charting.components; import flixel.addons.display.FlxSliceSprite; -import flixel.FlxSprite; import flixel.math.FlxRect; import funkin.data.song.SongData.SongEventData; import funkin.data.song.SongData.SongNoteData; diff --git a/source/funkin/ui/debug/charting/contextmenus/ChartEditorDefaultContextMenu.hx b/source/funkin/ui/debug/charting/contextmenus/ChartEditorDefaultContextMenu.hx index 9529cc2fd..d704114e8 100644 --- a/source/funkin/ui/debug/charting/contextmenus/ChartEditorDefaultContextMenu.hx +++ b/source/funkin/ui/debug/charting/contextmenus/ChartEditorDefaultContextMenu.hx @@ -1,8 +1,5 @@ package funkin.ui.debug.charting.contextmenus; -import haxe.ui.containers.menus.Menu; -import haxe.ui.core.Screen; - @:access(funkin.ui.debug.charting.ChartEditorState) @:build(haxe.ui.ComponentBuilder.build("assets/exclude/data/ui/chart-editor/context-menus/default.xml")) class ChartEditorDefaultContextMenu extends ChartEditorBaseContextMenu diff --git a/source/funkin/ui/debug/charting/contextmenus/ChartEditorEventContextMenu.hx b/source/funkin/ui/debug/charting/contextmenus/ChartEditorEventContextMenu.hx index d848f1435..afdf2dca7 100644 --- a/source/funkin/ui/debug/charting/contextmenus/ChartEditorEventContextMenu.hx +++ b/source/funkin/ui/debug/charting/contextmenus/ChartEditorEventContextMenu.hx @@ -1,8 +1,6 @@ package funkin.ui.debug.charting.contextmenus; -import haxe.ui.containers.menus.Menu; import haxe.ui.containers.menus.MenuItem; -import haxe.ui.core.Screen; import funkin.data.song.SongData.SongEventData; import funkin.ui.debug.charting.commands.RemoveEventsCommand; diff --git a/source/funkin/ui/debug/charting/contextmenus/ChartEditorHoldNoteContextMenu.hx b/source/funkin/ui/debug/charting/contextmenus/ChartEditorHoldNoteContextMenu.hx index 9f58d2f03..4a94cd1a2 100644 --- a/source/funkin/ui/debug/charting/contextmenus/ChartEditorHoldNoteContextMenu.hx +++ b/source/funkin/ui/debug/charting/contextmenus/ChartEditorHoldNoteContextMenu.hx @@ -1,8 +1,6 @@ package funkin.ui.debug.charting.contextmenus; -import haxe.ui.containers.menus.Menu; import haxe.ui.containers.menus.MenuItem; -import haxe.ui.core.Screen; import funkin.data.song.SongData.SongNoteData; import funkin.ui.debug.charting.commands.FlipNotesCommand; import funkin.ui.debug.charting.commands.RemoveNotesCommand; diff --git a/source/funkin/ui/debug/charting/contextmenus/ChartEditorNoteContextMenu.hx b/source/funkin/ui/debug/charting/contextmenus/ChartEditorNoteContextMenu.hx index 66bf6f3ee..419312818 100644 --- a/source/funkin/ui/debug/charting/contextmenus/ChartEditorNoteContextMenu.hx +++ b/source/funkin/ui/debug/charting/contextmenus/ChartEditorNoteContextMenu.hx @@ -1,8 +1,6 @@ package funkin.ui.debug.charting.contextmenus; -import haxe.ui.containers.menus.Menu; import haxe.ui.containers.menus.MenuItem; -import haxe.ui.core.Screen; import funkin.data.song.SongData.SongNoteData; import funkin.ui.debug.charting.commands.FlipNotesCommand; import funkin.ui.debug.charting.commands.RemoveNotesCommand; diff --git a/source/funkin/ui/debug/charting/contextmenus/ChartEditorSelectionContextMenu.hx b/source/funkin/ui/debug/charting/contextmenus/ChartEditorSelectionContextMenu.hx index feed9b689..883ce5a1d 100644 --- a/source/funkin/ui/debug/charting/contextmenus/ChartEditorSelectionContextMenu.hx +++ b/source/funkin/ui/debug/charting/contextmenus/ChartEditorSelectionContextMenu.hx @@ -1,8 +1,6 @@ package funkin.ui.debug.charting.contextmenus; -import haxe.ui.containers.menus.Menu; import haxe.ui.containers.menus.MenuItem; -import haxe.ui.core.Screen; import funkin.ui.debug.charting.commands.CutItemsCommand; import funkin.ui.debug.charting.commands.RemoveEventsCommand; import funkin.ui.debug.charting.commands.RemoveItemsCommand; diff --git a/source/funkin/ui/debug/charting/dialogs/ChartEditorBaseDialog.hx b/source/funkin/ui/debug/charting/dialogs/ChartEditorBaseDialog.hx index 5b7cb15e1..7cac85df4 100644 --- a/source/funkin/ui/debug/charting/dialogs/ChartEditorBaseDialog.hx +++ b/source/funkin/ui/debug/charting/dialogs/ChartEditorBaseDialog.hx @@ -3,7 +3,6 @@ package funkin.ui.debug.charting.dialogs; import haxe.ui.containers.dialogs.Dialog; import haxe.ui.containers.dialogs.Dialog.DialogEvent; import haxe.ui.animation.AnimationBuilder; -import haxe.ui.styles.EasingFunction; import haxe.ui.core.Component; // @:nullSafety // TODO: Fix null safety when used with HaxeUI build macros. diff --git a/source/funkin/ui/debug/charting/dialogs/ChartEditorBaseMenu.hx b/source/funkin/ui/debug/charting/dialogs/ChartEditorBaseMenu.hx index 19ca2535c..95200151e 100644 --- a/source/funkin/ui/debug/charting/dialogs/ChartEditorBaseMenu.hx +++ b/source/funkin/ui/debug/charting/dialogs/ChartEditorBaseMenu.hx @@ -1,10 +1,5 @@ package funkin.ui.debug.charting.dialogs; -import haxe.ui.containers.dialogs.Dialog; -import haxe.ui.containers.dialogs.Dialog.DialogEvent; -import haxe.ui.animation.AnimationBuilder; -import haxe.ui.styles.EasingFunction; -import haxe.ui.core.Component; import haxe.ui.containers.menus.Menu; // @:nullSafety // TODO: Fix null safety when used with HaxeUI build macros. diff --git a/source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx b/source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx index 90d998a02..52e9d9b2e 100644 --- a/source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx +++ b/source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx @@ -5,12 +5,9 @@ import funkin.play.character.BaseCharacter.CharacterType; import funkin.play.character.CharacterData; import funkin.play.character.CharacterData.CharacterDataParser; import funkin.play.components.HealthIcon; -import funkin.ui.debug.charting.dialogs.ChartEditorBaseDialog.DialogParams; import funkin.util.SortUtil; import haxe.ui.components.Label; import haxe.ui.containers.Grid; -import haxe.ui.containers.HBox; -import haxe.ui.containers.ScrollView; import haxe.ui.containers.ScrollView; import haxe.ui.core.Screen; import flixel.tweens.FlxTween; diff --git a/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadChartDialog.hx b/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadChartDialog.hx index 17f047106..e0b6b2b10 100644 --- a/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadChartDialog.hx +++ b/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadChartDialog.hx @@ -7,9 +7,7 @@ import funkin.util.FileUtil; import haxe.io.Path; import haxe.ui.containers.dialogs.Dialog.DialogButton; import haxe.ui.containers.dialogs.Dialog.DialogEvent; -import haxe.ui.containers.dialogs.Dialogs; -import haxe.ui.notifications.NotificationManager; -import haxe.ui.notifications.NotificationType; +import haxe.ui.containers.dialogs.Dialogs.SelectedFileInfo; // @:nullSafety // TODO: Fix null safety when used with HaxeUI build macros. @:build(haxe.ui.ComponentBuilder.build("assets/exclude/data/ui/chart-editor/dialogs/upload-chart.xml")) diff --git a/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadVocalsDialog.hx b/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadVocalsDialog.hx index 537c7c36e..c585c5eb4 100644 --- a/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadVocalsDialog.hx +++ b/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadVocalsDialog.hx @@ -13,8 +13,6 @@ import haxe.ui.containers.dialogs.Dialog.DialogEvent; import haxe.ui.containers.Box; import haxe.ui.containers.dialogs.Dialogs; import haxe.ui.core.Component; -import haxe.ui.notifications.NotificationManager; -import haxe.ui.notifications.NotificationType; // @:nullSafety // TODO: Fix null safety when used with HaxeUI build macros. diff --git a/source/funkin/ui/debug/charting/dialogs/ChartEditorWelcomeDialog.hx b/source/funkin/ui/debug/charting/dialogs/ChartEditorWelcomeDialog.hx index 7539b9725..5de5fb6d2 100644 --- a/source/funkin/ui/debug/charting/dialogs/ChartEditorWelcomeDialog.hx +++ b/source/funkin/ui/debug/charting/dialogs/ChartEditorWelcomeDialog.hx @@ -3,7 +3,6 @@ package funkin.ui.debug.charting.dialogs; import funkin.data.song.SongRegistry; import funkin.play.song.Song; import funkin.ui.debug.charting.ChartEditorState; -import funkin.ui.debug.charting.dialogs.ChartEditorBaseDialog; import funkin.ui.debug.charting.dialogs.ChartEditorBaseDialog.DialogParams; import funkin.util.FileUtil; import funkin.util.SortUtil; @@ -11,11 +10,7 @@ import haxe.ui.components.Label; import haxe.ui.components.Link; import haxe.ui.containers.dialogs.Dialog.DialogButton; import haxe.ui.containers.dialogs.Dialog.DialogEvent; -import haxe.ui.core.Component; import haxe.ui.events.MouseEvent; -import haxe.ui.events.UIEvent; -import haxe.ui.notifications.NotificationManager; -import haxe.ui.notifications.NotificationType; /** * Builds and opens a dialog letting the user create a new chart, open a recent chart, or load from a template. diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx index ab13da1d9..60c1a9035 100644 --- a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx +++ b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx @@ -9,11 +9,7 @@ import funkin.data.song.SongData.SongMetadata; import funkin.data.song.SongData.SongTimeChange; import funkin.data.song.SongRegistry; import funkin.input.Cursor; -import funkin.play.character.BaseCharacter; -import funkin.play.character.CharacterData; -import funkin.play.character.CharacterData.CharacterDataParser; -import funkin.play.song.Song; -import funkin.data.stage.StageData; +import funkin.play.character.BaseCharacter.CharacterType; import funkin.ui.debug.charting.dialogs.ChartEditorAboutDialog; import funkin.ui.debug.charting.dialogs.ChartEditorBaseDialog.DialogDropTarget; import funkin.ui.debug.charting.dialogs.ChartEditorCharacterIconSelectorMenu; @@ -24,15 +20,11 @@ import funkin.ui.debug.charting.util.ChartEditorDropdowns; import funkin.util.Constants; import funkin.util.DateUtil; import funkin.util.FileUtil; -import funkin.util.SerializerUtil; -import funkin.util.SortUtil; import funkin.util.VersionUtil; -import funkin.util.WindowUtil; import haxe.io.Path; import haxe.ui.components.Button; import haxe.ui.components.DropDown; import haxe.ui.components.Label; -import haxe.ui.components.Link; import haxe.ui.components.NumberStepper; import haxe.ui.components.Slider; import haxe.ui.components.TextField; @@ -42,11 +34,8 @@ import haxe.ui.containers.dialogs.Dialog.DialogButton; import haxe.ui.containers.dialogs.Dialogs; import haxe.ui.containers.Form; import haxe.ui.containers.menus.Menu; -import haxe.ui.containers.VBox; import haxe.ui.core.Component; import haxe.ui.events.UIEvent; -import haxe.ui.notifications.NotificationManager; -import haxe.ui.notifications.NotificationType; import haxe.ui.RuntimeComponentBuilder; import thx.semver.Version; diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx index e84f7ec43..b024506f2 100644 --- a/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx +++ b/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx @@ -3,7 +3,6 @@ package funkin.ui.debug.charting.handlers; import funkin.util.VersionUtil; import funkin.util.DateUtil; import haxe.io.Path; -import funkin.util.SerializerUtil; import funkin.util.SortUtil; import funkin.util.FileUtil; import funkin.util.FileUtil.FileWriteMode; diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx index f82bc3c1f..ec5f37708 100644 --- a/source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx +++ b/source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx @@ -1,35 +1,9 @@ package funkin.ui.debug.charting.handlers; -import funkin.data.stage.StageData; -import funkin.play.character.CharacterData; -import funkin.play.character.CharacterData.CharacterDataParser; -import haxe.ui.components.HorizontalSlider; -import haxe.ui.containers.TreeView; -import haxe.ui.containers.TreeViewNode; import funkin.play.character.BaseCharacter.CharacterType; -import funkin.play.event.SongEvent; -import funkin.data.event.SongEventSchema; -import funkin.data.song.SongData.SongTimeChange; -import funkin.play.character.BaseCharacter.CharacterType; -import funkin.play.character.CharacterData; -import funkin.play.character.CharacterData.CharacterDataParser; -import funkin.play.event.SongEvent; -import funkin.play.song.SongSerializer; -import funkin.data.stage.StageData; import haxe.ui.RuntimeComponentBuilder; -import funkin.ui.debug.charting.util.ChartEditorDropdowns; import funkin.ui.haxeui.components.CharacterPlayer; -import funkin.util.FileUtil; -import haxe.ui.components.Button; -import haxe.ui.data.ArrayDataSource; import haxe.ui.components.CheckBox; -import haxe.ui.components.DropDown; -import haxe.ui.components.HorizontalSlider; -import haxe.ui.components.Label; -import haxe.ui.components.NumberStepper; -import haxe.ui.components.Slider; -import haxe.ui.components.TextField; -import haxe.ui.containers.Box; import haxe.ui.containers.dialogs.CollapsibleDialog; import haxe.ui.containers.dialogs.Dialog.DialogButton; import haxe.ui.containers.dialogs.Dialog.DialogEvent; @@ -40,12 +14,6 @@ import funkin.ui.debug.charting.toolboxes.ChartEditorFreeplayToolbox; import funkin.ui.debug.charting.toolboxes.ChartEditorEventDataToolbox; import funkin.ui.debug.charting.toolboxes.ChartEditorNoteDataToolbox; import funkin.ui.debug.charting.toolboxes.ChartEditorDifficultyToolbox; -import haxe.ui.containers.Frame; -import haxe.ui.containers.Grid; -import haxe.ui.containers.TreeView; -import haxe.ui.containers.TreeViewNode; -import haxe.ui.core.Component; -import haxe.ui.events.UIEvent; /** * Static functions which handle building themed UI elements for a provided ChartEditorState. diff --git a/source/funkin/ui/debug/charting/toolboxes/ChartEditorBaseToolbox.hx b/source/funkin/ui/debug/charting/toolboxes/ChartEditorBaseToolbox.hx index 7df06c249..0dcd626a4 100644 --- a/source/funkin/ui/debug/charting/toolboxes/ChartEditorBaseToolbox.hx +++ b/source/funkin/ui/debug/charting/toolboxes/ChartEditorBaseToolbox.hx @@ -1,9 +1,6 @@ package funkin.ui.debug.charting.toolboxes; -import haxe.ui.containers.dialogs.Dialog; import haxe.ui.containers.dialogs.CollapsibleDialog; -import haxe.ui.containers.dialogs.Dialog.DialogEvent; -import haxe.ui.core.Component; /** * The base class for the Toolboxes (manipulatable, arrangeable control windows) in the Chart Editor. diff --git a/source/funkin/ui/debug/charting/toolboxes/ChartEditorDifficultyToolbox.hx b/source/funkin/ui/debug/charting/toolboxes/ChartEditorDifficultyToolbox.hx index 1163c1b96..440cf1c1e 100644 --- a/source/funkin/ui/debug/charting/toolboxes/ChartEditorDifficultyToolbox.hx +++ b/source/funkin/ui/debug/charting/toolboxes/ChartEditorDifficultyToolbox.hx @@ -1,30 +1,14 @@ package funkin.ui.debug.charting.toolboxes; -import funkin.play.character.BaseCharacter.CharacterType; -import funkin.play.character.CharacterData; -import funkin.data.stage.StageData; -import funkin.data.stage.StageRegistry; -import funkin.ui.debug.charting.commands.ChangeStartingBPMCommand; -import funkin.ui.debug.charting.util.ChartEditorDropdowns; import haxe.ui.components.Button; -import haxe.ui.components.CheckBox; import haxe.ui.containers.dialogs.Dialogs; import haxe.ui.containers.dialogs.Dialog.DialogButton; import funkin.data.song.SongData.SongMetadata; -import haxe.ui.components.DropDown; -import haxe.ui.components.HorizontalSlider; import funkin.util.FileUtil; import haxe.ui.containers.dialogs.MessageBox.MessageBoxType; import funkin.play.song.SongSerializer; -import haxe.ui.components.Label; -import haxe.ui.components.NumberStepper; -import haxe.ui.components.Slider; -import haxe.ui.components.TextField; -import funkin.play.stage.Stage; -import haxe.ui.containers.Box; import haxe.ui.containers.TreeView; import haxe.ui.containers.TreeViewNode; -import haxe.ui.containers.Frame; import haxe.ui.events.UIEvent; /** diff --git a/source/funkin/ui/debug/charting/toolboxes/ChartEditorEventDataToolbox.hx b/source/funkin/ui/debug/charting/toolboxes/ChartEditorEventDataToolbox.hx index 70580300e..852b78dc7 100644 --- a/source/funkin/ui/debug/charting/toolboxes/ChartEditorEventDataToolbox.hx +++ b/source/funkin/ui/debug/charting/toolboxes/ChartEditorEventDataToolbox.hx @@ -1,19 +1,11 @@ package funkin.ui.debug.charting.toolboxes; -import funkin.play.character.BaseCharacter.CharacterType; -import funkin.play.character.CharacterData; -import funkin.data.stage.StageData; -import funkin.play.event.SongEvent; import funkin.data.event.SongEventSchema; -import funkin.ui.debug.charting.commands.ChangeStartingBPMCommand; import funkin.ui.debug.charting.util.ChartEditorDropdowns; -import haxe.ui.components.Button; import haxe.ui.components.CheckBox; import haxe.ui.components.DropDown; -import haxe.ui.components.HorizontalSlider; import haxe.ui.components.Label; import haxe.ui.components.NumberStepper; -import haxe.ui.components.Slider; import haxe.ui.core.Component; import funkin.data.event.SongEventRegistry; import haxe.ui.components.TextField; @@ -23,8 +15,6 @@ import haxe.ui.containers.Frame; import haxe.ui.events.UIEvent; import haxe.ui.data.ArrayDataSource; import haxe.ui.containers.Grid; -import haxe.ui.components.DropDown; -import haxe.ui.containers.Frame; /** * The toolbox which allows modifying information like Song Title, Scroll Speed, Characters/Stages, and starting BPM. diff --git a/source/funkin/ui/debug/charting/toolboxes/ChartEditorFreeplayToolbox.hx b/source/funkin/ui/debug/charting/toolboxes/ChartEditorFreeplayToolbox.hx index d01af8d7b..5dced1a89 100644 --- a/source/funkin/ui/debug/charting/toolboxes/ChartEditorFreeplayToolbox.hx +++ b/source/funkin/ui/debug/charting/toolboxes/ChartEditorFreeplayToolbox.hx @@ -3,23 +3,17 @@ package funkin.ui.debug.charting.toolboxes; import flixel.addons.display.FlxTiledSprite; import flixel.math.FlxMath; import funkin.audio.SoundGroup; -import funkin.audio.waveform.WaveformDataParser; import funkin.ui.debug.charting.commands.SetFreeplayPreviewCommand; import funkin.ui.haxeui.components.WaveformPlayer; import funkin.ui.freeplay.FreeplayState; import funkin.util.TimerUtil; import haxe.ui.backend.flixel.components.SpriteWrapper; import haxe.ui.components.Button; -import haxe.ui.components.HorizontalSlider; import haxe.ui.components.Label; import haxe.ui.components.NumberStepper; -import haxe.ui.components.Slider; -import haxe.ui.containers.VBox; import haxe.ui.containers.Absolute; import haxe.ui.containers.ScrollView; -import haxe.ui.containers.Frame; import haxe.ui.core.Screen; -import haxe.ui.events.DragEvent; import haxe.ui.events.MouseEvent; import haxe.ui.events.UIEvent; diff --git a/source/funkin/ui/debug/charting/toolboxes/ChartEditorMetadataToolbox.hx b/source/funkin/ui/debug/charting/toolboxes/ChartEditorMetadataToolbox.hx index f68776cab..9b6e9213d 100644 --- a/source/funkin/ui/debug/charting/toolboxes/ChartEditorMetadataToolbox.hx +++ b/source/funkin/ui/debug/charting/toolboxes/ChartEditorMetadataToolbox.hx @@ -2,20 +2,16 @@ package funkin.ui.debug.charting.toolboxes; import funkin.play.character.BaseCharacter.CharacterType; import funkin.play.character.CharacterData; -import funkin.data.stage.StageData; import funkin.data.stage.StageRegistry; import funkin.ui.debug.charting.commands.ChangeStartingBPMCommand; import funkin.ui.debug.charting.util.ChartEditorDropdowns; import haxe.ui.components.Button; -import haxe.ui.components.CheckBox; import haxe.ui.components.DropDown; -import haxe.ui.components.HorizontalSlider; import haxe.ui.components.Label; import haxe.ui.components.NumberStepper; import haxe.ui.components.Slider; import haxe.ui.components.TextField; import funkin.play.stage.Stage; -import haxe.ui.containers.Box; import haxe.ui.containers.Frame; import haxe.ui.events.UIEvent; diff --git a/source/funkin/ui/debug/charting/toolboxes/ChartEditorOffsetsToolbox.hx b/source/funkin/ui/debug/charting/toolboxes/ChartEditorOffsetsToolbox.hx index 0d12684ed..e8fb8b4ed 100644 --- a/source/funkin/ui/debug/charting/toolboxes/ChartEditorOffsetsToolbox.hx +++ b/source/funkin/ui/debug/charting/toolboxes/ChartEditorOffsetsToolbox.hx @@ -2,22 +2,16 @@ package funkin.ui.debug.charting.toolboxes; import funkin.audio.SoundGroup; import haxe.ui.components.Button; -import haxe.ui.components.HorizontalSlider; import haxe.ui.components.Label; import flixel.addons.display.FlxTiledSprite; import flixel.math.FlxMath; import haxe.ui.components.NumberStepper; -import haxe.ui.components.Slider; import haxe.ui.backend.flixel.components.SpriteWrapper; import funkin.ui.debug.charting.commands.SetAudioOffsetCommand; import funkin.ui.haxeui.components.WaveformPlayer; -import funkin.audio.waveform.WaveformDataParser; -import haxe.ui.containers.VBox; import haxe.ui.containers.Absolute; import haxe.ui.containers.ScrollView; -import haxe.ui.containers.Frame; import haxe.ui.core.Screen; -import haxe.ui.events.DragEvent; import haxe.ui.events.MouseEvent; import haxe.ui.events.UIEvent; diff --git a/source/funkin/ui/debug/charting/util/ChartEditorDropdowns.hx b/source/funkin/ui/debug/charting/util/ChartEditorDropdowns.hx index 21938b005..30d2247e0 100644 --- a/source/funkin/ui/debug/charting/util/ChartEditorDropdowns.hx +++ b/source/funkin/ui/debug/charting/util/ChartEditorDropdowns.hx @@ -2,7 +2,6 @@ package funkin.ui.debug.charting.util; import funkin.data.notestyle.NoteStyleRegistry; import funkin.play.notes.notestyle.NoteStyle; -import funkin.data.stage.StageData; import funkin.play.event.SongEvent; import funkin.data.stage.StageRegistry; import funkin.play.character.CharacterData; diff --git a/source/funkin/ui/debug/dialogue/ConversationDebugState.hx b/source/funkin/ui/debug/dialogue/ConversationDebugState.hx index db7b35d3e..a0ce22a79 100644 --- a/source/funkin/ui/debug/dialogue/ConversationDebugState.hx +++ b/source/funkin/ui/debug/dialogue/ConversationDebugState.hx @@ -1,20 +1,10 @@ package funkin.ui.debug.dialogue; -import flixel.FlxState; import funkin.modding.events.ScriptEventDispatcher; import funkin.modding.events.ScriptEvent; -import flixel.util.FlxColor; import funkin.ui.MusicBeatState; -import funkin.data.dialogue.conversation.ConversationData; import funkin.data.dialogue.conversation.ConversationRegistry; -import funkin.data.dialogue.dialoguebox.DialogueBoxData; -import funkin.data.dialogue.dialoguebox.DialogueBoxRegistry; -import funkin.data.dialogue.speaker.SpeakerData; -import funkin.data.dialogue.speaker.SpeakerRegistry; -import funkin.data.freeplay.album.AlbumRegistry; import funkin.play.cutscene.dialogue.Conversation; -import funkin.play.cutscene.dialogue.DialogueBox; -import funkin.play.cutscene.dialogue.Speaker; /** * A state with displays a conversation with no background. diff --git a/source/funkin/ui/debug/latency/LatencyState.hx b/source/funkin/ui/debug/latency/LatencyState.hx index b980d3e82..132439eb9 100644 --- a/source/funkin/ui/debug/latency/LatencyState.hx +++ b/source/funkin/ui/debug/latency/LatencyState.hx @@ -2,24 +2,15 @@ package funkin.ui.debug.latency; import funkin.data.notestyle.NoteStyleRegistry; import flixel.FlxSprite; -import flixel.FlxSubState; -import flixel.group.FlxGroup; import flixel.group.FlxGroup.FlxTypedGroup; import flixel.math.FlxMath; import funkin.ui.MusicBeatSubState; import flixel.sound.FlxSound; import flixel.text.FlxText; import flixel.util.FlxColor; -import funkin.audio.visualize.PolygonSpectogram; -import funkin.play.notes.NoteSprite; -import funkin.ui.debug.latency.CoolStatsGraph; -import openfl.events.KeyboardEvent; import funkin.input.PreciseInputManager; import funkin.play.notes.Strumline; import funkin.ui.mainmenu.MainMenuState; -import funkin.play.notes.notestyle.NoteStyle; -import funkin.data.notestyle.NoteStyleData; -import funkin.data.notestyle.NoteStyleRegistry; import funkin.data.song.SongData.SongNoteData; import haxe.Timer; import flixel.FlxCamera; diff --git a/source/funkin/ui/debug/stage/StageBuilderState.hx b/source/funkin/ui/debug/stage/StageBuilderState.hx index b556b9fde..c66fe7095 100644 --- a/source/funkin/ui/debug/stage/StageBuilderState.hx +++ b/source/funkin/ui/debug/stage/StageBuilderState.hx @@ -4,7 +4,6 @@ import flixel.FlxCamera; import flixel.FlxSprite; import flixel.addons.display.FlxGridOverlay; import flixel.group.FlxGroup; -import flixel.input.mouse.FlxMouseButton.FlxMouseButtonID; import flixel.input.mouse.FlxMouseEvent; import flixel.math.FlxPoint; import funkin.ui.MusicBeatState; diff --git a/source/funkin/ui/debug/stage/StageOffsetSubState.hx b/source/funkin/ui/debug/stage/StageOffsetSubState.hx index fa5056220..437ea82b2 100644 --- a/source/funkin/ui/debug/stage/StageOffsetSubState.hx +++ b/source/funkin/ui/debug/stage/StageOffsetSubState.hx @@ -3,21 +3,18 @@ package funkin.ui.debug.stage; import flixel.FlxSprite; import flixel.input.mouse.FlxMouseEvent; import flixel.math.FlxPoint; -import funkin.play.character.BaseCharacter; import funkin.play.PlayState; import funkin.data.stage.StageData; import funkin.play.stage.StageProp; import funkin.graphics.shaders.StrokeShader; import funkin.ui.haxeui.HaxeUISubState; -import funkin.ui.debug.stage.StageEditorCommand; -import funkin.util.SerializerUtil; +import funkin.ui.debug.stage.StageEditorCommand.MovePropCommand; +import funkin.ui.debug.stage.StageEditorCommand.SelectPropCommand; import funkin.data.stage.StageRegistry; import funkin.util.MouseUtil; import haxe.ui.containers.ListView; import haxe.ui.core.Component; -import funkin.graphics.FunkinSprite; import haxe.ui.events.UIEvent; -import haxe.ui.RuntimeComponentBuilder; import openfl.events.Event; import openfl.events.IOErrorEvent; import openfl.net.FileReference; diff --git a/source/funkin/ui/debug/stageeditor/StageEditorObject.hx b/source/funkin/ui/debug/stageeditor/StageEditorObject.hx index 9580ad559..30429fe05 100644 --- a/source/funkin/ui/debug/stageeditor/StageEditorObject.hx +++ b/source/funkin/ui/debug/stageeditor/StageEditorObject.hx @@ -2,7 +2,6 @@ package funkin.ui.debug.stageeditor; import funkin.data.animation.AnimationData; import funkin.graphics.FunkinSprite; -import funkin.modding.events.ScriptEvent; import funkin.graphics.shaders.InverseDotsShader; /** diff --git a/source/funkin/ui/debug/stageeditor/StageEditorState.hx b/source/funkin/ui/debug/stageeditor/StageEditorState.hx index a536a09ee..e66245b24 100644 --- a/source/funkin/ui/debug/stageeditor/StageEditorState.hx +++ b/source/funkin/ui/debug/stageeditor/StageEditorState.hx @@ -19,7 +19,6 @@ import funkin.input.Cursor; import haxe.ui.backend.flixel.UIState; import haxe.ui.containers.menus.MenuItem; import haxe.ui.containers.menus.Menu; -import haxe.ui.containers.menus.MenuSeparator; import haxe.ui.containers.menus.MenuBar; import haxe.ui.containers.menus.MenuOptionBox; import haxe.ui.containers.menus.MenuCheckBox; @@ -31,17 +30,13 @@ import funkin.ui.debug.stageeditor.handlers.UndoRedoHandler.UndoAction; import funkin.ui.debug.stageeditor.toolboxes.*; import funkin.ui.debug.stageeditor.components.*; import haxe.ui.containers.dialogs.Dialogs; -import haxe.ui.containers.dialogs.Dialog; +import haxe.ui.containers.dialogs.Dialog.DialogButton; import haxe.ui.containers.dialogs.MessageBox.MessageBoxType; -import haxe.ui.containers.Box; -import haxe.ui.containers.VBox; // vbucks import haxe.ui.components.Button; import haxe.ui.containers.windows.WindowList; import haxe.ui.containers.windows.WindowManager; -import haxe.ui.containers.windows.Window; import flixel.FlxObject; import haxe.ui.components.Label; -import funkin.ui.mainmenu.MainMenuState; import flixel.system.debug.interaction.tools.Pointer.GraphicCursorCross; import haxe.ui.focus.FocusManager; import haxe.ui.core.Screen; diff --git a/source/funkin/ui/debug/stageeditor/components/FindObjDialog.hx b/source/funkin/ui/debug/stageeditor/components/FindObjDialog.hx index affb862fe..bb5b7ec52 100644 --- a/source/funkin/ui/debug/stageeditor/components/FindObjDialog.hx +++ b/source/funkin/ui/debug/stageeditor/components/FindObjDialog.hx @@ -1,8 +1,6 @@ package funkin.ui.debug.stageeditor.components; import haxe.ui.containers.dialogs.Dialog; -import funkin.play.stage.StageProp; -import funkin.ui.debug.stageeditor.handlers.AssetDataHandler; import haxe.ui.components.TextField; import haxe.ui.components.CheckBox; diff --git a/source/funkin/ui/debug/stageeditor/components/LoadFromUrlDialog.hx b/source/funkin/ui/debug/stageeditor/components/LoadFromUrlDialog.hx index 18f16a70d..28fc08814 100644 --- a/source/funkin/ui/debug/stageeditor/components/LoadFromUrlDialog.hx +++ b/source/funkin/ui/debug/stageeditor/components/LoadFromUrlDialog.hx @@ -7,7 +7,6 @@ import openfl.net.URLLoader; import openfl.net.URLRequest; import openfl.events.Event; import openfl.events.IOErrorEvent; -import openfl.events.ProgressEvent; import openfl.events.SecurityErrorEvent; import openfl.utils.ByteArray; diff --git a/source/funkin/ui/debug/stageeditor/components/NewObjDialog.hx b/source/funkin/ui/debug/stageeditor/components/NewObjDialog.hx index 0ad831731..45632a9a2 100644 --- a/source/funkin/ui/debug/stageeditor/components/NewObjDialog.hx +++ b/source/funkin/ui/debug/stageeditor/components/NewObjDialog.hx @@ -1,16 +1,10 @@ package funkin.ui.debug.stageeditor.components; import haxe.ui.containers.dialogs.Dialog; -import haxe.ui.components.Link; import funkin.ui.debug.stageeditor.handlers.AssetDataHandler; -import funkin.save.Save; -import funkin.util.FileUtil; -import lime.ui.FileDialog; -import flixel.FlxG; import openfl.display.BitmapData; import haxe.ui.notifications.NotificationType; import haxe.ui.notifications.NotificationManager; -import funkin.play.stage.StageProp; @:build(haxe.ui.macros.ComponentMacros.build("assets/exclude/data/ui/stage-editor/dialogs/new-object.xml")) class NewObjDialog extends Dialog diff --git a/source/funkin/ui/debug/stageeditor/components/WelcomeDialog.hx b/source/funkin/ui/debug/stageeditor/components/WelcomeDialog.hx index c20cc5f8a..2794da465 100644 --- a/source/funkin/ui/debug/stageeditor/components/WelcomeDialog.hx +++ b/source/funkin/ui/debug/stageeditor/components/WelcomeDialog.hx @@ -4,12 +4,9 @@ import haxe.ui.containers.dialogs.Dialog; import haxe.ui.containers.dialogs.Dialogs; import haxe.ui.containers.dialogs.MessageBox.MessageBoxType; import haxe.ui.components.Link; -import funkin.ui.debug.stageeditor.handlers.StageDataHandler; import funkin.save.Save; import funkin.util.FileUtil; -import lime.ui.FileDialog; import flixel.FlxG; -import funkin.input.Cursor; import funkin.data.stage.StageData; import funkin.data.stage.StageRegistry; import funkin.ui.debug.stageeditor.StageEditorState.StageEditorDialogType; diff --git a/source/funkin/ui/debug/stageeditor/handlers/AssetDataHandler.hx b/source/funkin/ui/debug/stageeditor/handlers/AssetDataHandler.hx index a6f57bd7c..a3b659225 100644 --- a/source/funkin/ui/debug/stageeditor/handlers/AssetDataHandler.hx +++ b/source/funkin/ui/debug/stageeditor/handlers/AssetDataHandler.hx @@ -1,13 +1,9 @@ package funkin.ui.debug.stageeditor.handlers; -import flixel.FlxG; import openfl.display.BitmapData; import flixel.FlxSprite; import flixel.util.FlxColor; -import flixel.graphics.frames.FlxAtlasFrames; -import flixel.math.FlxRect; import openfl.display.BlendMode; -import flixel.math.FlxPoint; import funkin.data.stage.StageData.StageDataProp; using StringTools; diff --git a/source/funkin/ui/debug/stageeditor/handlers/StageDataHandler.hx b/source/funkin/ui/debug/stageeditor/handlers/StageDataHandler.hx index 56dc7a775..e22657881 100644 --- a/source/funkin/ui/debug/stageeditor/handlers/StageDataHandler.hx +++ b/source/funkin/ui/debug/stageeditor/handlers/StageDataHandler.hx @@ -1,10 +1,8 @@ package funkin.ui.debug.stageeditor.handlers; -import funkin.ui.debug.stageeditor.handlers.AssetDataHandler; import haxe.io.Bytes; import funkin.util.FileUtil; import openfl.display.BitmapData; -import haxe.Json; import haxe.zip.Entry; import funkin.play.character.BaseCharacter.CharacterType; import funkin.play.character.BaseCharacter; diff --git a/source/funkin/ui/debug/stageeditor/toolboxes/StageEditorCharacterToolbox.hx b/source/funkin/ui/debug/stageeditor/toolboxes/StageEditorCharacterToolbox.hx index cd01f1fca..0194f3dcd 100644 --- a/source/funkin/ui/debug/stageeditor/toolboxes/StageEditorCharacterToolbox.hx +++ b/source/funkin/ui/debug/stageeditor/toolboxes/StageEditorCharacterToolbox.hx @@ -1,18 +1,12 @@ package funkin.ui.debug.stageeditor.toolboxes; import haxe.ui.components.NumberStepper; -import funkin.play.character.BaseCharacter; import funkin.play.character.BaseCharacter.CharacterType; import funkin.play.character.CharacterData.CharacterDataParser; import funkin.util.SortUtil; -import haxe.ui.data.ArrayDataSource; -import haxe.ui.components.DropDown; import haxe.ui.components.Button; import haxe.ui.components.Slider; -import haxe.ui.components.Label; -import funkin.ui.debug.stageeditor.handlers.StageDataHandler; import haxe.ui.containers.menus.Menu; -import haxe.ui.containers.ScrollView; import haxe.ui.core.Screen; import flixel.tweens.FlxTween; import flixel.tweens.FlxEase; diff --git a/source/funkin/ui/debug/stageeditor/toolboxes/StageEditorObjectToolbox.hx b/source/funkin/ui/debug/stageeditor/toolboxes/StageEditorObjectToolbox.hx index 36dd127ec..6987138bd 100644 --- a/source/funkin/ui/debug/stageeditor/toolboxes/StageEditorObjectToolbox.hx +++ b/source/funkin/ui/debug/stageeditor/toolboxes/StageEditorObjectToolbox.hx @@ -14,17 +14,13 @@ import flixel.graphics.frames.FlxAtlasFrames; import haxe.ui.components.DropDown; import haxe.ui.containers.ListView; import haxe.ui.components.CheckBox; -import haxe.ui.components.Switch; import flixel.util.FlxTimer; import haxe.ui.data.ArrayDataSource; -import haxe.ui.events.ItemEvent; import haxe.ui.components.ColorPicker; import flixel.util.FlxColor; import haxe.ui.util.Color; import flixel.graphics.frames.FlxFrame; -import flixel.animation.FlxAnimation; import funkin.util.FileUtil; -import funkin.ui.debug.stageeditor.components.LoadFromUrlDialog; import openfl.display.BitmapData; using StringTools; diff --git a/source/funkin/ui/freeplay/AlbumRoll.hx b/source/funkin/ui/freeplay/AlbumRoll.hx index 7c2486c75..ed797e202 100644 --- a/source/funkin/ui/freeplay/AlbumRoll.hx +++ b/source/funkin/ui/freeplay/AlbumRoll.hx @@ -1,14 +1,10 @@ package funkin.ui.freeplay; import funkin.graphics.adobeanimate.FlxAtlasSprite; -import flixel.FlxSprite; import flixel.group.FlxSpriteGroup; import flixel.util.FlxSort; -import flixel.tweens.FlxTween; import flixel.util.FlxTimer; -import flixel.tweens.FlxEase; import funkin.data.freeplay.album.AlbumRegistry; -import funkin.util.assets.FlxAnimationUtil; import funkin.graphics.FunkinSprite; import funkin.util.SortUtil; diff --git a/source/funkin/ui/freeplay/BGScrollingText.hx b/source/funkin/ui/freeplay/BGScrollingText.hx index 5511959f5..cfcdd39ac 100644 --- a/source/funkin/ui/freeplay/BGScrollingText.hx +++ b/source/funkin/ui/freeplay/BGScrollingText.hx @@ -1,13 +1,9 @@ package funkin.ui.freeplay; import flixel.FlxObject; -import flixel.group.FlxGroup.FlxTypedGroup; import flixel.group.FlxSpriteGroup; -import flixel.math.FlxMath; import flixel.text.FlxText; -import flixel.util.FlxColor; import flixel.util.FlxSort; -import flixel.util.FlxTimer; // its kinda like marqeee html lol! class BGScrollingText extends FlxSpriteGroup diff --git a/source/funkin/ui/freeplay/FreeplayDJ.hx b/source/funkin/ui/freeplay/FreeplayDJ.hx index 485a7421f..e41cf53af 100644 --- a/source/funkin/ui/freeplay/FreeplayDJ.hx +++ b/source/funkin/ui/freeplay/FreeplayDJ.hx @@ -1,15 +1,10 @@ package funkin.ui.freeplay; -import flixel.FlxSprite; import flixel.util.FlxSignal; -import funkin.util.assets.FlxAnimationUtil; import funkin.graphics.adobeanimate.FlxAtlasSprite; import funkin.audio.FunkinSound; -import flixel.util.FlxTimer; import funkin.data.freeplay.player.PlayerRegistry; import funkin.data.freeplay.player.PlayerData.PlayerFreeplayDJData; -import funkin.audio.FunkinSound; -import funkin.audio.FlxStreamSound; class FreeplayDJ extends FlxAtlasSprite { diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx index 32cba476b..91ebef25d 100644 --- a/source/funkin/ui/freeplay/FreeplayState.hx +++ b/source/funkin/ui/freeplay/FreeplayState.hx @@ -4,31 +4,25 @@ import funkin.ui.freeplay.backcards.*; import flixel.addons.transition.FlxTransitionableState; import flixel.FlxCamera; import flixel.FlxSprite; -import flixel.group.FlxGroup; import flixel.group.FlxGroup.FlxTypedGroup; import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; import flixel.input.touch.FlxTouch; import flixel.math.FlxAngle; import flixel.math.FlxMath; import flixel.math.FlxPoint; -import flixel.system.debug.watch.Tracker.TrackerProfile; import flixel.text.FlxText; import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; -import flixel.tweens.misc.ShakeTween; import flixel.util.FlxColor; -import flixel.util.FlxSpriteUtil; import flixel.util.FlxTimer; import funkin.audio.FunkinSound; import funkin.data.freeplay.player.PlayerRegistry; import funkin.data.song.SongRegistry; import funkin.data.story.level.LevelRegistry; import funkin.effects.IntervalShake; -import funkin.graphics.adobeanimate.FlxAtlasSprite; import funkin.graphics.FunkinCamera; import funkin.graphics.FunkinSprite; import funkin.graphics.shaders.AngleMask; -import funkin.graphics.shaders.GaussianBlurShader; import funkin.graphics.shaders.HSVShader; import funkin.graphics.shaders.PureColor; import funkin.graphics.shaders.BlueFade; @@ -36,14 +30,12 @@ import funkin.graphics.shaders.StrokeShader; import openfl.filters.ShaderFilter; import funkin.input.Controls; import funkin.play.PlayStatePlaylist; -import funkin.play.scoring.Scoring; import funkin.play.scoring.Scoring.ScoringRank; import funkin.play.song.Song; import funkin.save.Save; import funkin.save.Save.SaveScoreData; import funkin.ui.AtlasText; import funkin.ui.freeplay.charselect.PlayableCharacter; -import funkin.ui.freeplay.SongMenuItem.FreeplayRank; import funkin.ui.mainmenu.MainMenuState; import funkin.ui.MusicBeatSubState; import funkin.ui.story.Level; @@ -53,7 +45,6 @@ import funkin.util.MathUtil; import funkin.util.SortUtil; import openfl.display.BlendMode; import funkin.data.freeplay.style.FreeplayStyleRegistry; -import funkin.data.song.SongData.SongMusicData; #if FEATURE_DISCORD_RPC import funkin.api.discord.DiscordClient; #end diff --git a/source/funkin/ui/freeplay/FreeplayStyle.hx b/source/funkin/ui/freeplay/FreeplayStyle.hx index 5ced51e1c..aabefa642 100644 --- a/source/funkin/ui/freeplay/FreeplayStyle.hx +++ b/source/funkin/ui/freeplay/FreeplayStyle.hx @@ -2,7 +2,6 @@ package funkin.ui.freeplay; import funkin.data.freeplay.style.FreeplayStyleData; import funkin.data.freeplay.style.FreeplayStyleRegistry; -import funkin.data.animation.AnimationData; import funkin.data.IRegistryEntry; import flixel.graphics.FlxGraphic; import flixel.util.FlxColor; diff --git a/source/funkin/ui/freeplay/LetterSort.hx b/source/funkin/ui/freeplay/LetterSort.hx index 049e9194a..0530feb7f 100644 --- a/source/funkin/ui/freeplay/LetterSort.hx +++ b/source/funkin/ui/freeplay/LetterSort.hx @@ -1,12 +1,7 @@ package funkin.ui.freeplay; import flixel.FlxSprite; -import flixel.group.FlxGroup.FlxTypedGroup; -import flixel.group.FlxGroup; import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; -import flixel.tweens.FlxTween; -import flixel.tweens.FlxEase; -import flixel.util.FlxColor; import flixel.util.FlxTimer; import funkin.input.Controls; import funkin.graphics.adobeanimate.FlxAtlasSprite; diff --git a/source/funkin/ui/freeplay/SongMenuItem.hx b/source/funkin/ui/freeplay/SongMenuItem.hx index 3db958bb5..1176b16e4 100644 --- a/source/funkin/ui/freeplay/SongMenuItem.hx +++ b/source/funkin/ui/freeplay/SongMenuItem.hx @@ -5,24 +5,17 @@ import funkin.graphics.shaders.HSVShader; import funkin.graphics.shaders.GaussianBlurShader; import flixel.group.FlxGroup; import flixel.FlxSprite; -import flixel.graphics.frames.FlxAtlasFrames; -import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; import flixel.group.FlxSpriteGroup; -import flixel.math.FlxMath; import flixel.math.FlxPoint; -import flixel.text.FlxText; import flixel.util.FlxTimer; import funkin.util.MathUtil; import funkin.graphics.shaders.Grayscale; -import funkin.graphics.shaders.GaussianBlurShader; import openfl.display.BlendMode; import funkin.graphics.FunkinSprite; import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; import flixel.addons.effects.FlxTrail; import funkin.play.scoring.Scoring.ScoringRank; -import funkin.save.Save; -import funkin.save.Save.SaveScoreData; import flixel.util.FlxColor; import funkin.ui.PixelatedIcon; diff --git a/source/funkin/ui/freeplay/backcards/BackingCard.hx b/source/funkin/ui/freeplay/backcards/BackingCard.hx index aa4be199d..a071a56fb 100644 --- a/source/funkin/ui/freeplay/backcards/BackingCard.hx +++ b/source/funkin/ui/freeplay/backcards/BackingCard.hx @@ -1,23 +1,14 @@ package funkin.ui.freeplay.backcards; import funkin.ui.freeplay.FreeplayState; -import flixel.FlxCamera; import flixel.FlxSprite; -import flixel.group.FlxGroup; -import flixel.group.FlxGroup.FlxTypedGroup; -import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; -import flixel.math.FlxAngle; import flixel.math.FlxPoint; -import flixel.text.FlxText; import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; -import flixel.util.FlxColor; import flixel.util.FlxSpriteUtil; -import flixel.util.FlxTimer; import funkin.graphics.adobeanimate.FlxAtlasSprite; import funkin.graphics.FunkinSprite; import funkin.ui.freeplay.charselect.PlayableCharacter; -import funkin.ui.MusicBeatSubState; import openfl.display.BlendMode; import flixel.group.FlxSpriteGroup; diff --git a/source/funkin/ui/freeplay/backcards/BoyfriendCard.hx b/source/funkin/ui/freeplay/backcards/BoyfriendCard.hx index a049c4f42..fab4b0811 100644 --- a/source/funkin/ui/freeplay/backcards/BoyfriendCard.hx +++ b/source/funkin/ui/freeplay/backcards/BoyfriendCard.hx @@ -1,25 +1,12 @@ package funkin.ui.freeplay.backcards; import funkin.ui.freeplay.FreeplayState; -import flixel.FlxCamera; import flixel.FlxSprite; -import flixel.group.FlxGroup; -import flixel.group.FlxGroup.FlxTypedGroup; -import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; -import flixel.math.FlxAngle; -import flixel.math.FlxPoint; -import flixel.text.FlxText; import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; -import flixel.util.FlxColor; import flixel.util.FlxSpriteUtil; -import flixel.util.FlxTimer; -import funkin.graphics.adobeanimate.FlxAtlasSprite; -import funkin.graphics.FunkinSprite; import funkin.ui.freeplay.charselect.PlayableCharacter; -import funkin.ui.MusicBeatSubState; import openfl.display.BlendMode; -import flixel.group.FlxSpriteGroup; class BoyfriendCard extends BackingCard { diff --git a/source/funkin/ui/freeplay/backcards/NewCharacterCard.hx b/source/funkin/ui/freeplay/backcards/NewCharacterCard.hx index 1e3d81299..68df8e6c3 100644 --- a/source/funkin/ui/freeplay/backcards/NewCharacterCard.hx +++ b/source/funkin/ui/freeplay/backcards/NewCharacterCard.hx @@ -1,30 +1,13 @@ package funkin.ui.freeplay.backcards; import funkin.ui.freeplay.FreeplayState; -import flash.display.BitmapData; -import flixel.FlxCamera; import flixel.math.FlxMath; import flixel.FlxSprite; -import flixel.group.FlxGroup; -import flixel.group.FlxGroup.FlxTypedGroup; -import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; -import flixel.math.FlxAngle; -import flixel.math.FlxPoint; -import flixel.text.FlxText; import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; import flixel.util.FlxColor; -import flixel.util.FlxSpriteUtil; -import flixel.util.FlxTimer; import funkin.graphics.adobeanimate.FlxAtlasSprite; -import funkin.graphics.FunkinSprite; -import funkin.ui.freeplay.charselect.PlayableCharacter; -import funkin.ui.MusicBeatSubState; import openfl.display.BlendMode; -import flixel.group.FlxSpriteGroup; -import funkin.graphics.shaders.AdjustColorShader; -import flixel.addons.display.FlxTiledSprite; -import flixel.addons.display.FlxBackdrop; class NewCharacterCard extends BackingCard { diff --git a/source/funkin/ui/freeplay/backcards/PicoCard.hx b/source/funkin/ui/freeplay/backcards/PicoCard.hx index bc439df94..429b7b19b 100644 --- a/source/funkin/ui/freeplay/backcards/PicoCard.hx +++ b/source/funkin/ui/freeplay/backcards/PicoCard.hx @@ -1,29 +1,13 @@ package funkin.ui.freeplay.backcards; import funkin.ui.freeplay.FreeplayState; -import flash.display.BitmapData; -import flixel.FlxCamera; import flixel.math.FlxMath; import flixel.FlxSprite; -import flixel.group.FlxGroup; -import flixel.group.FlxGroup.FlxTypedGroup; -import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; -import flixel.math.FlxAngle; -import flixel.math.FlxPoint; -import flixel.text.FlxText; import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; -import flixel.util.FlxColor; -import flixel.util.FlxSpriteUtil; import flixel.util.FlxTimer; import funkin.graphics.adobeanimate.FlxAtlasSprite; -import funkin.graphics.FunkinSprite; -import funkin.ui.freeplay.charselect.PlayableCharacter; -import funkin.ui.MusicBeatSubState; import openfl.display.BlendMode; -import flixel.group.FlxSpriteGroup; -import funkin.graphics.shaders.AdjustColorShader; -import flixel.addons.display.FlxTiledSprite; import flixel.addons.display.FlxBackdrop; class PicoCard extends BackingCard diff --git a/source/funkin/ui/haxeui/FlxGamepadActionInputSource.hx b/source/funkin/ui/haxeui/FlxGamepadActionInputSource.hx index 9c2901d16..731f28211 100644 --- a/source/funkin/ui/haxeui/FlxGamepadActionInputSource.hx +++ b/source/funkin/ui/haxeui/FlxGamepadActionInputSource.hx @@ -2,7 +2,6 @@ package funkin.ui.haxeui; import flixel.FlxBasic; import flixel.input.gamepad.FlxGamepad; -import haxe.ui.actions.IActionInputSource; /** * Receives button presses from the Flixel gamepad and emits HaxeUI events. diff --git a/source/funkin/ui/haxeui/HaxeUISubState.hx b/source/funkin/ui/haxeui/HaxeUISubState.hx index ac53f4b51..ed742648d 100644 --- a/source/funkin/ui/haxeui/HaxeUISubState.hx +++ b/source/funkin/ui/haxeui/HaxeUISubState.hx @@ -4,7 +4,6 @@ import haxe.ui.RuntimeComponentBuilder; import haxe.ui.components.CheckBox; import haxe.ui.containers.menus.MenuCheckBox; import haxe.ui.core.Component; -import funkin.ui.MusicBeatState; import funkin.ui.mainmenu.MainMenuState; import funkin.ui.MusicBeatSubState; import haxe.ui.events.MouseEvent; diff --git a/source/funkin/ui/haxeui/components/CharacterPlayer.hx b/source/funkin/ui/haxeui/components/CharacterPlayer.hx index f1b871f3f..def110e8e 100644 --- a/source/funkin/ui/haxeui/components/CharacterPlayer.hx +++ b/source/funkin/ui/haxeui/components/CharacterPlayer.hx @@ -5,7 +5,6 @@ import funkin.modding.events.ScriptEvent.NoteScriptEvent; import funkin.modding.events.ScriptEvent.HitNoteScriptEvent; import funkin.modding.events.ScriptEvent.SongTimeScriptEvent; import funkin.modding.events.ScriptEvent.UpdateScriptEvent; -import haxe.ui.core.IDataComponent; import funkin.play.character.BaseCharacter; import funkin.play.character.CharacterData.CharacterDataParser; import haxe.ui.containers.Box; diff --git a/source/funkin/ui/mainmenu/MainMenuState.hx b/source/funkin/ui/mainmenu/MainMenuState.hx index bc59de28f..1e02e5740 100644 --- a/source/funkin/ui/mainmenu/MainMenuState.hx +++ b/source/funkin/ui/mainmenu/MainMenuState.hx @@ -1,28 +1,22 @@ package funkin.ui.mainmenu; -import funkin.graphics.FunkinSprite; import flixel.addons.transition.FlxTransitionableState; import funkin.ui.debug.DebugMenuSubState; import flixel.FlxObject; import flixel.FlxSprite; -import flixel.FlxState; -import flixel.addons.transition.FlxTransitionableState; import flixel.effects.FlxFlicker; -import flixel.graphics.frames.FlxAtlasFrames; import flixel.util.typeLimit.NextState; -import flixel.group.FlxGroup.FlxTypedGroup; import flixel.input.touch.FlxTouch; -import flixel.text.FlxText; -import funkin.data.song.SongData.SongMusicData; import flixel.tweens.FlxEase; import funkin.graphics.FunkinCamera; import funkin.audio.FunkinSound; import flixel.tweens.FlxTween; import funkin.ui.MusicBeatState; import flixel.util.FlxTimer; -import funkin.ui.AtlasMenuList; +import funkin.ui.AtlasMenuList.AtlasMenuItem; import funkin.ui.freeplay.FreeplayState; -import funkin.ui.MenuList; +import funkin.ui.MenuList.MenuTypedList; +import funkin.ui.MenuList.MenuListItem; import funkin.ui.title.TitleState; import funkin.ui.story.StoryMenuState; import funkin.ui.Prompt; diff --git a/source/funkin/ui/options/ControlsMenu.hx b/source/funkin/ui/options/ControlsMenu.hx index 3d68485a5..b67e9d92e 100644 --- a/source/funkin/ui/options/ControlsMenu.hx +++ b/source/funkin/ui/options/ControlsMenu.hx @@ -3,16 +3,15 @@ package funkin.ui.options; import funkin.util.InputUtil; import flixel.FlxCamera; import flixel.FlxObject; -import flixel.FlxSprite; import funkin.graphics.FunkinCamera; -import flixel.group.FlxGroup; -import flixel.input.actions.FlxActionInput; +import flixel.group.FlxGroup.FlxTypedGroup; import flixel.input.gamepad.FlxGamepadInputID; import flixel.input.keyboard.FlxKey; import funkin.graphics.FunkinSprite; -import funkin.input.Controls; +import funkin.input.Controls.Device; +import funkin.input.Controls.Control; import funkin.ui.AtlasText; -import funkin.ui.MenuList; +import funkin.ui.MenuList.MenuTypedList; import funkin.ui.TextMenuList; class ControlsMenu extends funkin.ui.options.OptionsState.Page @@ -209,7 +208,7 @@ class ControlsMenu extends funkin.ui.options.OptionsState.Page prompt.exists = true; } - function goToDeviceList() + function goToDeviceList():Void { controlGrid.selectedItem.idle(); labels.members[Std.int(controlGrid.selectedIndex / COLUMNS)].alpha = 0.6; @@ -220,7 +219,7 @@ class ControlsMenu extends funkin.ui.options.OptionsState.Page deviceListSelected = true; } - function selectDevice(device:Device) + function selectDevice(device:Device):Void { currentDevice = device; diff --git a/source/funkin/ui/options/FunkinSoundTray.hx b/source/funkin/ui/options/FunkinSoundTray.hx index 5a5bf1d6c..d4cc3b0ea 100644 --- a/source/funkin/ui/options/FunkinSoundTray.hx +++ b/source/funkin/ui/options/FunkinSoundTray.hx @@ -1,11 +1,7 @@ package funkin.ui.options; import flixel.system.ui.FlxSoundTray; -import flixel.tweens.FlxTween; -import flixel.system.FlxAssets; -import flixel.tweens.FlxEase; import openfl.display.Bitmap; -import openfl.display.BitmapData; import funkin.util.MathUtil; /** diff --git a/source/funkin/ui/options/ModMenu.hx b/source/funkin/ui/options/ModMenu.hx index 574a93c49..f2afa7e3a 100644 --- a/source/funkin/ui/options/ModMenu.hx +++ b/source/funkin/ui/options/ModMenu.hx @@ -4,7 +4,7 @@ import funkin.modding.PolymodHandler; import flixel.group.FlxGroup.FlxTypedGroup; import flixel.text.FlxText; import flixel.util.FlxColor; -import polymod.Polymod; +import polymod.Polymod.ModMetadata; import funkin.ui.options.OptionsState.Page; class ModMenu extends Page diff --git a/source/funkin/ui/options/OptionsState.hx b/source/funkin/ui/options/OptionsState.hx index e64f5944b..841a17431 100644 --- a/source/funkin/ui/options/OptionsState.hx +++ b/source/funkin/ui/options/OptionsState.hx @@ -4,15 +4,12 @@ import funkin.ui.transition.LoadingState; import funkin.ui.debug.latency.LatencyState; import flixel.FlxSprite; import flixel.FlxSubState; -import flixel.addons.transition.FlxTransitionableState; import flixel.group.FlxGroup; import flixel.util.FlxSignal; import funkin.audio.FunkinSound; import funkin.ui.mainmenu.MainMenuState; import funkin.ui.MusicBeatState; import funkin.graphics.shaders.HSVShader; -import funkin.util.WindowUtil; -import funkin.audio.FunkinSound; import funkin.input.Controls; #if FEATURE_NEWGROUNDS import funkin.api.newgrounds.NewgroundsClient; diff --git a/source/funkin/ui/options/PreferencesMenu.hx b/source/funkin/ui/options/PreferencesMenu.hx index adf8855c7..77007952b 100644 --- a/source/funkin/ui/options/PreferencesMenu.hx +++ b/source/funkin/ui/options/PreferencesMenu.hx @@ -11,8 +11,6 @@ import funkin.ui.options.OptionsState.Page; import funkin.graphics.FunkinCamera; import funkin.graphics.FunkinSprite; import funkin.ui.TextMenuList.TextMenuItem; -import funkin.audio.FunkinSound; -import funkin.ui.options.MenuItemEnums; import funkin.ui.options.items.CheckboxPreferenceItem; import funkin.ui.options.items.NumberPreferenceItem; import funkin.ui.options.items.EnumPreferenceItem; diff --git a/source/funkin/ui/options/items/EnumPreferenceItem.hx b/source/funkin/ui/options/items/EnumPreferenceItem.hx index 0054d3efe..6e7a7ab39 100644 --- a/source/funkin/ui/options/items/EnumPreferenceItem.hx +++ b/source/funkin/ui/options/items/EnumPreferenceItem.hx @@ -1,10 +1,8 @@ package funkin.ui.options.items; -import funkin.ui.TextMenuList; +import funkin.ui.TextMenuList.TextMenuItem; import funkin.ui.AtlasText; import funkin.input.Controls; -import funkin.ui.options.MenuItemEnums; -import haxe.EnumTools; /** * Preference item that allows the player to pick a value from an enum (list of values) diff --git a/source/funkin/ui/options/items/NumberPreferenceItem.hx b/source/funkin/ui/options/items/NumberPreferenceItem.hx index e53951df7..028ca1ecd 100644 --- a/source/funkin/ui/options/items/NumberPreferenceItem.hx +++ b/source/funkin/ui/options/items/NumberPreferenceItem.hx @@ -1,6 +1,6 @@ package funkin.ui.options.items; -import funkin.ui.TextMenuList; +import funkin.ui.TextMenuList.TextMenuItem; import funkin.ui.AtlasText; import funkin.input.Controls; diff --git a/source/funkin/ui/story/LevelProp.hx b/source/funkin/ui/story/LevelProp.hx index dfb11dd20..167cda5a6 100644 --- a/source/funkin/ui/story/LevelProp.hx +++ b/source/funkin/ui/story/LevelProp.hx @@ -2,7 +2,7 @@ package funkin.ui.story; import funkin.play.stage.Bopper; import funkin.util.assets.FlxAnimationUtil; -import funkin.data.story.level.LevelData; +import funkin.data.story.level.LevelData.LevelPropData; class LevelProp extends Bopper { diff --git a/source/funkin/ui/story/LevelTitle.hx b/source/funkin/ui/story/LevelTitle.hx index 2be2da154..6e5fb6c04 100644 --- a/source/funkin/ui/story/LevelTitle.hx +++ b/source/funkin/ui/story/LevelTitle.hx @@ -1,7 +1,6 @@ package funkin.ui.story; import flixel.FlxSprite; -import flixel.graphics.frames.FlxAtlasFrames; import flixel.group.FlxSpriteGroup; import flixel.util.FlxColor; import funkin.util.MathUtil; @@ -44,6 +43,7 @@ class LevelTitle extends FlxSpriteGroup } public var isFlashing:Bool = false; + var flashTick:Float = 0; final flashFramerate:Float = 20; diff --git a/source/funkin/ui/title/TitleState.hx b/source/funkin/ui/title/TitleState.hx index a2b356814..247b56934 100644 --- a/source/funkin/ui/title/TitleState.hx +++ b/source/funkin/ui/title/TitleState.hx @@ -1,7 +1,6 @@ package funkin.ui.title; import flixel.FlxSprite; -import flixel.FlxState; import flixel.group.FlxGroup; import flixel.input.gamepad.FlxGamepad; import flixel.tweens.FlxEase; @@ -13,13 +12,10 @@ import flixel.util.typeLimit.NextState; import funkin.audio.visualize.SpectogramSprite; import funkin.graphics.shaders.ColorSwap; import funkin.graphics.shaders.LeftMaskShader; -import funkin.data.song.SongRegistry; import funkin.graphics.FunkinSprite; import funkin.ui.MusicBeatState; -import funkin.data.song.SongData.SongMusicData; import funkin.graphics.shaders.TitleOutline; import funkin.audio.FunkinSound; -import funkin.ui.freeplay.FreeplayState; import funkin.ui.AtlasText; import openfl.Assets; import openfl.display.Sprite; @@ -27,11 +23,8 @@ import openfl.events.AsyncErrorEvent; import funkin.ui.mainmenu.MainMenuState; import openfl.events.MouseEvent; import openfl.events.NetStatusEvent; -import funkin.ui.freeplay.FreeplayState; import openfl.media.Video; import openfl.net.NetStream; -import openfl.display.BlendMode; -import funkin.save.Save; #if FEATURE_NEWGROUNDS import funkin.api.newgrounds.Medals; #end diff --git a/source/funkin/ui/transition/LoadingState.hx b/source/funkin/ui/transition/LoadingState.hx index 26bc9e304..90d4936ae 100644 --- a/source/funkin/ui/transition/LoadingState.hx +++ b/source/funkin/ui/transition/LoadingState.hx @@ -11,7 +11,6 @@ import funkin.graphics.shaders.ScreenWipeShader; import funkin.play.PlayState; import funkin.play.PlayStatePlaylist; import funkin.play.song.Song.SongDifficulty; -import funkin.ui.MusicBeatState; import haxe.io.Path; import lime.app.Future; import lime.app.Promise; diff --git a/source/funkin/ui/transition/StickerSubState.hx b/source/funkin/ui/transition/StickerSubState.hx index eba037954..5a17d6e11 100644 --- a/source/funkin/ui/transition/StickerSubState.hx +++ b/source/funkin/ui/transition/StickerSubState.hx @@ -1,25 +1,17 @@ package funkin.ui.transition; -import flixel.FlxSprite; import haxe.Json; import funkin.graphics.FunkinSprite; // import flxtyped group import funkin.ui.MusicBeatSubState; -import funkin.ui.story.StoryMenuState; import flixel.group.FlxGroup.FlxTypedGroup; import flixel.util.FlxTimer; import flixel.FlxG; import flixel.math.FlxMath; import flixel.util.FlxSort; -import flixel.util.FlxSignal; import funkin.ui.mainmenu.MainMenuState; import flixel.addons.transition.FlxTransitionableState; -import openfl.display.BitmapData; -import funkin.ui.freeplay.FreeplayState; -import openfl.geom.Matrix; import funkin.audio.FunkinSound; -import openfl.display.Sprite; -import openfl.display.Bitmap; import flixel.FlxState; using Lambda; diff --git a/source/funkin/ui/transition/preload/FunkinPreloader.hx b/source/funkin/ui/transition/preload/FunkinPreloader.hx index e81bfbc4b..61ca4c718 100644 --- a/source/funkin/ui/transition/preload/FunkinPreloader.hx +++ b/source/funkin/ui/transition/preload/FunkinPreloader.hx @@ -1,22 +1,12 @@ package funkin.ui.transition.preload; -import openfl.filters.GlowFilter; -import openfl.display.SpreadMethod; -import openfl.display.GradientType; -import openfl.geom.Matrix; -import openfl.filters.BlurFilter; import openfl.events.MouseEvent; import flash.display.Bitmap; import flash.display.BitmapData; -import flash.display.BlendMode; import flash.display.Sprite; import flash.Lib; import flixel.system.FlxBasePreloader; -import funkin.modding.PolymodHandler; -import funkin.play.character.CharacterData.CharacterDataParser; import funkin.util.MathUtil; -import lime.app.Future; -import lime.math.Rectangle; import openfl.display.Sprite; import openfl.text.TextField; import openfl.text.TextFormat; diff --git a/source/funkin/ui/transition/preload/VFDOverlay.hx b/source/funkin/ui/transition/preload/VFDOverlay.hx index 1792c56ec..19c94097a 100644 --- a/source/funkin/ui/transition/preload/VFDOverlay.hx +++ b/source/funkin/ui/transition/preload/VFDOverlay.hx @@ -1,7 +1,5 @@ package funkin.ui.transition.preload; -import flixel.tweens.FlxEase; -import flixel.tweens.FlxTween; import openfl.display.GraphicsShader; class VFDOverlay extends GraphicsShader diff --git a/source/funkin/util/FlxGamepadUtil.hx b/source/funkin/util/FlxGamepadUtil.hx index 7e72e7138..4fea7500b 100644 --- a/source/funkin/util/FlxGamepadUtil.hx +++ b/source/funkin/util/FlxGamepadUtil.hx @@ -3,7 +3,6 @@ package funkin.util; import flixel.input.gamepad.FlxGamepad; import flixel.input.gamepad.FlxGamepadInputID; import lime.ui.Gamepad as LimeGamepad; -import lime.ui.GamepadAxis as LimeGamepadAxis; import lime.ui.GamepadButton as LimeGamepadButton; /** diff --git a/source/funkin/util/FlxTweenUtil.hx b/source/funkin/util/FlxTweenUtil.hx index 57c8f0cfe..4a8806bf8 100644 --- a/source/funkin/util/FlxTweenUtil.hx +++ b/source/funkin/util/FlxTweenUtil.hx @@ -1,8 +1,6 @@ package funkin.util; -import flixel.addons.plugin.taskManager.FlxTask; import flixel.tweens.FlxTween; -import flixel.tweens.FlxEase; class FlxTweenUtil { diff --git a/source/funkin/util/InputUtil.hx b/source/funkin/util/InputUtil.hx index 989c87828..8f4fcc55f 100644 --- a/source/funkin/util/InputUtil.hx +++ b/source/funkin/util/InputUtil.hx @@ -1,8 +1,7 @@ package funkin.util; -import funkin.input.Controls; +import funkin.input.Controls.Device; import flixel.input.gamepad.FlxGamepad; -import flixel.input.gamepad.FlxGamepadInputID; import flixel.input.keyboard.FlxKey; using flixel.util.FlxStringUtil; diff --git a/source/funkin/util/ReflectUtil.hx b/source/funkin/util/ReflectUtil.hx index 570503863..97fad63a4 100644 --- a/source/funkin/util/ReflectUtil.hx +++ b/source/funkin/util/ReflectUtil.hx @@ -1,6 +1,6 @@ package funkin.util; -import Type; +import Type.ValueType; class ReflectUtil { diff --git a/source/funkin/util/SerializerUtil.hx b/source/funkin/util/SerializerUtil.hx index c87d3f6c0..b94a1066e 100644 --- a/source/funkin/util/SerializerUtil.hx +++ b/source/funkin/util/SerializerUtil.hx @@ -2,7 +2,6 @@ package funkin.util; import haxe.Json; import haxe.io.Bytes; -import thx.semver.Version; typedef ScoreInput = { diff --git a/source/funkin/util/VersionUtil.hx b/source/funkin/util/VersionUtil.hx index 9bf46a188..475275cb3 100644 --- a/source/funkin/util/VersionUtil.hx +++ b/source/funkin/util/VersionUtil.hx @@ -1,7 +1,6 @@ package funkin.util; -import thx.semver.Version; -import thx.semver.VersionRule; +import thx.semver.Version.Identifier.StringId; /** * Utility functions for operating on semantic versions. diff --git a/source/funkin/util/macro/ClassMacro.hx b/source/funkin/util/macro/ClassMacro.hx index 59d96e2a8..0918d4085 100644 --- a/source/funkin/util/macro/ClassMacro.hx +++ b/source/funkin/util/macro/ClassMacro.hx @@ -2,8 +2,7 @@ package funkin.util.macro; import haxe.macro.Context; import haxe.macro.Expr; -import haxe.macro.Type; -import funkin.util.macro.MacroUtil; +import haxe.macro.Type.ClassType; /** * Macros to generate lists of classes at compile time. diff --git a/source/funkin/util/plugins/NewgroundsMedalPlugin.hx b/source/funkin/util/plugins/NewgroundsMedalPlugin.hx index d9756b039..4b3cb2780 100644 --- a/source/funkin/util/plugins/NewgroundsMedalPlugin.hx +++ b/source/funkin/util/plugins/NewgroundsMedalPlugin.hx @@ -7,7 +7,6 @@ import funkin.audio.FunkinSound; import flixel.graphics.FlxGraphic; import funkin.graphics.adobeanimate.FlxAtlasSprite; import flixel.math.FlxRect; -import flixel.util.FlxTimer; import funkin.api.newgrounds.Medals; class NewgroundsMedalPlugin extends FlxTypedContainer diff --git a/source/funkin/util/plugins/ScreenshotPlugin.hx b/source/funkin/util/plugins/ScreenshotPlugin.hx index dcd82ecc5..5601843db 100644 --- a/source/funkin/util/plugins/ScreenshotPlugin.hx +++ b/source/funkin/util/plugins/ScreenshotPlugin.hx @@ -1,24 +1,20 @@ package funkin.util.plugins; import flixel.FlxBasic; -import flixel.FlxCamera; import flixel.FlxG; import flixel.FlxState; -import flixel.graphics.FlxGraphic; import flixel.input.keyboard.FlxKey; import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; import flixel.util.FlxColor; import flixel.util.FlxSignal; import flixel.util.FlxTimer; -import funkin.graphics.FunkinSprite; import funkin.input.Cursor; import funkin.audio.FunkinSound; import openfl.display.Bitmap; import openfl.display.Sprite; import openfl.display.BitmapData; import openfl.display.PNGEncoderOptions; -import openfl.geom.Matrix; import openfl.geom.Rectangle; import openfl.utils.ByteArray; import openfl.events.MouseEvent; @@ -53,7 +49,7 @@ class ScreenshotPlugin extends FlxBasic /** * A signal fired before the screenshot is taken. */ - public var onPreScreenshot(default, null):FlxTypedSignalVoid>; + public var onPreScreenshot(default, null):FlxSignal; /** * A signal fired after the screenshot is taken.