editor selection screen

buildnumber.txt

@@ -1 +1 @@
-2393
+2405

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;
 

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
 {

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`.

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;
 

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;
 

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.*;

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;
 

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) {

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;
 

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 {

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() {

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;

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;
 

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;

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 {

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<FlxBasic> {

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 {

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 {

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<FlxBasic> {

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<FlxObject> {
     public var bg:SpliceSprite;

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;

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;

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<FlxBasic> {
     public var winX(default, set):Float = 0;

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 {

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<T:FlxBasic> extends FlxTypedGroup<T> {
     public var x:Float = 0;

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.*;
 

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<Editor> = [
+        {
+            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<EditorPickerOption> = [];
+
+    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<MusicBeatState>;
+}
+
+class EditorPickerOption extends FlxTypedSpriteGroup<FlxSprite> {
+    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();
+    }
+}

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<Alphabet>;
+    public var freeplaySonglist:FreeplaySonglist;
+
+    public override function create() {
+        super.create();
+
+        songNames = new FlxTypedSpriteGroup<Alphabet>();
+
+        freeplaySonglist = FreeplaySonglist.get();
+
+        for(k=>s in freeplaySonglist.songs) {
+            var alphabet = new Alphabet(0, k * 60, s.displayName, true);
+            songNames.add(alphabet);
+        }
+
+        add(songNames);
+    }
+}

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;

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;

source/funkin/game/HealthIcon.hx

@@ -1,6 +1,5 @@
 package funkin.game;
 
-import flixel.FlxSprite;
 
 class HealthIcon extends FlxSprite
 {

source/funkin/game/Highscore.hx

@@ -1,6 +1,5 @@
 package funkin.game;
 
-import flixel.FlxG;
 
 class Highscore
 {

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;

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;

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<Note> {
     var __loopSprite:Note;

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;

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<FunkinSprite> {
     /**

source/funkin/game/SplashHandler.hx

@@ -1,6 +1,5 @@
 package funkin.game;
 
-import flixel.group.FlxGroup.FlxTypedGroup;
 
 class SplashHandler extends FlxTypedGroup<FunkinSprite> {
     /**

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;

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;

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<Strum> {
     /**

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

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 {

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<ChartMetaData> = [];
 
-    public function new() {
+    public function new() {}
-
-    }
 
 	public function getSongsFromSource(source:funkin.system.AssetsLibraryList.AssetSource) {
 		var path:String = Paths.txt('freeplaySonglist');

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

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)

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<String> = [];

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;
 

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 {

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;

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;

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 {

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;
 

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

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;

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;
 

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

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;

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() {

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;

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;
 

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;
 

source/funkin/options/type/Checkbox.hx

@@ -1,6 +1,5 @@
 package funkin.options.type;
 
-import flixel.FlxSprite;
 import flixel.math.FlxPoint;
 
 @:allow()

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;

source/funkin/scripting/EventManager.hx

@@ -1,6 +1,5 @@
 package funkin.scripting;
 
-import flixel.FlxG;
 import flixel.FlxState;
 import funkin.scripting.events.*;
 

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

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;
 
 /**

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 {

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

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;
 

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;

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)

source/funkin/system/FunkinRatioScaleMode.hx

@@ -1,6 +1,5 @@
 package funkin.system;
 
-import flixel.FlxG;
 import flixel.system.scaleModes.RatioScaleMode;
 
 class FunkinRatioScaleMode extends RatioScaleMode {

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) {
+        animateAtlas = FlxDestroyUtil.destroy(animateAtlas);        
-            for(f in animateAtlas.frames.frames)
-                FlxG.bitmap.remove(f.parent);
-            Assets.cache.clear(atlasPath);
-            animateAtlas = FlxDestroyUtil.destroy(animateAtlas);
-        }
-        
     }
     #end
 

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;

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<FlxSprite> implements IBeatReceiver {
     public function beatHit(curBeat:Int) {

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

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
 {

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;

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() {

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() {

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;

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;

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;

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;

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 {

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;
 

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;

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;
 

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;

source/funkin/utils/FlxInterpolateColor.hx

@@ -1,6 +1,5 @@
 package funkin.utils;
 
-import flixel.FlxG;
 import flixel.util.FlxColor;
 
 /**

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;
 /**