diff --git a/assets/images/editors/icons.png b/assets/images/editors/icons.png new file mode 100644 index 00000000..9ffed20b Binary files /dev/null and b/assets/images/editors/icons.png differ diff --git a/buildnumber.txt b/buildnumber.txt index 1ead6050..39dcb9cb 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -2393 \ No newline at end of file +2405 \ No newline at end of file diff --git a/source/funkin/cutscenes/DialogueCutscene.hx b/source/funkin/cutscenes/DialogueCutscene.hx index 90ca5214..d9d27bf6 100644 --- a/source/funkin/cutscenes/DialogueCutscene.hx +++ b/source/funkin/cutscenes/DialogueCutscene.hx @@ -1,8 +1,6 @@ package funkin.cutscenes; import flixel.system.FlxSound; -import flixel.FlxG; -import flixel.FlxCamera; import funkin.cutscenes.dialogue.*; import haxe.xml.Access; diff --git a/source/funkin/cutscenes/MP4Handler.hx b/source/funkin/cutscenes/MP4Handler.hx index 3f976143..ae423447 100644 --- a/source/funkin/cutscenes/MP4Handler.hx +++ b/source/funkin/cutscenes/MP4Handler.hx @@ -6,8 +6,6 @@ import flixel.util.FlxTimer; import funkin.options.PlayerSettings; import openfl.events.Event; import flixel.FlxState; -import flixel.FlxG; -import flixel.FlxSprite; class MP4Handler { diff --git a/source/funkin/cutscenes/VideoCutscene.hx b/source/funkin/cutscenes/VideoCutscene.hx index b7bff12b..632a0915 100644 --- a/source/funkin/cutscenes/VideoCutscene.hx +++ b/source/funkin/cutscenes/VideoCutscene.hx @@ -1,8 +1,5 @@ package funkin.cutscenes; -import flixel.FlxSprite; -import flixel.FlxG; -import flixel.FlxCamera; /** * Substate made for video cutscenes. To use it in a scripted cutscene, call `startVideo`. diff --git a/source/funkin/cutscenes/dialogue/DialogueBox.hx b/source/funkin/cutscenes/dialogue/DialogueBox.hx index 1d1a1da7..f0ca3f88 100644 --- a/source/funkin/cutscenes/dialogue/DialogueBox.hx +++ b/source/funkin/cutscenes/dialogue/DialogueBox.hx @@ -2,7 +2,6 @@ package funkin.cutscenes.dialogue; import flixel.addons.text.FlxTypeText; import flixel.text.FlxText; -import flixel.FlxG; import flixel.math.FlxPoint; import haxe.xml.Access; diff --git a/source/funkin/cutscenes/dialogue/DialogueCharacter.hx b/source/funkin/cutscenes/dialogue/DialogueCharacter.hx index d8c45478..164daa8d 100644 --- a/source/funkin/cutscenes/dialogue/DialogueCharacter.hx +++ b/source/funkin/cutscenes/dialogue/DialogueCharacter.hx @@ -1,6 +1,5 @@ package funkin.cutscenes.dialogue; -import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; import haxe.xml.Access; diff --git a/source/funkin/desktop/DesktopMain.hx b/source/funkin/desktop/DesktopMain.hx index 6800f098..38c429d6 100644 --- a/source/funkin/desktop/DesktopMain.hx +++ b/source/funkin/desktop/DesktopMain.hx @@ -2,15 +2,10 @@ package funkin.desktop; import flixel.math.FlxRect; import openfl.geom.Rectangle; -import flixel.FlxObject; import lime.app.Application; import openfl.display.BitmapData; import flixel.system.scaleModes.BaseScaleMode; import flixel.system.scaleModes.FixedScaleAdjustSizeScaleMode; -import flixel.FlxG; -import flixel.FlxSprite; -import flixel.FlxBasic; -import flixel.FlxCamera; import flixel.math.FlxPoint; import flixel.util.FlxDestroyUtil; import funkin.desktop.editors.*; diff --git a/source/funkin/desktop/DesktopScreen.hx b/source/funkin/desktop/DesktopScreen.hx index e57ec4f5..a94b1bf3 100644 --- a/source/funkin/desktop/DesktopScreen.hx +++ b/source/funkin/desktop/DesktopScreen.hx @@ -1,9 +1,7 @@ package funkin.desktop; import flixel.util.FlxDestroyUtil.IFlxDestroyable; -import flixel.FlxCamera; import openfl.events.Event; -import flixel.FlxG; import lime.app.Application; import lime.ui.Window; diff --git a/source/funkin/desktop/DesktopUtils.hx b/source/funkin/desktop/DesktopUtils.hx index bff5cf27..92fa8fe6 100644 --- a/source/funkin/desktop/DesktopUtils.hx +++ b/source/funkin/desktop/DesktopUtils.hx @@ -1,6 +1,5 @@ package funkin.desktop; -import flixel.FlxObject; class DesktopUtils { public static inline function copyProperties(spr1:FlxObject, spr2:FlxObject) { diff --git a/source/funkin/desktop/editors/CharacterEditor.hx b/source/funkin/desktop/editors/CharacterEditor.hx index 339f185e..9d6a479a 100644 --- a/source/funkin/desktop/editors/CharacterEditor.hx +++ b/source/funkin/desktop/editors/CharacterEditor.hx @@ -1,11 +1,6 @@ package funkin.desktop.editors; -import flixel.FlxBasic; import funkin.game.Character; -import flixel.FlxSprite; -import flixel.FlxObject; -import flixel.FlxCamera; -import flixel.FlxG; using funkin.utils.XMLUtil; diff --git a/source/funkin/desktop/editors/EditorPlayState.hx b/source/funkin/desktop/editors/EditorPlayState.hx index 9a0fb4ab..e80f7614 100644 --- a/source/funkin/desktop/editors/EditorPlayState.hx +++ b/source/funkin/desktop/editors/EditorPlayState.hx @@ -1,7 +1,5 @@ package funkin.desktop.editors; -import flixel.FlxG; -import flixel.FlxCamera; import flixel.math.FlxPoint; class EditorPlayState extends WindowContent { diff --git a/source/funkin/desktop/editors/HelloWorld.hx b/source/funkin/desktop/editors/HelloWorld.hx index 4b3b71df..0c89a99a 100644 --- a/source/funkin/desktop/editors/HelloWorld.hx +++ b/source/funkin/desktop/editors/HelloWorld.hx @@ -2,7 +2,6 @@ package funkin.desktop.editors; import flixel.util.FlxDestroyUtil.IFlxDestroyable; import flixel.addons.ui.FlxUIText; -import flixel.FlxG; class HelloWorld extends WindowContent { public override function new() { diff --git a/source/funkin/desktop/editors/MessageBox.hx b/source/funkin/desktop/editors/MessageBox.hx index 3a70cb39..34dc27bf 100644 --- a/source/funkin/desktop/editors/MessageBox.hx +++ b/source/funkin/desktop/editors/MessageBox.hx @@ -3,7 +3,6 @@ package funkin.desktop.editors; import flixel.util.typeLimit.OneOfTwo; import flixel.util.FlxDestroyUtil.IFlxDestroyable; import flixel.addons.ui.FlxUIText; -import flixel.FlxG; class MessageBox extends WindowContent { public var caption:String; diff --git a/source/funkin/desktop/sprites/Button.hx b/source/funkin/desktop/sprites/Button.hx index afd2a0fe..8a4cb844 100644 --- a/source/funkin/desktop/sprites/Button.hx +++ b/source/funkin/desktop/sprites/Button.hx @@ -2,9 +2,7 @@ package funkin.desktop.sprites; import funkin.desktop.DesktopMain.IDesktopFocusableObject; import funkin.desktop.theme.Theme; -import flixel.FlxObject; import flixel.addons.ui.FlxUIText; -import flixel.FlxSprite; import flixel.math.FlxPoint; import funkin.desktop.windows.WindowGroup; diff --git a/source/funkin/desktop/sprites/Checkbox.hx b/source/funkin/desktop/sprites/Checkbox.hx index a05df1ec..cca044e5 100644 --- a/source/funkin/desktop/sprites/Checkbox.hx +++ b/source/funkin/desktop/sprites/Checkbox.hx @@ -1,9 +1,7 @@ package funkin.desktop.sprites; import flixel.math.FlxRect; -import flixel.FlxSprite; import flixel.text.FlxText; -import flixel.FlxObject; class Checkbox extends WindowText { public var checked:CheckState = UNCHECKED; diff --git a/source/funkin/desktop/sprites/InputBox.hx b/source/funkin/desktop/sprites/InputBox.hx index 218a3c3e..48d861c1 100644 --- a/source/funkin/desktop/sprites/InputBox.hx +++ b/source/funkin/desktop/sprites/InputBox.hx @@ -1,9 +1,7 @@ package funkin.desktop.sprites; -import flixel.math.FlxMath; import openfl.ui.Keyboard; import openfl.events.KeyboardEvent; -import flixel.FlxG; import lime.app.Application; class InputBox extends Button implements IDesktopInputObject { diff --git a/source/funkin/desktop/sprites/MenuBar.hx b/source/funkin/desktop/sprites/MenuBar.hx index 3a7903a2..3655f6f0 100644 --- a/source/funkin/desktop/sprites/MenuBar.hx +++ b/source/funkin/desktop/sprites/MenuBar.hx @@ -1,9 +1,6 @@ package funkin.desktop.sprites; -import flixel.FlxG; import flixel.math.FlxPoint; -import flixel.FlxSprite; -import flixel.FlxBasic; import funkin.desktop.windows.WindowGroup; class MenuBar extends WindowGroup { diff --git a/source/funkin/desktop/sprites/NumericStepper.hx b/source/funkin/desktop/sprites/NumericStepper.hx index c79ceefc..26c3f5cf 100644 --- a/source/funkin/desktop/sprites/NumericStepper.hx +++ b/source/funkin/desktop/sprites/NumericStepper.hx @@ -1,6 +1,5 @@ package funkin.desktop.sprites; -import flixel.math.FlxMath; // TODO: FIX MEMORY GOING BRRRRRRRRRRRRRRRRRRRRR class NumericStepper extends InputBox { diff --git a/source/funkin/desktop/sprites/SpliceSprite.hx b/source/funkin/desktop/sprites/SpliceSprite.hx index 549af3ab..02aec5b6 100644 --- a/source/funkin/desktop/sprites/SpliceSprite.hx +++ b/source/funkin/desktop/sprites/SpliceSprite.hx @@ -3,8 +3,6 @@ package funkin.desktop.sprites; import openfl.display.BitmapData; import openfl.geom.Rectangle; import openfl.geom.Point; -import flixel.FlxObject; -import flixel.FlxSprite; import flixel.system.FlxAssets.FlxGraphicAsset; class SpliceSprite extends FlxObject { diff --git a/source/funkin/desktop/sprites/TabView.hx b/source/funkin/desktop/sprites/TabView.hx index f02e57e1..e9c53e81 100644 --- a/source/funkin/desktop/sprites/TabView.hx +++ b/source/funkin/desktop/sprites/TabView.hx @@ -1,9 +1,6 @@ package funkin.desktop.sprites; -import flixel.FlxObject; import flixel.math.FlxRect; -import flixel.FlxSprite; -import flixel.FlxBasic; import funkin.desktop.windows.WindowGroup; class TabView extends WindowGroup { diff --git a/source/funkin/desktop/windows/ContextMenu.hx b/source/funkin/desktop/windows/ContextMenu.hx index b4fa85e3..b2edfa38 100644 --- a/source/funkin/desktop/windows/ContextMenu.hx +++ b/source/funkin/desktop/windows/ContextMenu.hx @@ -1,11 +1,7 @@ package funkin.desktop.windows; -import flixel.FlxCamera; import flixel.util.FlxDestroyUtil; -import flixel.FlxSprite; import funkin.desktop.sprites.*; -import flixel.FlxObject; -import flixel.FlxG; class ContextMenu extends WindowGroup { public var bg:SpliceSprite; diff --git a/source/funkin/desktop/windows/Window.hx b/source/funkin/desktop/windows/Window.hx index fa22c47a..701c4982 100644 --- a/source/funkin/desktop/windows/Window.hx +++ b/source/funkin/desktop/windows/Window.hx @@ -2,18 +2,11 @@ package funkin.desktop.windows; import flixel.math.FlxRect; import flixel.addons.ui.FlxUIText; -import flixel.group.FlxGroup.FlxTypedGroup; -import flixel.FlxBasic; import openfl.geom.Point; import flixel.group.FlxSpriteGroup; import openfl.geom.Rectangle; import flixel.addons.ui.FlxUI9SliceSprite; -import flixel.FlxSprite; -import flixel.FlxCamera; -import flixel.FlxG; import flixel.tweens.FlxTween; -import flixel.tweens.FlxEase; -import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; import funkin.desktop.sprites.*; import funkin.desktop.editors.MessageBox.MessageBoxIcon; import funkin.desktop.editors.MessageBox; diff --git a/source/funkin/desktop/windows/WindowCaptionButton.hx b/source/funkin/desktop/windows/WindowCaptionButton.hx index 52bdbeab..1fc402b0 100644 --- a/source/funkin/desktop/windows/WindowCaptionButton.hx +++ b/source/funkin/desktop/windows/WindowCaptionButton.hx @@ -1,6 +1,5 @@ package funkin.desktop.windows; -import flixel.FlxSprite; class WindowCaptionButton extends FlxSprite { public var icon:FlxSprite; diff --git a/source/funkin/desktop/windows/WindowContent.hx b/source/funkin/desktop/windows/WindowContent.hx index 2a1aea5f..cdef1392 100644 --- a/source/funkin/desktop/windows/WindowContent.hx +++ b/source/funkin/desktop/windows/WindowContent.hx @@ -1,9 +1,5 @@ package funkin.desktop.windows; -import flixel.FlxBasic; -import flixel.FlxSprite; -import flixel.group.FlxGroup.FlxTypedGroup; -import flixel.FlxCamera; class WindowContent extends WindowGroup { public var winX(default, set):Float = 0; diff --git a/source/funkin/desktop/windows/WindowDragHitbox.hx b/source/funkin/desktop/windows/WindowDragHitbox.hx index b90e08af..b8e78b4d 100644 --- a/source/funkin/desktop/windows/WindowDragHitbox.hx +++ b/source/funkin/desktop/windows/WindowDragHitbox.hx @@ -1,8 +1,5 @@ package funkin.desktop.windows; -import flixel.FlxG; -import flixel.FlxObject; -import flixel.math.FlxMath; import flixel.math.FlxPoint; class WindowDragHitbox extends FlxObject { diff --git a/source/funkin/desktop/windows/WindowGroup.hx b/source/funkin/desktop/windows/WindowGroup.hx index 210e05af..0db424f7 100644 --- a/source/funkin/desktop/windows/WindowGroup.hx +++ b/source/funkin/desktop/windows/WindowGroup.hx @@ -1,11 +1,6 @@ package funkin.desktop.windows; -import flixel.math.FlxMath; import flixel.math.FlxPoint; -import flixel.FlxObject; -import flixel.group.FlxGroup.FlxTypedGroup; -import flixel.FlxBasic; -import flixel.FlxCamera; class WindowGroup extends FlxTypedGroup { public var x:Float = 0; diff --git a/source/funkin/editors/CharacterEditor.hx b/source/funkin/editors/CharacterEditor.hx index faa5d8d2..b2c13605 100644 --- a/source/funkin/editors/CharacterEditor.hx +++ b/source/funkin/editors/CharacterEditor.hx @@ -1,7 +1,6 @@ package funkin.editors; import funkin.desktop.DesktopMain; -import flixel.FlxG; import flixel.FlxState; import funkin.game.*; diff --git a/source/funkin/editors/EditorPicker.hx b/source/funkin/editors/EditorPicker.hx new file mode 100644 index 00000000..8c1a08b5 --- /dev/null +++ b/source/funkin/editors/EditorPicker.hx @@ -0,0 +1,168 @@ +package funkin.editors; + +import flixel.math.FlxPoint; + + +class EditorPicker extends MusicBeatSubstate { + public var bg:FlxSprite; + + public var options:Array = [ + { + name: "Chart Editor", + iconID: 0, + state: null + }, + { + name: "Character Editor", + iconID: 1, + state: null + }, + { + name: "Stage Editor", + iconID: 2, + state: null + }, + { + name: "Unknown Editor", + iconID: 3, + state: null + }, + { + name: "Unknown Editor", + iconID: 3, + state: null + }, + { + name: "Unknown Editor", + iconID: 3, + state: null + } + ]; + + public var sprites:Array = []; + + public var curSelected:Int = 0; + + + public var oldMousePos:FlxPoint = FlxPoint.get(); + public var curMousePos:FlxPoint = FlxPoint.get(); + + public var optionHeight:Float = 0; + + public override function create() { + super.create(); + + camera = new FlxCamera(); + camera.bgColor = 0; + FlxG.cameras.add(camera); + + bg = new FlxSprite().makeGraphic(1, 1, 0xFF000000); + bg.scale.set(FlxG.width, FlxG.height); + bg.updateHitbox(); + bg.alpha = 0; + add(bg); + + optionHeight = FlxG.height / options.length; + for(k=>o in options) { + var spr = new EditorPickerOption(o.name, o.iconID, optionHeight); + spr.y = k * optionHeight; + add(spr); + sprites.push(spr); + } + sprites[0].selected = true; + + FlxG.mouse.getScreenPosition(camera, oldMousePos); + } + + public override function update(elapsed:Float) { + super.update(elapsed); + + bg.alpha = CoolUtil.fpsLerp(bg.alpha, 0.5, 0.25); + changeSelection(-FlxG.mouse.wheel + (controls.UP_P ? -1 : 0) + (controls.DOWN_P ? 1 : 0)); + + FlxG.mouse.getScreenPosition(camera, curMousePos); + if (curMousePos.x != oldMousePos.x || curMousePos.y != oldMousePos.y) { + oldMousePos.set(curMousePos.x, curMousePos.y); + curSelected = -1; + changeSelection(Std.int(curMousePos.y / optionHeight)+1); + } + } + + public function changeSelection(change:Int) { + if (change == 0) return; + + curSelected = FlxMath.wrap(curSelected + change, 0, sprites.length-1); + + for(o in sprites) + o.selected = false; + sprites[curSelected].selected = true; + } +} + +typedef Editor = { + var name:String; + var iconID:Int; + var state:Class; +} + +class EditorPickerOption extends FlxTypedSpriteGroup { + public var iconSpr:FlxSprite; + public var label:Alphabet; + + public var selectionBG:FlxSprite; + + public var selected:Bool = false; + + public var selectionLerp:Float = 0; + + public var iconRotationCycle:Float = 0; + public function new(name:String, iconID:Int, height:Float) { + super(); + + + FlxG.mouse.visible = true; + iconSpr = new FlxSprite(); + iconSpr.loadGraphic(Paths.image('editors/icons'), true, 128, 128); + iconSpr.animation.add("icon", [iconID], 24, true); + iconSpr.animation.play("icon"); + iconSpr.antialiasing = true; + if (height < 150) { + iconSpr.scale.set(height / 150, height / 150); + iconSpr.updateHitbox(); + } + iconSpr.x = 25 + ((height - iconSpr.width) / 2); + iconSpr.y = (height - iconSpr.height) / 2; + + label = new Alphabet(25 + iconSpr.width + 25, 0, name, true); + label.y = (height - label.height) / 2; + + selectionBG = new FlxSprite().makeGraphic(1, 1, -1); + selectionBG.scale.set(FlxG.width, height); + selectionBG.updateHitbox(); + selectionBG.alpha = 0; + + add(selectionBG); + add(iconSpr); + add(label); + } + + public override function update(elapsed:Float) { + super.update(elapsed); + iconRotationCycle += elapsed; + + selectionLerp = CoolUtil.fpsLerp(selectionLerp, selected ? 1 : 0, 0.25); + + selectionBG.alpha = (iconSpr.alpha = FlxEase.cubeOut(selectionLerp)) * 0.5; + selectionBG.x = FlxMath.lerp(-FlxG.width, 0, selectionLerp); + + label.x = FlxMath.lerp(10, 25 + iconSpr.width + 25, selectionLerp); + iconSpr.x = label.x - 25 - iconSpr.width; + iconSpr.angle = Math.sin(iconRotationCycle * 0.5) * 5; + + scrollFactor.set(selectionLerp, 0); + } + + public override function destroy() { + super.destroy(); + } +} \ No newline at end of file diff --git a/source/funkin/editors/charter/CharterSelection.hx b/source/funkin/editors/charter/CharterSelection.hx new file mode 100644 index 00000000..398d040e --- /dev/null +++ b/source/funkin/editors/charter/CharterSelection.hx @@ -0,0 +1,23 @@ +package funkin.editors.charter; + +import funkin.menus.FreeplayState.FreeplaySonglist; + +class CharterSelection extends MusicBeatState { + public var songNames:FlxTypedSpriteGroup; + public var freeplaySonglist:FreeplaySonglist; + + public override function create() { + super.create(); + + songNames = new FlxTypedSpriteGroup(); + + freeplaySonglist = FreeplaySonglist.get(); + + for(k=>s in freeplaySonglist.songs) { + var alphabet = new Alphabet(0, k * 60, s.displayName, true); + songNames.add(alphabet); + } + + add(songNames); + } +} \ No newline at end of file diff --git a/source/funkin/game/Character.hx b/source/funkin/game/Character.hx index dd351ebc..be8435a4 100644 --- a/source/funkin/game/Character.hx +++ b/source/funkin/game/Character.hx @@ -7,9 +7,6 @@ import funkin.interfaces.IBeatReceiver; import funkin.interfaces.IOffsetCompatible; import funkin.utils.XMLUtil; -import flixel.FlxG; -import flixel.FlxSprite; -import flixel.FlxCamera; import flixel.animation.FlxBaseAnimation; import flixel.graphics.frames.FlxAtlasFrames; import flixel.math.FlxRect; diff --git a/source/funkin/game/GameOverSubstate.hx b/source/funkin/game/GameOverSubstate.hx index 86879e68..7abb8d9d 100644 --- a/source/funkin/game/GameOverSubstate.hx +++ b/source/funkin/game/GameOverSubstate.hx @@ -2,8 +2,6 @@ package funkin.game; import flixel.addons.transition.FlxTransitionableState; import flixel.system.FlxSound; -import flixel.FlxG; -import flixel.FlxObject; import flixel.FlxSubState; import flixel.math.FlxPoint; import flixel.util.FlxColor; diff --git a/source/funkin/game/HealthIcon.hx b/source/funkin/game/HealthIcon.hx index 1b3b3b32..9fd88170 100644 --- a/source/funkin/game/HealthIcon.hx +++ b/source/funkin/game/HealthIcon.hx @@ -1,6 +1,5 @@ package funkin.game; -import flixel.FlxSprite; class HealthIcon extends FlxSprite { diff --git a/source/funkin/game/Highscore.hx b/source/funkin/game/Highscore.hx index 7dd401e6..b8707798 100644 --- a/source/funkin/game/Highscore.hx +++ b/source/funkin/game/Highscore.hx @@ -1,6 +1,5 @@ package funkin.game; -import flixel.FlxG; class Highscore { diff --git a/source/funkin/game/HudCamera.hx b/source/funkin/game/HudCamera.hx index 9fb4dcc3..7487ae39 100644 --- a/source/funkin/game/HudCamera.hx +++ b/source/funkin/game/HudCamera.hx @@ -1,6 +1,5 @@ package funkin.game; -import flixel.FlxCamera; import lime.app.Application; import flixel.graphics.tile.FlxGraphicsShader; @@ -16,7 +15,6 @@ import flixel.graphics.FlxGraphic; import flixel.graphics.frames.FlxFrame; import flixel.graphics.tile.FlxDrawBaseItem; import flixel.graphics.tile.FlxDrawTrianglesItem; -import flixel.math.FlxMath; import flixel.math.FlxMatrix; import flixel.math.FlxPoint; import flixel.math.FlxRect; diff --git a/source/funkin/game/Note.hx b/source/funkin/game/Note.hx index d086e7e4..525842c6 100644 --- a/source/funkin/game/Note.hx +++ b/source/funkin/game/Note.hx @@ -2,11 +2,7 @@ package funkin.game; import funkin.chart.Chart; import funkin.chart.ChartData; -import flixel.FlxG; -import flixel.FlxCamera; -import flixel.FlxSprite; import flixel.graphics.frames.FlxAtlasFrames; -import flixel.math.FlxMath; import flixel.util.FlxColor; import flixel.math.FlxRect; import flixel.math.FlxPoint; diff --git a/source/funkin/game/NoteGroup.hx b/source/funkin/game/NoteGroup.hx index de27f91e..36183101 100644 --- a/source/funkin/game/NoteGroup.hx +++ b/source/funkin/game/NoteGroup.hx @@ -1,9 +1,7 @@ package funkin.game; import flixel.util.FlxSort; -import flixel.FlxCamera; import funkin.system.Conductor; -import flixel.group.FlxGroup.FlxTypedGroup; class NoteGroup extends FlxTypedGroup { var __loopSprite:Note; diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index fcbbfc48..853ca431 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -11,17 +11,11 @@ import funkin.options.Options; import funkin.scripting.Script; import flixel.util.FlxDestroyUtil; import funkin.scripting.ScriptPack; -import flixel.FlxCamera; -import flixel.FlxG; -import flixel.FlxObject; -import flixel.FlxSprite; import flixel.FlxSubState; import flixel.addons.transition.FlxTransitionableState; -import flixel.math.FlxMath; import flixel.math.FlxPoint; import flixel.system.FlxSound; import flixel.text.FlxText; -import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; import flixel.ui.FlxBar; import flixel.util.FlxColor; diff --git a/source/funkin/game/SplashGroup.hx b/source/funkin/game/SplashGroup.hx index 851c85af..4c750683 100644 --- a/source/funkin/game/SplashGroup.hx +++ b/source/funkin/game/SplashGroup.hx @@ -1,8 +1,6 @@ package funkin.game; -import flixel.FlxG; import haxe.xml.Access; -import flixel.group.FlxGroup.FlxTypedGroup; class SplashGroup extends FlxTypedGroup { /** diff --git a/source/funkin/game/SplashHandler.hx b/source/funkin/game/SplashHandler.hx index 72bdba8f..d6f8fa34 100644 --- a/source/funkin/game/SplashHandler.hx +++ b/source/funkin/game/SplashHandler.hx @@ -1,6 +1,5 @@ package funkin.game; -import flixel.group.FlxGroup.FlxTypedGroup; class SplashHandler extends FlxTypedGroup { /** diff --git a/source/funkin/game/Stage.hx b/source/funkin/game/Stage.hx index 8371da84..63f8d07a 100644 --- a/source/funkin/game/Stage.hx +++ b/source/funkin/game/Stage.hx @@ -1,12 +1,8 @@ package funkin.game; import funkin.options.Options; -import flixel.FlxG; import flixel.FlxState; -import flixel.FlxSprite; import haxe.xml.Access; -import flixel.FlxBasic; -import flixel.math.FlxMath; import funkin.interfaces.IBeatReceiver; import funkin.scripting.Script; import haxe.io.Path; diff --git a/source/funkin/game/Strum.hx b/source/funkin/game/Strum.hx index ff9413e1..0c95b755 100644 --- a/source/funkin/game/Strum.hx +++ b/source/funkin/game/Strum.hx @@ -1,8 +1,5 @@ package funkin.game; -import flixel.FlxSprite; -import flixel.FlxCamera; -import flixel.math.FlxMath; import flixel.math.FlxPoint; import funkin.options.Options; import funkin.system.Conductor; diff --git a/source/funkin/game/StrumLine.hx b/source/funkin/game/StrumLine.hx index 7245e831..86a6e40f 100644 --- a/source/funkin/game/StrumLine.hx +++ b/source/funkin/game/StrumLine.hx @@ -6,10 +6,7 @@ import funkin.chart.Chart; import funkin.chart.ChartData; import funkin.system.Controls; import funkin.scripting.events.StrumCreationEvent; -import flixel.group.FlxGroup.FlxTypedGroup; -import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; -import flixel.FlxG; class StrumLine extends FlxTypedGroup { /** diff --git a/source/funkin/import.hx b/source/funkin/import.hx index 50b782b7..093733b3 100644 --- a/source/funkin/import.hx +++ b/source/funkin/import.hx @@ -11,6 +11,18 @@ import funkin.scripting.EventManager; import openfl.utils.Assets; +import flixel.FlxSprite; +import flixel.FlxG; +import flixel.FlxBasic; +import flixel.FlxCamera; +import flixel.FlxObject; +import flixel.math.FlxMath; +import flixel.tweens.FlxEase; + +import funkin.ui.Alphabet; +import flixel.group.FlxGroup.FlxTypedGroup; +import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; + using StringTools; using funkin.utils.CoolUtil; #end diff --git a/source/funkin/menus/BetaWarningState.hx b/source/funkin/menus/BetaWarningState.hx index ea2d7b13..0366c738 100644 --- a/source/funkin/menus/BetaWarningState.hx +++ b/source/funkin/menus/BetaWarningState.hx @@ -2,9 +2,7 @@ package funkin.menus; import flixel.addons.transition.FlxTransitionableState; import flixel.util.FlxColor; -import flixel.FlxG; import flixel.text.FlxText; -import funkin.ui.Alphabet; import funkin.ui.FunkinText; class BetaWarningState extends MusicBeatState { diff --git a/source/funkin/menus/FreeplayState.hx b/source/funkin/menus/FreeplayState.hx index 507dfe38..76a8d3d2 100644 --- a/source/funkin/menus/FreeplayState.hx +++ b/source/funkin/menus/FreeplayState.hx @@ -4,17 +4,12 @@ import funkin.chart.Chart; import funkin.chart.ChartData; import haxe.io.Path; import flash.text.TextField; -import flixel.FlxG; -import flixel.FlxSprite; import flixel.FlxState; import flixel.addons.display.FlxGridOverlay; -import flixel.group.FlxGroup.FlxTypedGroup; -import flixel.math.FlxMath; import flixel.text.FlxText; import flixel.util.FlxColor; import lime.utils.Assets; import funkin.system.Song; -import funkin.ui.Alphabet; import funkin.game.HealthIcon; import funkin.game.Highscore; import haxe.Json; @@ -390,9 +385,7 @@ class FreeplayState extends MusicBeatState class FreeplaySonglist { public var songs:Array = []; - public function new() { - - } + public function new() {} public function getSongsFromSource(source:funkin.system.AssetsLibraryList.AssetSource) { var path:String = Paths.txt('freeplaySonglist'); diff --git a/source/funkin/menus/GitarooPause.hx b/source/funkin/menus/GitarooPause.hx index 0b32c879..ac65da6a 100644 --- a/source/funkin/menus/GitarooPause.hx +++ b/source/funkin/menus/GitarooPause.hx @@ -1,7 +1,5 @@ package funkin.menus; -import flixel.FlxG; -import flixel.FlxSprite; import flixel.graphics.frames.FlxAtlasFrames; class GitarooPause extends MusicBeatState diff --git a/source/funkin/menus/MainMenuState.hx b/source/funkin/menus/MainMenuState.hx index 814d4480..b05ebf62 100644 --- a/source/funkin/menus/MainMenuState.hx +++ b/source/funkin/menus/MainMenuState.hx @@ -3,19 +3,13 @@ package funkin.menus; import haxe.Json; import funkin.ui.FunkinText; import funkin.options.Options; -import flixel.FlxG; import funkin.menus.credits.CreditsMain; -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.group.FlxGroup.FlxTypedGroup; import flixel.text.FlxText; -import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; -import flixel.math.FlxMath; import flixel.util.FlxColor; import lime.app.Application; import funkin.scripting.events.*; @@ -105,7 +99,12 @@ class MainMenuState extends MusicBeatState if (!selectedSomethin) { if (canAccessDebugMenus) { - + if (FlxG.keys.justPressed.SEVEN) { + persistentUpdate = false; + persistentDraw = true; + openSubState(new funkin.editors.EditorPicker()); + } + /* if (FlxG.keys.justPressed.SEVEN) FlxG.switchState(new funkin.desktop.DesktopMain()); if (FlxG.keys.justPressed.EIGHT) { @@ -113,6 +112,7 @@ class MainMenuState extends MusicBeatState sys.io.File.saveContent("chart.json", Json.stringify(funkin.chart.Chart.parse("dadbattle", "hard"))); #end } + */ } if (controls.UP_P) diff --git a/source/funkin/menus/ModSwitchMenu.hx b/source/funkin/menus/ModSwitchMenu.hx index 106fc36b..87e5ad5b 100644 --- a/source/funkin/menus/ModSwitchMenu.hx +++ b/source/funkin/menus/ModSwitchMenu.hx @@ -1,16 +1,10 @@ package funkin.menus; #if MOD_SUPPORT -import flixel.math.FlxMath; -import flixel.group.FlxGroup.FlxTypedGroup; -import funkin.ui.Alphabet; import haxe.io.Path; import funkin.mods.ModsFolder; import sys.FileSystem; -import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; -import flixel.FlxSprite; -import flixel.FlxG; class ModSwitchMenu extends MusicBeatSubstate { var mods:Array = []; diff --git a/source/funkin/menus/PauseSubState.hx b/source/funkin/menus/PauseSubState.hx index 0de9f822..99d4ffac 100644 --- a/source/funkin/menus/PauseSubState.hx +++ b/source/funkin/menus/PauseSubState.hx @@ -1,22 +1,16 @@ package funkin.menus; import funkin.options.OptionsMenu; -import flixel.FlxCamera; import funkin.scripting.events.PauseCreationEvent; import funkin.scripting.events.NameEvent; import funkin.scripting.Script; -import flixel.FlxG; -import flixel.FlxSprite; import flixel.FlxSubState; import flixel.addons.transition.FlxTransitionableState; -import flixel.group.FlxGroup.FlxTypedGroup; import flixel.input.keyboard.FlxKey; import flixel.system.FlxSound; import flixel.text.FlxText; -import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; import flixel.util.FlxColor; -import funkin.ui.Alphabet; import funkin.options.keybinds.KeybindsOptions; import funkin.menus.StoryMenuState; diff --git a/source/funkin/menus/StoryMenuState.hx b/source/funkin/menus/StoryMenuState.hx index 34aed9cb..1efb8a8a 100644 --- a/source/funkin/menus/StoryMenuState.hx +++ b/source/funkin/menus/StoryMenuState.hx @@ -5,15 +5,11 @@ import funkin.scripting.events.*; import flixel.util.FlxTimer; import flixel.math.FlxPoint; import flixel.graphics.frames.FlxFramesCollection; -import flixel.group.FlxGroup.FlxTypedGroup; import funkin.game.Highscore; import flixel.tweens.FlxTween; -import flixel.FlxG; -import flixel.math.FlxMath; import flixel.util.FlxColor; import funkin.ui.FunkinText; import haxe.xml.Access; -import flixel.FlxSprite; import flixel.text.FlxText; class StoryMenuState extends MusicBeatState { diff --git a/source/funkin/menus/TitleState.hx b/source/funkin/menus/TitleState.hx index 641da17a..443544d3 100644 --- a/source/funkin/menus/TitleState.hx +++ b/source/funkin/menus/TitleState.hx @@ -5,8 +5,6 @@ import funkin.system.MusicBeatGroup; import funkin.utils.XMLUtil; import flixel.util.typeLimit.OneOfThree; import flixel.util.typeLimit.OneOfTwo; -import flixel.FlxG; -import flixel.FlxSprite; import flixel.FlxState; import flixel.addons.display.FlxGridOverlay; import flixel.addons.transition.FlxTransitionSprite.GraphicTransTileDiamond; @@ -20,13 +18,11 @@ import flixel.math.FlxRect; import flixel.system.FlxSound; import flixel.system.ui.FlxSoundTray; import flixel.text.FlxText; -import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; import flixel.util.FlxColor; import flixel.util.FlxTimer; import funkin.system.Conductor; import openfl.Assets; -import funkin.ui.Alphabet; import haxe.xml.Access; using StringTools; diff --git a/source/funkin/menus/credits/CreditsCodename.hx b/source/funkin/menus/credits/CreditsCodename.hx index 2d3c7210..d1728d56 100644 --- a/source/funkin/menus/credits/CreditsCodename.hx +++ b/source/funkin/menus/credits/CreditsCodename.hx @@ -3,13 +3,10 @@ package funkin.menus.credits; import funkin.ui.FunkinText; import flixel.util.FlxColor; import funkin.shaders.CustomShader; -import flixel.math.FlxMath; import funkin.options.type.TextOption; import funkin.options.OptionsScreen; import flixel.graphics.FlxGraphic; -import flixel.FlxG; import openfl.display.BitmapData; -import flixel.FlxSprite; import flixel.addons.transition.FlxTransitionableState; import funkin.github.GitHub; import funkin.github.GitHubContributor; diff --git a/source/funkin/menus/credits/CreditsMain.hx b/source/funkin/menus/credits/CreditsMain.hx index 30bf2f04..9dad867f 100644 --- a/source/funkin/menus/credits/CreditsMain.hx +++ b/source/funkin/menus/credits/CreditsMain.hx @@ -2,7 +2,6 @@ package funkin.menus.credits; import flixel.addons.transition.FlxTransitionableState; import funkin.options.OptionsScreen; -import flixel.FlxG; import funkin.options.type.*; class CreditsMain extends OptionsScreen { diff --git a/source/funkin/mods/ModsFolder.hx b/source/funkin/mods/ModsFolder.hx index acaecbdf..b554291e 100644 --- a/source/funkin/mods/ModsFolder.hx +++ b/source/funkin/mods/ModsFolder.hx @@ -9,13 +9,11 @@ import openfl.utils.AssetManifest; import openfl.utils.AssetLibrary; import flixel.graphics.FlxGraphic; import flixel.util.FlxSignal.FlxTypedSignal; -import flixel.FlxG; #if MOD_SUPPORT import sys.FileSystem; #end -import flixel.FlxG; import flixel.FlxState; import haxe.io.Path; diff --git a/source/funkin/options/LatencyState.hx b/source/funkin/options/LatencyState.hx index 65e36300..85f3944a 100644 --- a/source/funkin/options/LatencyState.hx +++ b/source/funkin/options/LatencyState.hx @@ -1,9 +1,6 @@ package funkin.options; -import flixel.FlxG; -import flixel.FlxSprite; import flixel.FlxState; -import flixel.group.FlxGroup.FlxTypedGroup; import flixel.text.FlxText; class LatencyState extends FlxState diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx index 2c52d349..2907dd14 100644 --- a/source/funkin/options/Options.hx +++ b/source/funkin/options/Options.hx @@ -1,6 +1,5 @@ package funkin.options; -import flixel.FlxG; import funkin.system.Controls; import openfl.Lib; import flixel.util.FlxSave; diff --git a/source/funkin/options/OptionsMenu.hx b/source/funkin/options/OptionsMenu.hx index 06b048b8..2f5b7f5c 100644 --- a/source/funkin/options/OptionsMenu.hx +++ b/source/funkin/options/OptionsMenu.hx @@ -3,11 +3,6 @@ package funkin.options; import flixel.util.typeLimit.OneOfTwo; import flixel.FlxState; import flixel.addons.transition.FlxTransitionableState; -import flixel.group.FlxGroup.FlxTypedGroup; -import funkin.ui.Alphabet; -import flixel.math.FlxMath; -import flixel.FlxSprite; -import flixel.FlxG; import flixel.effects.FlxFlicker; import funkin.menus.MainMenuState; diff --git a/source/funkin/options/OptionsScreen.hx b/source/funkin/options/OptionsScreen.hx index 07e3235d..469e309a 100644 --- a/source/funkin/options/OptionsScreen.hx +++ b/source/funkin/options/OptionsScreen.hx @@ -3,12 +3,9 @@ package funkin.options; import flixel.addons.display.FlxBackdrop; import funkin.ui.FunkinText; import flixel.text.FlxText; -import flixel.math.FlxMath; import flixel.math.FlxPoint; import flixel.util.FlxColor; import flixel.addons.transition.FlxTransitionableState; -import flixel.FlxSprite; -import flixel.FlxG; import funkin.options.type.OptionType; /** * Direct replica from Week 7 lol diff --git a/source/funkin/options/PlayerSettings.hx b/source/funkin/options/PlayerSettings.hx index 22e7ef6e..05a004ac 100644 --- a/source/funkin/options/PlayerSettings.hx +++ b/source/funkin/options/PlayerSettings.hx @@ -1,8 +1,6 @@ package funkin.options; import funkin.system.Controls; -import flixel.FlxCamera; -import flixel.FlxG; import flixel.util.FlxSignal; // import ui.DeviceManager; diff --git a/source/funkin/options/categories/MiscOptions.hx b/source/funkin/options/categories/MiscOptions.hx index 0608f94d..a45ad587 100644 --- a/source/funkin/options/categories/MiscOptions.hx +++ b/source/funkin/options/categories/MiscOptions.hx @@ -1,6 +1,5 @@ package funkin.options.categories; -import flixel.FlxG; class MiscOptions extends OptionsScreen { public override function create() { diff --git a/source/funkin/options/keybinds/ChangeKeybindSubState.hx b/source/funkin/options/keybinds/ChangeKeybindSubState.hx index 913cb4d4..934078a5 100644 --- a/source/funkin/options/keybinds/ChangeKeybindSubState.hx +++ b/source/funkin/options/keybinds/ChangeKeybindSubState.hx @@ -1,19 +1,11 @@ package funkin.options.keybinds; -import flixel.FlxCamera; import flixel.effects.FlxFlicker; import funkin.system.Controls; import funkin.options.Options; -import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; import flixel.addons.transition.FlxTransitionableState; -import flixel.group.FlxGroup.FlxTypedGroup; -import funkin.ui.Alphabet; import flixel.util.FlxColor; import flixel.input.keyboard.FlxKey; -import flixel.math.FlxMath; -import flixel.FlxObject; -import flixel.FlxSprite; -import flixel.FlxG; class ChangeKeybindSubState extends MusicBeatSubstate { var callback:FlxKey->Void; diff --git a/source/funkin/options/keybinds/KeybindSetting.hx b/source/funkin/options/keybinds/KeybindSetting.hx index 023dba9d..dedc225b 100644 --- a/source/funkin/options/keybinds/KeybindSetting.hx +++ b/source/funkin/options/keybinds/KeybindSetting.hx @@ -1,19 +1,11 @@ package funkin.options.keybinds; -import flixel.FlxCamera; import flixel.effects.FlxFlicker; import funkin.system.Controls; import funkin.options.Options; -import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; import flixel.addons.transition.FlxTransitionableState; -import flixel.group.FlxGroup.FlxTypedGroup; -import funkin.ui.Alphabet; import flixel.util.FlxColor; import flixel.input.keyboard.FlxKey; -import flixel.math.FlxMath; -import flixel.FlxObject; -import flixel.FlxSprite; -import flixel.FlxG; using StringTools; diff --git a/source/funkin/options/keybinds/KeybindsOptions.hx b/source/funkin/options/keybinds/KeybindsOptions.hx index 0ae57240..281dddb3 100644 --- a/source/funkin/options/keybinds/KeybindsOptions.hx +++ b/source/funkin/options/keybinds/KeybindsOptions.hx @@ -1,18 +1,10 @@ package funkin.options.keybinds; -import flixel.FlxCamera; import funkin.system.Controls; import funkin.options.Options; -import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; import flixel.addons.transition.FlxTransitionableState; -import flixel.group.FlxGroup.FlxTypedGroup; -import funkin.ui.Alphabet; import flixel.util.FlxColor; import flixel.input.keyboard.FlxKey; -import flixel.math.FlxMath; -import flixel.FlxObject; -import flixel.FlxSprite; -import flixel.FlxG; using StringTools; diff --git a/source/funkin/options/type/Checkbox.hx b/source/funkin/options/type/Checkbox.hx index 8edb90bf..2b767429 100644 --- a/source/funkin/options/type/Checkbox.hx +++ b/source/funkin/options/type/Checkbox.hx @@ -1,6 +1,5 @@ package funkin.options.type; -import flixel.FlxSprite; import flixel.math.FlxPoint; @:allow() diff --git a/source/funkin/options/type/TextOption.hx b/source/funkin/options/type/TextOption.hx index c745f93c..c2aa9fd9 100644 --- a/source/funkin/options/type/TextOption.hx +++ b/source/funkin/options/type/TextOption.hx @@ -1,6 +1,5 @@ package funkin.options.type; -import funkin.ui.Alphabet; class TextOption extends OptionType { public var selectCallback:Void->Void; diff --git a/source/funkin/scripting/EventManager.hx b/source/funkin/scripting/EventManager.hx index e10bef8e..4647a2b8 100644 --- a/source/funkin/scripting/EventManager.hx +++ b/source/funkin/scripting/EventManager.hx @@ -1,6 +1,5 @@ package funkin.scripting; -import flixel.FlxG; import flixel.FlxState; import funkin.scripting.events.*; diff --git a/source/funkin/scripting/GlobalScript.hx b/source/funkin/scripting/GlobalScript.hx index 4ec24c08..0d061322 100644 --- a/source/funkin/scripting/GlobalScript.hx +++ b/source/funkin/scripting/GlobalScript.hx @@ -2,7 +2,6 @@ package funkin.scripting; import funkin.scripting.events.CancellableEvent; import funkin.system.Conductor; -import flixel.FlxG; import flixel.FlxState; import funkin.mods.ModsFolder; #if GLOBAL_SCRIPT diff --git a/source/funkin/scripting/Script.hx b/source/funkin/scripting/Script.hx index 7d3e7283..b425e8ce 100644 --- a/source/funkin/scripting/Script.hx +++ b/source/funkin/scripting/Script.hx @@ -2,7 +2,6 @@ package funkin.scripting; import lime.app.Application; import flixel.util.FlxDestroyUtil.IFlxDestroyable; -import flixel.FlxBasic; import haxe.io.Path; /** diff --git a/source/funkin/scripting/events/CountdownEvent.hx b/source/funkin/scripting/events/CountdownEvent.hx index fb0adc61..ed5acd89 100644 --- a/source/funkin/scripting/events/CountdownEvent.hx +++ b/source/funkin/scripting/events/CountdownEvent.hx @@ -1,7 +1,6 @@ package funkin.scripting.events; import flixel.tweens.FlxTween; -import flixel.FlxSprite; import flixel.system.FlxSound; class CountdownEvent extends CancellableEvent { diff --git a/source/funkin/system/AudioSwitchFix.hx b/source/funkin/system/AudioSwitchFix.hx index 7e64a7f7..8c41626f 100644 --- a/source/funkin/system/AudioSwitchFix.hx +++ b/source/funkin/system/AudioSwitchFix.hx @@ -4,7 +4,6 @@ import lime.media.AudioManager; import flixel.system.FlxSound; import flixel.FlxState; import funkin.windows.WindowsAPI; -import flixel.FlxG; /** * if youre stealing this keep this comment at least please lol diff --git a/source/funkin/system/Conductor.hx b/source/funkin/system/Conductor.hx index a7a01b9c..d15591ae 100644 --- a/source/funkin/system/Conductor.hx +++ b/source/funkin/system/Conductor.hx @@ -2,11 +2,9 @@ package funkin.system; import funkin.chart.Chart; import funkin.chart.ChartData; -import flixel.math.FlxMath; import openfl.Lib; import flixel.FlxState; import funkin.interfaces.IBeatReceiver; -import flixel.FlxG; import funkin.system.Song.SwagSong; import flixel.util.FlxSignal.FlxTypedSignal; diff --git a/source/funkin/system/Controls.hx b/source/funkin/system/Controls.hx index ba521410..04caee4c 100644 --- a/source/funkin/system/Controls.hx +++ b/source/funkin/system/Controls.hx @@ -1,7 +1,6 @@ package funkin.system; import funkin.options.Options; -import flixel.FlxG; import flixel.input.FlxInput; import flixel.input.actions.FlxAction; import flixel.input.actions.FlxActionInput; diff --git a/source/funkin/system/FlxAnimate.hx b/source/funkin/system/FlxAnimate.hx index 72521a5a..b126187e 100644 --- a/source/funkin/system/FlxAnimate.hx +++ b/source/funkin/system/FlxAnimate.hx @@ -1,15 +1,11 @@ package funkin.system; -import flixel.math.FlxMath; import openfl.geom.ColorTransform; import flixel.math.FlxMatrix; import flixel.math.FlxAngle; import flixel.math.FlxRect; import flixel.graphics.frames.FlxFrame; import flixel.math.FlxPoint; -import flixel.FlxG; -import flixel.FlxCamera; -import flixel.FlxBasic; class FlxAnimate extends flxanimate.FlxAnimate { override function drawLimb(limb:FlxFrame, _matrix:FlxMatrix, ?colorTransform:ColorTransform) diff --git a/source/funkin/system/FunkinRatioScaleMode.hx b/source/funkin/system/FunkinRatioScaleMode.hx index 2ab9b43f..f5ad21dd 100644 --- a/source/funkin/system/FunkinRatioScaleMode.hx +++ b/source/funkin/system/FunkinRatioScaleMode.hx @@ -1,6 +1,5 @@ package funkin.system; -import flixel.FlxG; import flixel.system.scaleModes.RatioScaleMode; class FunkinRatioScaleMode extends RatioScaleMode { diff --git a/source/funkin/system/FunkinSprite.hx b/source/funkin/system/FunkinSprite.hx index 0f938dfb..90339e0e 100644 --- a/source/funkin/system/FunkinSprite.hx +++ b/source/funkin/system/FunkinSprite.hx @@ -1,16 +1,12 @@ package funkin.system; -import flixel.FlxG; import haxe.io.Path; import funkin.scripting.events.PlayAnimEvent.PlayAnimContext; import funkin.interfaces.IOffsetCompatible; import flixel.math.FlxMatrix; import flixel.math.FlxRect; import flixel.math.FlxPoint; -import flixel.FlxCamera; -import flixel.math.FlxMath; import funkin.interfaces.IBeatReceiver; -import flixel.FlxSprite; import flixel.util.FlxDestroyUtil; @:enum @@ -68,7 +64,6 @@ class FunkinSprite extends FlxSprite implements IBeatReceiver implements IOffset if (Assets.exists('$noExt/Animation.json') && Assets.exists('$noExt/spritemap1.json') && Assets.exists('$noExt/spritemap1.png')) { - Assets.cache.clear(noExt); atlasPath = noExt; animateAtlas = new FlxAnimate(x, y, noExt); } @@ -158,13 +153,7 @@ class FunkinSprite extends FlxSprite implements IBeatReceiver implements IOffset public override function destroy() { super.destroy(); - if (animateAtlas != null) { - for(f in animateAtlas.frames.frames) - FlxG.bitmap.remove(f.parent); - Assets.cache.clear(atlasPath); - animateAtlas = FlxDestroyUtil.destroy(animateAtlas); - } - + animateAtlas = FlxDestroyUtil.destroy(animateAtlas); } #end diff --git a/source/funkin/system/Main.hx b/source/funkin/system/Main.hx index e5250b31..c031b8b3 100644 --- a/source/funkin/system/Main.hx +++ b/source/funkin/system/Main.hx @@ -17,7 +17,6 @@ import flash.Lib; import openfl.display.FPS; import openfl.display.Sprite; import openfl.events.Event; -import flixel.FlxG; import flixel.graphics.FlxGraphic; import flixel.addons.transition.FlxTransitionableState; import flixel.addons.transition.FlxTransitionSprite.GraphicTransTileDiamond; diff --git a/source/funkin/system/MusicBeatGroup.hx b/source/funkin/system/MusicBeatGroup.hx index 700fc8d3..af81086a 100644 --- a/source/funkin/system/MusicBeatGroup.hx +++ b/source/funkin/system/MusicBeatGroup.hx @@ -1,8 +1,6 @@ package funkin.system; -import flixel.FlxSprite; import funkin.interfaces.IBeatReceiver; -import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; class MusicBeatGroup extends FlxTypedSpriteGroup implements IBeatReceiver { public function beatHit(curBeat:Int) { diff --git a/source/funkin/system/MusicBeatState.hx b/source/funkin/system/MusicBeatState.hx index b19b13bc..fbc21c22 100644 --- a/source/funkin/system/MusicBeatState.hx +++ b/source/funkin/system/MusicBeatState.hx @@ -7,9 +7,7 @@ import funkin.scripting.events.*; import funkin.scripting.Script; import funkin.interfaces.IBeatReceiver; import funkin.system.Conductor; -import flixel.FlxG; import flixel.addons.ui.FlxUIState; -import flixel.math.FlxMath; import funkin.options.PlayerSettings; class MusicBeatState extends FlxUIState implements IBeatReceiver diff --git a/source/funkin/system/MusicBeatSubstate.hx b/source/funkin/system/MusicBeatSubstate.hx index 13bd00d4..e51ea793 100644 --- a/source/funkin/system/MusicBeatSubstate.hx +++ b/source/funkin/system/MusicBeatSubstate.hx @@ -8,9 +8,7 @@ import funkin.interfaces.IBeatReceiver; import funkin.system.Conductor.BPMChangeEvent; import funkin.system.Conductor; import funkin.options.PlayerSettings; -import flixel.FlxG; import flixel.FlxSubState; -import flixel.math.FlxMath; class MusicBeatSubstate extends FlxSubState implements IBeatReceiver { diff --git a/source/funkin/system/Paths.hx b/source/funkin/system/Paths.hx index 790d5cbf..dd2e1e62 100644 --- a/source/funkin/system/Paths.hx +++ b/source/funkin/system/Paths.hx @@ -3,7 +3,6 @@ package funkin.system; import flixel.graphics.frames.FlxFramesCollection; import haxe.io.Path; import funkin.mods.LimeLibrarySymbol; -import flixel.FlxG; import flixel.graphics.frames.FlxAtlasFrames; import openfl.utils.AssetType; import openfl.utils.Assets as OpenFlAssets; diff --git a/source/funkin/system/framerate/AssetTreeInfo.hx b/source/funkin/system/framerate/AssetTreeInfo.hx index 24aba8f7..fe48e84c 100644 --- a/source/funkin/system/framerate/AssetTreeInfo.hx +++ b/source/funkin/system/framerate/AssetTreeInfo.hx @@ -1,8 +1,6 @@ package funkin.system.framerate; import funkin.mods.ModsAssetLibrary; -import flixel.FlxG; -import flixel.math.FlxMath; class AssetTreeInfo extends FramerateCategory { public function new() { diff --git a/source/funkin/system/framerate/ConductorInfo.hx b/source/funkin/system/framerate/ConductorInfo.hx index 499474d9..009f3224 100644 --- a/source/funkin/system/framerate/ConductorInfo.hx +++ b/source/funkin/system/framerate/ConductorInfo.hx @@ -1,6 +1,5 @@ package funkin.system.framerate; -import flixel.math.FlxMath; class ConductorInfo extends FramerateCategory { public function new() { diff --git a/source/funkin/system/framerate/Framerate.hx b/source/funkin/system/framerate/Framerate.hx index 21f29d67..32d14a28 100644 --- a/source/funkin/system/framerate/Framerate.hx +++ b/source/funkin/system/framerate/Framerate.hx @@ -1,13 +1,11 @@ package funkin.system.framerate; -import flixel.math.FlxMath; import openfl.events.KeyboardEvent; import openfl.display.DisplayObject; import openfl.display.Sprite; import openfl.text.TextField; import openfl.text.TextFormat; import openfl.ui.Keyboard; -import flixel.FlxG; class Framerate extends Sprite { public static var instance:Framerate; diff --git a/source/funkin/system/framerate/FramerateCategory.hx b/source/funkin/system/framerate/FramerateCategory.hx index 7e66fb26..4d33edfe 100644 --- a/source/funkin/system/framerate/FramerateCategory.hx +++ b/source/funkin/system/framerate/FramerateCategory.hx @@ -1,6 +1,5 @@ package funkin.system.framerate; -import flixel.FlxG; import openfl.text.TextFormat; import openfl.display.Sprite; import openfl.text.TextField; diff --git a/source/funkin/system/framerate/FramerateCounter.hx b/source/funkin/system/framerate/FramerateCounter.hx index b6138741..f405a5f1 100644 --- a/source/funkin/system/framerate/FramerateCounter.hx +++ b/source/funkin/system/framerate/FramerateCounter.hx @@ -1,6 +1,5 @@ package funkin.system.framerate; -import flixel.FlxG; import openfl.text.TextFormat; import openfl.display.Sprite; import openfl.text.TextField; diff --git a/source/funkin/system/framerate/MemoryCounter.hx b/source/funkin/system/framerate/MemoryCounter.hx index cbb21d5b..14bb39c2 100644 --- a/source/funkin/system/framerate/MemoryCounter.hx +++ b/source/funkin/system/framerate/MemoryCounter.hx @@ -1,6 +1,5 @@ package funkin.system.framerate; -import flixel.FlxG; import openfl.text.TextFormat; import openfl.display.Sprite; import openfl.text.TextField; diff --git a/source/funkin/system/framerate/SystemInfo.hx b/source/funkin/system/framerate/SystemInfo.hx index 7379382b..8d3dd3a7 100644 --- a/source/funkin/system/framerate/SystemInfo.hx +++ b/source/funkin/system/framerate/SystemInfo.hx @@ -1,7 +1,5 @@ package funkin.system.framerate; -import flixel.FlxG; -import flixel.math.FlxMath; import funkin.utils.MemoryUtil; class SystemInfo extends FramerateCategory { diff --git a/source/funkin/ui/Alphabet.hx b/source/funkin/ui/Alphabet.hx index 14e24589..97f3a48c 100644 --- a/source/funkin/ui/Alphabet.hx +++ b/source/funkin/ui/Alphabet.hx @@ -4,11 +4,8 @@ import openfl.utils.AssetLibrary; import haxe.xml.Access; import funkin.mods.LimeLibrarySymbol; import funkin.mods.ModsAssetLibrary; -import flixel.FlxG; -import flixel.FlxSprite; import flixel.graphics.frames.FlxAtlasFrames; import flixel.group.FlxSpriteGroup; -import flixel.math.FlxMath; import flixel.util.FlxTimer; import flixel.util.FlxColor; diff --git a/source/funkin/updating/UpdateAvailableScreen.hx b/source/funkin/updating/UpdateAvailableScreen.hx index 4968cb59..0b65719d 100644 --- a/source/funkin/updating/UpdateAvailableScreen.hx +++ b/source/funkin/updating/UpdateAvailableScreen.hx @@ -3,16 +3,11 @@ package funkin.updating; import funkin.utils.MarkdownUtil; import funkin.menus.MainMenuState; import flixel.math.FlxPoint; -import flixel.math.FlxMath; -import flixel.FlxSprite; import funkin.updating.UpdateUtil.UpdateCheckCallback; import funkin.ui.FunkinText; import flixel.text.FlxText; -import flixel.tweens.FlxEase; -import funkin.ui.Alphabet; import flixel.addons.transition.FlxTransitionableState; import flixel.tweens.FlxTween; -import flixel.FlxG; class UpdateAvailableScreen extends MusicBeatState { public var bg:FlxSprite; diff --git a/source/funkin/updating/UpdateScreen.hx b/source/funkin/updating/UpdateScreen.hx index b1c07cf2..1b6a3bb6 100644 --- a/source/funkin/updating/UpdateScreen.hx +++ b/source/funkin/updating/UpdateScreen.hx @@ -6,8 +6,6 @@ import funkin.ui.FunkinText; import funkin.menus.TitleState; import flixel.math.FlxRect; import flixel.system.FlxSound; -import flixel.FlxSprite; -import flixel.FlxG; import flixel.ui.FlxBar; import funkin.updating.UpdateUtil.UpdateCheckCallback; diff --git a/source/funkin/utils/CoolUtil.hx b/source/funkin/utils/CoolUtil.hx index 07cf256c..150dd7d3 100644 --- a/source/funkin/utils/CoolUtil.hx +++ b/source/funkin/utils/CoolUtil.hx @@ -15,11 +15,6 @@ import flixel.input.keyboard.FlxKey; import lime.utils.Assets; import flixel.animation.FlxAnimation; import flixel.util.FlxColor; -import flixel.math.FlxMath; -import flixel.FlxG; -import flixel.FlxSprite; -import flixel.FlxObject; -import flixel.FlxCamera; import flixel.util.FlxAxes; import flixel.graphics.frames.FlxFrame; import flixel.graphics.frames.FlxFramesCollection; diff --git a/source/funkin/utils/FlxInterpolateColor.hx b/source/funkin/utils/FlxInterpolateColor.hx index a0373606..2c4c8d32 100644 --- a/source/funkin/utils/FlxInterpolateColor.hx +++ b/source/funkin/utils/FlxInterpolateColor.hx @@ -1,6 +1,5 @@ package funkin.utils; -import flixel.FlxG; import flixel.util.FlxColor; /** diff --git a/source/funkin/utils/XMLUtil.hx b/source/funkin/utils/XMLUtil.hx index 9937a458..b3e3fdd3 100644 --- a/source/funkin/utils/XMLUtil.hx +++ b/source/funkin/utils/XMLUtil.hx @@ -3,11 +3,9 @@ package funkin.utils; import funkin.system.FunkinSprite; import funkin.system.ErrorCode; import funkin.system.FunkinSprite.XMLAnimType; -import flixel.math.FlxMath; import funkin.interfaces.IBeatReceiver; import haxe.xml.Access; import funkin.interfaces.IOffsetCompatible; -import flixel.FlxSprite; using StringTools; /**