diff --git a/source/flx3d/Flx3DCamera.hx b/source/flx3d/Flx3DCamera.hx index e6e10079..7f21f846 100644 --- a/source/flx3d/Flx3DCamera.hx +++ b/source/flx3d/Flx3DCamera.hx @@ -1,32 +1,29 @@ package flx3d; #if THREE_D_SUPPORT -import away3d.entities.SegmentSet; import away3d.cameras.Camera3D; -import away3d.entities.TextureProjector; -import away3d.primitives.SkyBox; -import away3d.lights.LightBase; import away3d.containers.ObjectContainer3D; -import away3d.library.Asset3DLibraryBundle; +import away3d.containers.View3D; +import away3d.entities.Mesh; +import away3d.entities.SegmentSet; +import away3d.entities.TextureProjector; +import away3d.events.Asset3DEvent; import away3d.events.LoaderEvent; -import away3d.loaders.AssetLoader; +import away3d.library.Asset3DLibrary; +import away3d.library.Asset3DLibraryBundle; +import away3d.library.assets.Asset3DType; +import away3d.lights.LightBase; +import away3d.loaders.misc.AssetLoaderContext; import away3d.loaders.misc.AssetLoaderToken; -import funkin.backend.system.Logs; +import away3d.loaders.parsers.*; +import away3d.materials.TextureMaterial; +import away3d.primitives.SkyBox; +import away3d.utils.Cast; import flixel.FlxG; import flx3d.Flx3DUtil; -import away3d.library.assets.Asset3DType; -import away3d.library.Asset3DLibrary; -import away3d.events.Asset3DEvent; -import away3d.loaders.parsers.*; -import away3d.utils.Cast; -import away3d.materials.TextureMaterial; import haxe.io.Path; -import away3d.loaders.misc.AssetLoaderContext; import openfl.Assets; -import away3d.entities.Mesh; -import away3d.loaders.Loader3D; -import funkin.backend.utils.NativeAPI.ConsoleColor; -import away3d.containers.View3D; + #end import flixel.FlxCamera; diff --git a/source/flx3d/Flx3DView.hx b/source/flx3d/Flx3DView.hx index 24763bac..88e8a8ae 100644 --- a/source/flx3d/Flx3DView.hx +++ b/source/flx3d/Flx3DView.hx @@ -1,31 +1,26 @@ package flx3d; #if THREE_D_SUPPORT -import away3d.entities.SegmentSet; import away3d.cameras.Camera3D; -import away3d.entities.TextureProjector; -import away3d.primitives.SkyBox; -import away3d.lights.LightBase; import away3d.containers.ObjectContainer3D; -import away3d.library.Asset3DLibraryBundle; -import away3d.events.LoaderEvent; -import away3d.loaders.AssetLoader; -import away3d.loaders.misc.AssetLoaderToken; -import funkin.backend.system.Logs; -import flixel.FlxG; -import flx3d.Flx3DUtil; -import away3d.library.assets.Asset3DType; -import away3d.library.Asset3DLibrary; -import away3d.events.Asset3DEvent; -import away3d.loaders.parsers.*; -import away3d.utils.Cast; -import away3d.materials.TextureMaterial; -import haxe.io.Path; -import away3d.loaders.misc.AssetLoaderContext; -import openfl.Assets; import away3d.entities.Mesh; -import away3d.loaders.Loader3D; -import funkin.backend.utils.NativeAPI.ConsoleColor; +import away3d.entities.SegmentSet; +import away3d.entities.TextureProjector; +import away3d.events.Asset3DEvent; +import away3d.events.LoaderEvent; +import away3d.library.Asset3DLibrary; +import away3d.library.Asset3DLibraryBundle; +import away3d.library.assets.Asset3DType; +import away3d.lights.LightBase; +import away3d.loaders.misc.AssetLoaderContext; +import away3d.loaders.misc.AssetLoaderToken; +import away3d.loaders.parsers.*; +import away3d.materials.TextureMaterial; +import away3d.primitives.SkyBox; +import away3d.utils.Cast; +import flx3d.Flx3DUtil; +import haxe.io.Path; +import openfl.Assets; #end // FlxView3D with helpers for easier updating diff --git a/source/funkin/backend/FlxAnimate.hx b/source/funkin/backend/FlxAnimate.hx index c6559dfd..c2b6e8c6 100644 --- a/source/funkin/backend/FlxAnimate.hx +++ b/source/funkin/backend/FlxAnimate.hx @@ -1,12 +1,9 @@ package funkin.backend; -import flixel.graphics.frames.FlxFramesCollection; -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.math.FlxAngle; +import flixel.math.FlxMatrix; +import openfl.geom.ColorTransform; class FlxAnimate extends flxanimate.FlxAnimate { static var rMatrix = new FlxMatrix(); diff --git a/source/funkin/backend/FunkinSprite.hx b/source/funkin/backend/FunkinSprite.hx index e4672c6f..f67ee922 100644 --- a/source/funkin/backend/FunkinSprite.hx +++ b/source/funkin/backend/FunkinSprite.hx @@ -1,17 +1,17 @@ package funkin.backend; -import funkin.backend.utils.XMLUtil.BeatAnim; -import funkin.backend.utils.XMLUtil.AnimData; -import funkin.backend.utils.XMLUtil.IXMLEvents; -import flixel.system.FlxAssets.FlxGraphicAsset; import flixel.addons.effects.FlxSkewedSprite; -import haxe.io.Path; -import funkin.backend.scripting.events.PlayAnimEvent.PlayAnimContext; -import funkin.backend.system.interfaces.IOffsetCompatible; import flixel.math.FlxMatrix; -import flixel.math.FlxRect; import flixel.math.FlxPoint; +import flixel.math.FlxRect; +import flixel.system.FlxAssets.FlxGraphicAsset; +import funkin.backend.scripting.events.PlayAnimEvent.PlayAnimContext; import funkin.backend.system.interfaces.IBeatReceiver; +import funkin.backend.system.interfaces.IOffsetCompatible; +import funkin.backend.utils.XMLUtil.AnimData; +import funkin.backend.utils.XMLUtil.BeatAnim; +import funkin.backend.utils.XMLUtil.IXMLEvents; +import haxe.io.Path; enum abstract XMLAnimType(Int) { diff --git a/source/funkin/backend/FunkinText.hx b/source/funkin/backend/FunkinText.hx index 5b2c3280..aa3728ea 100644 --- a/source/funkin/backend/FunkinText.hx +++ b/source/funkin/backend/FunkinText.hx @@ -1,7 +1,7 @@ package funkin.backend; -import flixel.util.FlxColor; import flixel.text.FlxText; +import flixel.util.FlxColor; class FunkinText extends FlxText { public function new(X:Float = 0, Y:Float = 0, FieldWidth:Float = 0, ?Text:String, Size:Int = 16, Border:Bool = true) { diff --git a/source/funkin/backend/MusicBeatState.hx b/source/funkin/backend/MusicBeatState.hx index 35b684e5..e519ed0e 100644 --- a/source/funkin/backend/MusicBeatState.hx +++ b/source/funkin/backend/MusicBeatState.hx @@ -1,16 +1,16 @@ package funkin.backend; -import funkin.backend.system.framerate.Framerate; -import funkin.backend.system.GraphicCacheSprite; -import funkin.backend.system.Controls; -import funkin.backend.scripting.DummyScript; import flixel.FlxState; import flixel.FlxSubState; -import funkin.backend.scripting.events.*; +import funkin.backend.scripting.DummyScript; import funkin.backend.scripting.Script; import funkin.backend.scripting.ScriptPack; -import funkin.backend.system.interfaces.IBeatReceiver; +import funkin.backend.scripting.events.*; import funkin.backend.system.Conductor; +import funkin.backend.system.Controls; +import funkin.backend.system.GraphicCacheSprite; +import funkin.backend.system.framerate.Framerate; +import funkin.backend.system.interfaces.IBeatReceiver; import funkin.options.PlayerSettings; class MusicBeatState extends FlxState implements IBeatReceiver diff --git a/source/funkin/backend/MusicBeatSubstate.hx b/source/funkin/backend/MusicBeatSubstate.hx index e2bbb312..d8ee8076 100644 --- a/source/funkin/backend/MusicBeatSubstate.hx +++ b/source/funkin/backend/MusicBeatSubstate.hx @@ -1,15 +1,15 @@ package funkin.backend; import flixel.FlxState; -import funkin.backend.scripting.events.*; +import flixel.FlxSubState; +import funkin.backend.scripting.DummyScript; import funkin.backend.scripting.Script; import funkin.backend.scripting.ScriptPack; -import funkin.backend.scripting.DummyScript; -import funkin.backend.system.interfaces.IBeatReceiver; +import funkin.backend.scripting.events.*; import funkin.backend.system.Conductor; import funkin.backend.system.Controls; +import funkin.backend.system.interfaces.IBeatReceiver; import funkin.options.PlayerSettings; -import flixel.FlxSubState; class MusicBeatSubstate extends FlxSubState implements IBeatReceiver { diff --git a/source/funkin/backend/MusicBeatTransition.hx b/source/funkin/backend/MusicBeatTransition.hx index 34b02388..7bb1805d 100644 --- a/source/funkin/backend/MusicBeatTransition.hx +++ b/source/funkin/backend/MusicBeatTransition.hx @@ -1,7 +1,7 @@ package funkin.backend; -import flixel.tweens.FlxTween; import flixel.FlxState; +import flixel.tweens.FlxTween; import funkin.backend.utils.FunkinParentDisabler; class MusicBeatTransition extends MusicBeatSubstate { diff --git a/source/funkin/backend/chart/Chart.hx b/source/funkin/backend/chart/Chart.hx index 7a35c2ba..0ff0634c 100644 --- a/source/funkin/backend/chart/Chart.hx +++ b/source/funkin/backend/chart/Chart.hx @@ -1,13 +1,11 @@ package funkin.backend.chart; -import funkin.backend.system.Conductor; -import funkin.backend.chart.ChartData; import flixel.util.FlxColor; -import haxe.io.Path; +import funkin.backend.chart.ChartData; import haxe.Json; +import haxe.io.Path; #if sys -import sys.io.File; import sys.FileSystem; #end diff --git a/source/funkin/backend/chart/EventsData.hx b/source/funkin/backend/chart/EventsData.hx index 16551cb7..e801f18f 100644 --- a/source/funkin/backend/chart/EventsData.hx +++ b/source/funkin/backend/chart/EventsData.hx @@ -1,11 +1,11 @@ package funkin.backend.chart; -import hscript.Parser; -import hscript.Interp; -import haxe.Json; -import openfl.Assets; -import haxe.io.Path; import funkin.backend.assets.Paths; +import haxe.Json; +import haxe.io.Path; +import hscript.Interp; +import hscript.Parser; +import openfl.Assets; using StringTools; diff --git a/source/funkin/backend/chart/PsychParser.hx b/source/funkin/backend/chart/PsychParser.hx index 1af9962a..2d5a8b7b 100644 --- a/source/funkin/backend/chart/PsychParser.hx +++ b/source/funkin/backend/chart/PsychParser.hx @@ -1,7 +1,7 @@ package funkin.backend.chart; -import funkin.backend.chart.FNFLegacyParser.SwagSection; import funkin.backend.chart.ChartData.ChartEvent; +import funkin.backend.chart.FNFLegacyParser.SwagSection; import funkin.backend.chart.FNFLegacyParser.SwagSong; import funkin.backend.system.Conductor; diff --git a/source/funkin/backend/scripting/GlobalScript.hx b/source/funkin/backend/scripting/GlobalScript.hx index 5c037aec..d2d9323f 100644 --- a/source/funkin/backend/scripting/GlobalScript.hx +++ b/source/funkin/backend/scripting/GlobalScript.hx @@ -1,9 +1,9 @@ package funkin.backend.scripting; -import funkin.backend.scripting.events.CancellableEvent; -import funkin.backend.system.Conductor; import flixel.FlxState; import funkin.backend.assets.ModsFolder; +import funkin.backend.scripting.events.CancellableEvent; +import funkin.backend.system.Conductor; #if GLOBAL_SCRIPT /** * Class for THE Global Script, aka script that runs in the background at all times. diff --git a/source/funkin/backend/scripting/HScript.hx b/source/funkin/backend/scripting/HScript.hx index 37aaaa95..962db9e2 100644 --- a/source/funkin/backend/scripting/HScript.hx +++ b/source/funkin/backend/scripting/HScript.hx @@ -1,10 +1,9 @@ package funkin.backend.scripting; -import haxe.io.Path; +import hscript.*; import hscript.Expr.Error; import hscript.Parser; import openfl.Assets; -import hscript.*; class HScript extends Script { public var interp:Interp; diff --git a/source/funkin/backend/scripting/Script.hx b/source/funkin/backend/scripting/Script.hx index 7d141349..1ea7e123 100644 --- a/source/funkin/backend/scripting/Script.hx +++ b/source/funkin/backend/scripting/Script.hx @@ -1,10 +1,9 @@ package funkin.backend.scripting; -import lime.app.Application; import flixel.util.FlxDestroyUtil.IFlxDestroyable; -import haxe.io.Path; -import hscript.IHScriptCustomConstructor; import flixel.util.FlxStringUtil; +import haxe.io.Path; +import lime.app.Application; @:allow(funkin.backend.scripting.ScriptPack) /** diff --git a/source/funkin/backend/shaders/CustomShader.hx b/source/funkin/backend/shaders/CustomShader.hx index 7ea07c7e..93d480c6 100644 --- a/source/funkin/backend/shaders/CustomShader.hx +++ b/source/funkin/backend/shaders/CustomShader.hx @@ -1,8 +1,6 @@ package funkin.backend.shaders; -import haxe.Exception; import openfl.Assets; -import hscript.IHScriptCustomBehaviour; /** * Class for custom shaders. diff --git a/source/funkin/backend/shaders/FunkinShader.hx b/source/funkin/backend/shaders/FunkinShader.hx index 8002d9fd..612411e9 100644 --- a/source/funkin/backend/shaders/FunkinShader.hx +++ b/source/funkin/backend/shaders/FunkinShader.hx @@ -2,22 +2,16 @@ package funkin.backend.shaders; import haxe.Exception; import hscript.IHScriptCustomBehaviour; -import flixel.graphics.tile.FlxGraphicsShader; -import openfl.display3D.Program3D; import flixel.system.FlxAssets.FlxShader; -import openfl.display.BitmapData; -import openfl.display.ShaderParameter; -import openfl.display.ShaderParameterType; -import openfl.display.ShaderInput; import lime.utils.Float32Array; -using StringTools; - +import openfl.display.ShaderParameterType; import openfl.display.ShaderParameter; import openfl.display.BitmapData; import openfl.display.ShaderInput; +using StringTools; @:access(openfl.display3D.Context3D) @:access(openfl.display3D.Program3D) @:access(openfl.display.ShaderInput) diff --git a/source/funkin/backend/system/Conductor.hx b/source/funkin/backend/system/Conductor.hx index 8db60b36..21680774 100644 --- a/source/funkin/backend/system/Conductor.hx +++ b/source/funkin/backend/system/Conductor.hx @@ -1,9 +1,9 @@ package funkin.backend.system; -import funkin.backend.chart.ChartData; import flixel.FlxState; -import funkin.backend.system.interfaces.IBeatReceiver; import flixel.util.FlxSignal.FlxTypedSignal; +import funkin.backend.chart.ChartData; +import funkin.backend.system.interfaces.IBeatReceiver; typedef BPMChangeEvent = { diff --git a/source/funkin/backend/system/Controls.hx b/source/funkin/backend/system/Controls.hx index 76c50d14..e70648cb 100644 --- a/source/funkin/backend/system/Controls.hx +++ b/source/funkin/backend/system/Controls.hx @@ -3,10 +3,8 @@ package funkin.backend.system; import flixel.input.FlxInput; import flixel.input.actions.FlxAction; import flixel.input.actions.FlxActionInput; -import flixel.input.actions.FlxActionInputDigital; import flixel.input.actions.FlxActionManager; import flixel.input.actions.FlxActionSet; -import flixel.input.gamepad.FlxGamepadButton; import flixel.input.gamepad.FlxGamepadInputID; import flixel.input.keyboard.FlxKey; diff --git a/source/funkin/backend/system/Logs.hx b/source/funkin/backend/system/Logs.hx index ab317835..1f083324 100644 --- a/source/funkin/backend/system/Logs.hx +++ b/source/funkin/backend/system/Logs.hx @@ -2,9 +2,9 @@ package funkin.backend.system; import flixel.system.debug.log.LogStyle; import flixel.system.frontEnds.LogFrontEnd; -import haxe.Log; -import funkin.backend.utils.NativeAPI; import funkin.backend.utils.NativeAPI.ConsoleColor; +import funkin.backend.utils.NativeAPI; +import haxe.Log; class Logs { private static var __showing:Bool = false; diff --git a/source/funkin/backend/system/Main.hx b/source/funkin/backend/system/Main.hx index a874ed80..7ff01ee7 100644 --- a/source/funkin/backend/system/Main.hx +++ b/source/funkin/backend/system/Main.hx @@ -1,29 +1,26 @@ package funkin.backend.system; -import funkin.editors.SaveWarning; -import funkin.backend.assets.AssetsLibraryList; -import funkin.backend.system.framerate.SystemInfo; -import openfl.utils.AssetLibrary; -import openfl.text.TextFormat; +import flixel.addons.transition.FlxTransitionSprite.GraphicTransTileDiamond; +import flixel.addons.transition.FlxTransitionableState; +import flixel.addons.transition.TransitionData; +import flixel.graphics.FlxGraphic; +import flixel.math.FlxPoint; +import flixel.math.FlxRect; import flixel.system.ui.FlxSoundTray; +import funkin.backend.assets.AssetsLibraryList; +import funkin.backend.assets.ModsFolder; +import funkin.backend.system.framerate.SystemInfo; +import funkin.backend.system.modules.*; +import funkin.editors.SaveWarning; import openfl.Assets; import openfl.Lib; import openfl.display.Sprite; -import flixel.graphics.FlxGraphic; -import flixel.addons.transition.FlxTransitionableState; -import flixel.addons.transition.FlxTransitionSprite.GraphicTransTileDiamond; -import flixel.addons.transition.TransitionData; -import flixel.math.FlxPoint; -import flixel.math.FlxRect; -import funkin.backend.system.modules.*; +import openfl.text.TextFormat; +import openfl.utils.AssetLibrary; #if ALLOW_MULTITHREADING import sys.thread.Thread; #end -#if sys -import sys.io.File; -#end -import funkin.backend.assets.ModsFolder; #if android import android.content.Context; import android.os.Build; @@ -213,9 +210,9 @@ class Main extends Sprite public static var noCwdFix:Bool = false; public static function fixWorkingDirectory() { #if windows - if (!noCwdFix && !sys.FileSystem.exists('manifest/default.json')) { - Sys.setCwd(haxe.io.Path.directory(Sys.programPath())); - } + if (!noCwdFix && !sys.FileSystem.exists('manifest/default.json')) { + Sys.setCwd(haxe.io.Path.directory(Sys.programPath())); + } #elseif android Sys.setCwd(Path.addTrailingSlash(VERSION.SDK_INT > 30 ? Context.getObbDir() : Context.getExternalFilesDir())); #elseif (ios || switch) diff --git a/source/funkin/backend/system/MainState.hx b/source/funkin/backend/system/MainState.hx index 885da7b0..32a75569 100644 --- a/source/funkin/backend/system/MainState.hx +++ b/source/funkin/backend/system/MainState.hx @@ -3,11 +3,11 @@ package funkin.backend.system; #if MOD_SUPPORT import sys.FileSystem; #end -import funkin.backend.assets.ModsFolder; -import funkin.menus.TitleState; -import funkin.menus.BetaWarningState; -import funkin.backend.chart.EventsData; import flixel.FlxState; +import funkin.backend.assets.ModsFolder; +import funkin.backend.chart.EventsData; +import funkin.menus.BetaWarningState; +import funkin.menus.TitleState; /** * Simple state used for loading the game diff --git a/source/funkin/backend/system/OptimizedBitmapData.hx b/source/funkin/backend/system/OptimizedBitmapData.hx index d79f6ad1..f6cf1117 100644 --- a/source/funkin/backend/system/OptimizedBitmapData.hx +++ b/source/funkin/backend/system/OptimizedBitmapData.hx @@ -1,9 +1,9 @@ package funkin.backend.system; import lime.graphics.Image; -import openfl.geom.Rectangle; -import openfl.display.BitmapData; import lime.graphics.cairo.CairoImageSurface; +import openfl.display.BitmapData; +import openfl.geom.Rectangle; class OptimizedBitmapData extends BitmapData { @SuppressWarnings("checkstyle:Dynamic") diff --git a/source/funkin/backend/system/framerate/CodenameBuildField.hx b/source/funkin/backend/system/framerate/CodenameBuildField.hx index 2cef4a26..3175a01e 100644 --- a/source/funkin/backend/system/framerate/CodenameBuildField.hx +++ b/source/funkin/backend/system/framerate/CodenameBuildField.hx @@ -1,9 +1,7 @@ package funkin.backend.system.framerate; -import openfl.text.TextFormat; -import openfl.display.Sprite; -import openfl.text.TextField; import funkin.backend.system.macros.GitCommitMacro; +import openfl.text.TextField; class CodenameBuildField extends TextField { public function new() { diff --git a/source/funkin/backend/system/framerate/ConductorInfo.hx b/source/funkin/backend/system/framerate/ConductorInfo.hx index 96f4e39d..c13e026f 100644 --- a/source/funkin/backend/system/framerate/ConductorInfo.hx +++ b/source/funkin/backend/system/framerate/ConductorInfo.hx @@ -1,6 +1,5 @@ package funkin.backend.system.framerate; - class ConductorInfo extends FramerateCategory { public function new() { super("Conductor Info"); diff --git a/source/funkin/backend/system/framerate/Framerate.hx b/source/funkin/backend/system/framerate/Framerate.hx index e2e565b0..8faa09ee 100644 --- a/source/funkin/backend/system/framerate/Framerate.hx +++ b/source/funkin/backend/system/framerate/Framerate.hx @@ -1,12 +1,11 @@ package funkin.backend.system.framerate; +import flixel.math.FlxPoint; import openfl.display.Bitmap; import openfl.display.BitmapData; -import flixel.math.FlxPoint; -import openfl.events.KeyboardEvent; import openfl.display.DisplayObject; import openfl.display.Sprite; -import openfl.text.TextField; +import openfl.events.KeyboardEvent; import openfl.text.TextFormat; import openfl.ui.Keyboard; diff --git a/source/funkin/backend/system/framerate/FramerateCategory.hx b/source/funkin/backend/system/framerate/FramerateCategory.hx index fcc44fde..f1125eb4 100644 --- a/source/funkin/backend/system/framerate/FramerateCategory.hx +++ b/source/funkin/backend/system/framerate/FramerateCategory.hx @@ -1,9 +1,9 @@ package funkin.backend.system.framerate; import openfl.display.Bitmap; -import openfl.text.TextFormat; import openfl.display.Sprite; import openfl.text.TextField; +import openfl.text.TextFormat; class FramerateCategory extends Sprite { public var title:TextField; diff --git a/source/funkin/backend/system/framerate/FramerateCounter.hx b/source/funkin/backend/system/framerate/FramerateCounter.hx index 55cc0f97..0b3ed07b 100644 --- a/source/funkin/backend/system/framerate/FramerateCounter.hx +++ b/source/funkin/backend/system/framerate/FramerateCounter.hx @@ -1,8 +1,8 @@ package funkin.backend.system.framerate; -import openfl.text.TextFormat; import openfl.display.Sprite; import openfl.text.TextField; +import openfl.text.TextFormat; class FramerateCounter extends Sprite { public var fpsNum:TextField; diff --git a/source/funkin/backend/system/framerate/MemoryCounter.hx b/source/funkin/backend/system/framerate/MemoryCounter.hx index 01321f0d..33efff59 100644 --- a/source/funkin/backend/system/framerate/MemoryCounter.hx +++ b/source/funkin/backend/system/framerate/MemoryCounter.hx @@ -1,8 +1,8 @@ package funkin.backend.system.framerate; -import openfl.text.TextFormat; import openfl.display.Sprite; import openfl.text.TextField; +import openfl.text.TextFormat; class MemoryCounter extends Sprite { public var memoryText:TextField; diff --git a/source/funkin/backend/system/framerate/SystemInfo.hx b/source/funkin/backend/system/framerate/SystemInfo.hx index 0d2bc73a..a815e3b5 100644 --- a/source/funkin/backend/system/framerate/SystemInfo.hx +++ b/source/funkin/backend/system/framerate/SystemInfo.hx @@ -1,8 +1,8 @@ package funkin.backend.system.framerate; -import funkin.backend.utils.native.HiddenProcess; -import funkin.backend.utils.MemoryUtil; import funkin.backend.system.Logs; +import funkin.backend.utils.MemoryUtil; +import funkin.backend.utils.native.HiddenProcess; using StringTools; diff --git a/source/funkin/backend/system/github/GitHub.hx b/source/funkin/backend/system/github/GitHub.hx index 27ba825b..778bb447 100644 --- a/source/funkin/backend/system/github/GitHub.hx +++ b/source/funkin/backend/system/github/GitHub.hx @@ -1,8 +1,8 @@ package funkin.backend.system.github; #if GITHUB_API -import haxe.Json; import haxe.Exception; +import haxe.Json; #end // TODO: Document further and perhaps make this a Haxelib. diff --git a/source/funkin/backend/system/github/GitHubUser.hx b/source/funkin/backend/system/github/GitHubUser.hx index e0dc15bc..f9e71d39 100644 --- a/source/funkin/backend/system/github/GitHubUser.hx +++ b/source/funkin/backend/system/github/GitHubUser.hx @@ -1,6 +1,5 @@ package funkin.backend.system.github; - typedef GitHubUser = { /** * Username of the user. diff --git a/source/funkin/backend/system/modules/AudioSwitchFix.hx b/source/funkin/backend/system/modules/AudioSwitchFix.hx index db8360c1..232c1eb8 100644 --- a/source/funkin/backend/system/modules/AudioSwitchFix.hx +++ b/source/funkin/backend/system/modules/AudioSwitchFix.hx @@ -1,9 +1,9 @@ package funkin.backend.system.modules; -import lime.media.AudioManager; -import flixel.sound.FlxSound; import flixel.FlxState; +import flixel.sound.FlxSound; import funkin.backend.utils.NativeAPI; +import lime.media.AudioManager; /** * if youre stealing this keep this comment at least please lol diff --git a/source/funkin/backend/system/modules/CrashHandler.hx b/source/funkin/backend/system/modules/CrashHandler.hx index 19c18316..124b915c 100644 --- a/source/funkin/backend/system/modules/CrashHandler.hx +++ b/source/funkin/backend/system/modules/CrashHandler.hx @@ -1,13 +1,11 @@ package funkin.backend.system.modules; -import lime.system.System; import funkin.backend.utils.NativeAPI; -import openfl.Lib; -import openfl.events.UncaughtErrorEvent; -import openfl.events.ErrorEvent; -import openfl.errors.Error; -import openfl.events.UncaughtErrorEvent; import haxe.CallStack; +import openfl.Lib; +import openfl.errors.Error; +import openfl.events.ErrorEvent; +import openfl.events.UncaughtErrorEvent; class CrashHandler { public static function init() { diff --git a/source/funkin/backend/system/modules/FunkinCache.hx b/source/funkin/backend/system/modules/FunkinCache.hx index a7559281..e1d82834 100644 --- a/source/funkin/backend/system/modules/FunkinCache.hx +++ b/source/funkin/backend/system/modules/FunkinCache.hx @@ -1,9 +1,9 @@ package funkin.backend.system.modules; -import openfl.utils.AssetCache; import openfl.display.BitmapData; import openfl.media.Sound; import openfl.text.Font; +import openfl.utils.AssetCache; #if lime import lime.utils.Assets as LimeAssets; #end diff --git a/source/funkin/backend/system/updating/AsyncUpdater.hx b/source/funkin/backend/system/updating/AsyncUpdater.hx index 04dbafe8..ac31b044 100644 --- a/source/funkin/backend/system/updating/AsyncUpdater.hx +++ b/source/funkin/backend/system/updating/AsyncUpdater.hx @@ -1,19 +1,17 @@ package funkin.backend.system.updating; -import openfl.Lib; -import sys.io.Process; -import haxe.zip.Reader; +import funkin.backend.system.github.GitHubRelease; import funkin.backend.utils.ZipUtil; import haxe.io.Path; -import openfl.utils.ByteArray; -import sys.io.File; -import sys.io.FileOutput; +import openfl.Lib; import openfl.events.Event; import openfl.events.ProgressEvent; -import openfl.net.URLRequest; import openfl.net.URLLoader; +import openfl.net.URLRequest; +import openfl.utils.ByteArray; import sys.FileSystem; -import funkin.backend.system.github.GitHubRelease; +import sys.io.File; +import sys.io.FileOutput; class AsyncUpdater { // NON ASYNC STUFF diff --git a/source/funkin/backend/system/updating/UpdateAvailableScreen.hx b/source/funkin/backend/system/updating/UpdateAvailableScreen.hx index d3a3869a..8814dcec 100644 --- a/source/funkin/backend/system/updating/UpdateAvailableScreen.hx +++ b/source/funkin/backend/system/updating/UpdateAvailableScreen.hx @@ -1,13 +1,11 @@ package funkin.backend.system.updating; +import flixel.addons.transition.FlxTransitionableState; +import flixel.math.FlxPoint; +import funkin.backend.FunkinText; +import funkin.backend.system.updating.UpdateUtil.UpdateCheckCallback; import funkin.backend.utils.MarkdownUtil; import funkin.menus.MainMenuState; -import flixel.math.FlxPoint; -import funkin.backend.system.updating.UpdateUtil.UpdateCheckCallback; -import funkin.backend.FunkinText; -import flixel.text.FlxText; -import flixel.addons.transition.FlxTransitionableState; -import flixel.tweens.FlxTween; class UpdateAvailableScreen extends MusicBeatState { public var bg:FlxSprite; diff --git a/source/funkin/backend/system/updating/UpdateScreen.hx b/source/funkin/backend/system/updating/UpdateScreen.hx index 323fda09..d7da6539 100644 --- a/source/funkin/backend/system/updating/UpdateScreen.hx +++ b/source/funkin/backend/system/updating/UpdateScreen.hx @@ -1,12 +1,12 @@ package funkin.backend.system.updating; -import funkin.backend.shaders.CustomShader; -import funkin.backend.FunkinText; -import funkin.menus.TitleState; import flixel.math.FlxRect; import flixel.sound.FlxSound; import flixel.ui.FlxBar; +import funkin.backend.FunkinText; +import funkin.backend.shaders.CustomShader; import funkin.backend.system.updating.UpdateUtil.UpdateCheckCallback; +import funkin.menus.TitleState; class UpdateScreen extends MusicBeatState { public var updater:AsyncUpdater; diff --git a/source/funkin/backend/system/updating/UpdateUtil.hx b/source/funkin/backend/system/updating/UpdateUtil.hx index f8268b93..9515b990 100644 --- a/source/funkin/backend/system/updating/UpdateUtil.hx +++ b/source/funkin/backend/system/updating/UpdateUtil.hx @@ -1,10 +1,10 @@ package funkin.backend.system.updating; -import sys.FileSystem; -import haxe.io.Path; -import funkin.backend.system.github.GitHubRelease; import funkin.backend.system.github.GitHub; +import funkin.backend.system.github.GitHubRelease; +import haxe.io.Path; import lime.app.Application; +import sys.FileSystem; using funkin.backend.system.github.GitHub; diff --git a/source/funkin/backend/utils/BitmapUtil.hx b/source/funkin/backend/utils/BitmapUtil.hx index 367d0123..776e9330 100644 --- a/source/funkin/backend/utils/BitmapUtil.hx +++ b/source/funkin/backend/utils/BitmapUtil.hx @@ -1,7 +1,7 @@ package funkin.backend.utils; -import openfl.display.BitmapData; import flixel.util.FlxColor; +import openfl.display.BitmapData; class BitmapUtil { /** diff --git a/source/funkin/backend/utils/CoolUtil.hx b/source/funkin/backend/utils/CoolUtil.hx index 58bf7bae..c441ebe0 100644 --- a/source/funkin/backend/utils/CoolUtil.hx +++ b/source/funkin/backend/utils/CoolUtil.hx @@ -1,24 +1,24 @@ package funkin.backend.utils; -import flixel.text.FlxText; -import funkin.backend.utils.XMLUtil.TextFormat; -import flixel.util.typeLimit.OneOfTwo; -import flixel.tweens.FlxTween; -import flixel.system.frontEnds.SoundFrontEnd; -import flixel.sound.FlxSound; -import funkin.backend.system.Conductor; -import flixel.sound.FlxSoundGroup; -import haxe.Json; -import haxe.io.Path; -import haxe.io.Bytes; -import haxe.xml.Access; -import flixel.input.keyboard.FlxKey; -import lime.utils.Assets; import flixel.animation.FlxAnimation; -import flixel.util.FlxColor; +import flixel.input.keyboard.FlxKey; +import flixel.sound.FlxSound; +import flixel.sound.FlxSoundGroup; +import flixel.system.frontEnds.SoundFrontEnd; +import flixel.text.FlxText; +import flixel.tweens.FlxTween; import flixel.util.FlxAxes; -import openfl.geom.ColorTransform; +import flixel.util.FlxColor; +import flixel.util.typeLimit.OneOfTwo; +import funkin.backend.system.Conductor; +import funkin.backend.utils.XMLUtil.TextFormat; import haxe.CallStack; +import haxe.Json; +import haxe.io.Bytes; +import haxe.io.Path; +import haxe.xml.Access; +import lime.utils.Assets; +import openfl.geom.ColorTransform; using StringTools; diff --git a/source/funkin/backend/utils/DiscordUtil.hx b/source/funkin/backend/utils/DiscordUtil.hx index a4c63f4f..154a3758 100644 --- a/source/funkin/backend/utils/DiscordUtil.hx +++ b/source/funkin/backend/utils/DiscordUtil.hx @@ -1,19 +1,19 @@ package funkin.backend.utils; -import funkin.backend.scripting.events.DiscordPresenceUpdateEvent; -import funkin.backend.scripting.events.CancellableEvent; -import funkin.backend.scripting.*; // lazy +import flixel.sound.FlxSound; import flixel.util.typeLimit.OneOfTwo; -import openfl.display.BitmapData; +import funkin.backend.scripting.*; // lazy +import funkin.backend.scripting.events.CancellableEvent; +import funkin.backend.scripting.events.DiscordPresenceUpdateEvent; import funkin.backend.system.macros.Utils; import haxe.Json; -import flixel.sound.FlxSound; +import openfl.display.BitmapData; #if DISCORD_RPC +import Sys; import hxdiscord_rpc.Discord; import hxdiscord_rpc.Types; -import sys.thread.Thread; -import Sys; import lime.app.Application; +import sys.thread.Thread; #end class DiscordUtil diff --git a/source/funkin/backend/utils/EngineUtil.hx b/source/funkin/backend/utils/EngineUtil.hx index d3d9b561..9f0e9157 100644 --- a/source/funkin/backend/utils/EngineUtil.hx +++ b/source/funkin/backend/utils/EngineUtil.hx @@ -1,7 +1,7 @@ package funkin.backend.utils; -import funkin.backend.scripting.Script; import funkin.backend.scripting.MultiThreadedScript; +import funkin.backend.scripting.Script; class EngineUtil { /** diff --git a/source/funkin/backend/utils/FunkinParentDisabler.hx b/source/funkin/backend/utils/FunkinParentDisabler.hx index 37d96277..4a7efc3b 100644 --- a/source/funkin/backend/utils/FunkinParentDisabler.hx +++ b/source/funkin/backend/utils/FunkinParentDisabler.hx @@ -1,8 +1,8 @@ package funkin.backend.utils; import flixel.sound.FlxSound; -import flixel.util.FlxTimer; import flixel.tweens.FlxTween; +import flixel.util.FlxTimer; /** * FlxBasic allowing you to disable those elements from the parent state while this substate is opened diff --git a/source/funkin/backend/utils/IniUtil.hx b/source/funkin/backend/utils/IniUtil.hx index 7f090554..d7b5738e 100644 --- a/source/funkin/backend/utils/IniUtil.hx +++ b/source/funkin/backend/utils/IniUtil.hx @@ -1,6 +1,5 @@ package funkin.backend.utils; - /** * DOESNT SUPPORT CATEGORIES YET!! */ diff --git a/source/funkin/backend/utils/MarkdownUtil.hx b/source/funkin/backend/utils/MarkdownUtil.hx index 7ba67558..c3692f38 100644 --- a/source/funkin/backend/utils/MarkdownUtil.hx +++ b/source/funkin/backend/utils/MarkdownUtil.hx @@ -1,7 +1,7 @@ package funkin.backend.utils; -import flixel.util.FlxColor; import flixel.text.FlxText; +import flixel.util.FlxColor; class MarkdownUtil { public static function applyMarkdownText(text:FlxText, str:String) { diff --git a/source/funkin/backend/utils/NdllUtil.hx b/source/funkin/backend/utils/NdllUtil.hx index 24493c58..97ab5d3e 100644 --- a/source/funkin/backend/utils/NdllUtil.hx +++ b/source/funkin/backend/utils/NdllUtil.hx @@ -1,7 +1,5 @@ package funkin.backend.utils; -import lime.app.Application; - /** * Small util that allows you to load any function from ndlls via `getFunction`. * diff --git a/source/funkin/backend/utils/SysZip.hx b/source/funkin/backend/utils/SysZip.hx index 717773f8..b1c013fb 100644 --- a/source/funkin/backend/utils/SysZip.hx +++ b/source/funkin/backend/utils/SysZip.hx @@ -3,10 +3,10 @@ package funkin.backend.utils; #if sys import haxe.io.Input; import haxe.zip.Entry; +import haxe.zip.InflateImpl; import haxe.zip.Reader; import sys.io.File; import sys.io.FileInput; -import haxe.zip.InflateImpl; /** * Class that extends Reader allowing you to load ZIP entries without blowing your RAM up!! diff --git a/source/funkin/backend/utils/XMLUtil.hx b/source/funkin/backend/utils/XMLUtil.hx index 2f314e78..d382869c 100644 --- a/source/funkin/backend/utils/XMLUtil.hx +++ b/source/funkin/backend/utils/XMLUtil.hx @@ -1,12 +1,12 @@ package funkin.backend.utils; +import flixel.util.FlxColor; +import flixel.util.typeLimit.OneOfTwo; +import funkin.backend.FunkinSprite.XMLAnimType; import funkin.backend.FunkinSprite; import funkin.backend.system.ErrorCode; -import funkin.backend.FunkinSprite.XMLAnimType; -import flixel.util.FlxColor; -import haxe.xml.Access; -import flixel.util.typeLimit.OneOfTwo; import funkin.backend.system.interfaces.IOffsetCompatible; +import haxe.xml.Access; using StringTools; diff --git a/source/funkin/backend/utils/ZipUtil.hx b/source/funkin/backend/utils/ZipUtil.hx index eef06a6d..16a353c2 100644 --- a/source/funkin/backend/utils/ZipUtil.hx +++ b/source/funkin/backend/utils/ZipUtil.hx @@ -8,12 +8,12 @@ import openfl.display.BitmapData; import haxe.Exception; import haxe.Json; import haxe.crypto.Crc32; -import haxe.zip.Writer; -import haxe.zip.Tools; -import haxe.zip.Entry; -import haxe.zip.Uncompress; -import haxe.zip.Reader; import haxe.zip.Compress; +import haxe.zip.Entry; +import haxe.zip.Reader; +import haxe.zip.Tools; +import haxe.zip.Uncompress; +import haxe.zip.Writer; import sys.FileSystem; import sys.io.File; import sys.thread.Thread; diff --git a/source/funkin/editors/DebugOptions.hx b/source/funkin/editors/DebugOptions.hx index 8dcfeda7..7f5201b9 100644 --- a/source/funkin/editors/DebugOptions.hx +++ b/source/funkin/editors/DebugOptions.hx @@ -1,9 +1,9 @@ package funkin.editors; -import funkin.options.type.*; +import funkin.backend.utils.NativeAPI; import funkin.options.OptionsScreen; import funkin.options.TreeMenu; -import funkin.backend.utils.NativeAPI; +import funkin.options.type.*; class DebugOptions extends TreeMenu { public override function create() { diff --git a/source/funkin/editors/EditorPicker.hx b/source/funkin/editors/EditorPicker.hx index 7056305f..8a2ebd89 100644 --- a/source/funkin/editors/EditorPicker.hx +++ b/source/funkin/editors/EditorPicker.hx @@ -1,7 +1,7 @@ package funkin.editors; -import flixel.math.FlxPoint; import flixel.effects.FlxFlicker; +import flixel.math.FlxPoint; class EditorPicker extends MusicBeatSubstate { public var bg:FlxSprite; diff --git a/source/funkin/editors/EditorTreeMenu.hx b/source/funkin/editors/EditorTreeMenu.hx index f65cd4bf..543b0555 100644 --- a/source/funkin/editors/EditorTreeMenu.hx +++ b/source/funkin/editors/EditorTreeMenu.hx @@ -1,7 +1,7 @@ package funkin.editors; -import funkin.menus.MainMenuState; import flixel.addons.display.FlxBackdrop; +import funkin.menus.MainMenuState; import funkin.options.*; class EditorTreeMenu extends TreeMenu { diff --git a/source/funkin/editors/UIDebugState.hx b/source/funkin/editors/UIDebugState.hx index dd74c90e..3a0bf57f 100644 --- a/source/funkin/editors/UIDebugState.hx +++ b/source/funkin/editors/UIDebugState.hx @@ -1,7 +1,7 @@ package funkin.editors; -import funkin.editors.ui.*; import flixel.tweens.FlxTween; +import funkin.editors.ui.*; class UIDebugState extends UIState { public override function create() { diff --git a/source/funkin/editors/character/CharacterAnimButtons.hx b/source/funkin/editors/character/CharacterAnimButtons.hx index 106f589f..c80913cd 100644 --- a/source/funkin/editors/character/CharacterAnimButtons.hx +++ b/source/funkin/editors/character/CharacterAnimButtons.hx @@ -1,7 +1,7 @@ package funkin.editors.character; -import flixel.util.FlxColor; import flixel.math.FlxPoint; +import flixel.util.FlxColor; class CharacterAnimButtons extends UIButton { public var anim:String = ""; diff --git a/source/funkin/editors/character/CharacterAnimScreen.hx b/source/funkin/editors/character/CharacterAnimScreen.hx index 1b64907f..8d691c42 100644 --- a/source/funkin/editors/character/CharacterAnimScreen.hx +++ b/source/funkin/editors/character/CharacterAnimScreen.hx @@ -1,7 +1,7 @@ package funkin.editors.character; -import flixel.math.FlxPoint; import flixel.animation.FlxAnimation; +import flixel.math.FlxPoint; import funkin.backend.utils.XMLUtil.AnimData; class CharacterAnimScreen extends UISubstateWindow { diff --git a/source/funkin/editors/character/CharacterEditor.hx b/source/funkin/editors/character/CharacterEditor.hx index 10fa4efa..a5646b89 100644 --- a/source/funkin/editors/character/CharacterEditor.hx +++ b/source/funkin/editors/character/CharacterEditor.hx @@ -1,12 +1,12 @@ package funkin.editors.character; -import funkin.backend.system.framerate.Framerate; -import haxe.xml.Printer; -import haxe.xml.Access; -import funkin.backend.utils.XMLUtil.AnimData; import flixel.math.FlxPoint; +import funkin.backend.system.framerate.Framerate; +import funkin.backend.utils.XMLUtil.AnimData; import funkin.editors.ui.UIContextMenu.UIContextMenuOption; import funkin.game.Character; +import haxe.xml.Access; +import haxe.xml.Printer; class CharacterEditor extends UIState { static var __character:String; diff --git a/source/funkin/editors/character/CharacterGhostsHandler.hx b/source/funkin/editors/character/CharacterGhostsHandler.hx index 62a44c9f..fe823898 100644 --- a/source/funkin/editors/character/CharacterGhostsHandler.hx +++ b/source/funkin/editors/character/CharacterGhostsHandler.hx @@ -1,8 +1,8 @@ package funkin.editors.character; -import haxe.xml.Access; import flixel.math.FlxPoint; import funkin.game.Character; +import haxe.xml.Access; class CharacterGhostsHandler extends FlxTypedGroup { public var character:Character; diff --git a/source/funkin/editors/character/CharacterInfoScreen.hx b/source/funkin/editors/character/CharacterInfoScreen.hx index 28425c2e..de3dac36 100644 --- a/source/funkin/editors/character/CharacterInfoScreen.hx +++ b/source/funkin/editors/character/CharacterInfoScreen.hx @@ -1,9 +1,9 @@ package funkin.editors.character; import flixel.math.FlxPoint; -import haxe.xml.Access; -import funkin.game.Character; import funkin.editors.extra.PropertyButton; +import funkin.game.Character; +import haxe.xml.Access; class CharacterInfoScreen extends UISubstateWindow { public var character:Character; diff --git a/source/funkin/editors/character/CharacterSelection.hx b/source/funkin/editors/character/CharacterSelection.hx index 817acf29..eb9a1e3a 100644 --- a/source/funkin/editors/character/CharacterSelection.hx +++ b/source/funkin/editors/character/CharacterSelection.hx @@ -1,13 +1,10 @@ package funkin.editors.character; -import funkin.options.type.OptionType; -import funkin.options.type.NewOption; -import flixel.util.FlxColor; import funkin.game.Character; -import funkin.backend.chart.Chart; -import funkin.options.type.TextOption; -import funkin.options.type.IconOption; import funkin.options.OptionsScreen; +import funkin.options.type.IconOption; +import funkin.options.type.NewOption; +import funkin.options.type.OptionType; class CharacterSelection extends EditorTreeMenu { diff --git a/source/funkin/editors/charter/ChartCreationScreen.hx b/source/funkin/editors/charter/ChartCreationScreen.hx index c89835f9..78983762 100644 --- a/source/funkin/editors/charter/ChartCreationScreen.hx +++ b/source/funkin/editors/charter/ChartCreationScreen.hx @@ -2,12 +2,11 @@ package funkin.editors.charter; import flixel.text.FlxText.FlxTextFormat; import flixel.text.FlxText.FlxTextFormatMarkerPair; +import funkin.backend.chart.ChartData; import funkin.backend.shaders.CustomShader; import funkin.game.Character; -import funkin.game.Stage; import funkin.game.HealthIcon; -import funkin.backend.chart.ChartData; -import haxe.io.Bytes; +import funkin.game.Stage; class ChartCreationScreen extends UISubstateWindow { private var onSave:(String, ChartData) -> Void = null; diff --git a/source/funkin/editors/charter/ChartDataScreen.hx b/source/funkin/editors/charter/ChartDataScreen.hx index b4592d05..bc0762ad 100644 --- a/source/funkin/editors/charter/ChartDataScreen.hx +++ b/source/funkin/editors/charter/ChartDataScreen.hx @@ -1,9 +1,9 @@ package funkin.editors.charter; -import funkin.game.Stage; -import funkin.backend.chart.ChartData; import flixel.math.FlxPoint; import funkin.backend.chart.ChartData.ChartMetaData; +import funkin.backend.chart.ChartData; +import funkin.game.Stage; using StringTools; diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx index c20382d8..acaf9367 100644 --- a/source/funkin/editors/charter/Charter.hx +++ b/source/funkin/editors/charter/Charter.hx @@ -1,30 +1,21 @@ package funkin.editors.charter; // ! FUCK YOU CHUF (your biggest fan -lunar) <3 -import flixel.input.FlxPointer; -import openfl.geom.Point; -import openfl.geom.Rectangle; -import flixel.graphics.FlxGraphic; -import flixel.addons.display.FlxTiledSprite; -import funkin.editors.ui.UIContextMenu.UIContextMenuOptionSpr; -import funkin.editors.ui.UITopMenu.UITopMenuButton; -import funkin.editors.charter.CharterStrumline; -import funkin.editors.charter.CharterBackdropGroup.EventBackdrop; -import funkin.backend.system.framerate.Framerate; -import haxe.Json; import flixel.input.keyboard.FlxKey; -import flixel.sound.FlxSound; import flixel.math.FlxPoint; -import funkin.editors.charter.CharterBackdropGroup.CharterBackdropDummy; -import funkin.backend.system.Conductor; +import flixel.sound.FlxSound; import funkin.backend.chart.*; import funkin.backend.chart.ChartData; -import flixel.addons.display.FlxBackdrop; +import funkin.backend.system.Conductor; +import funkin.backend.system.framerate.Framerate; +import funkin.editors.charter.CharterBackdropGroup.CharterBackdropDummy; +import funkin.editors.charter.CharterBackdropGroup.EventBackdrop; +import funkin.editors.charter.CharterStrumline; import funkin.editors.ui.UIContextMenu.UIContextMenuOption; +import funkin.editors.ui.UIContextMenu.UIContextMenuOptionSpr; import funkin.editors.ui.UIState; -import flixel.util.FlxColor; -import openfl.display.BitmapData; -import funkin.backend.shaders.CustomShader; +import funkin.editors.ui.UITopMenu.UITopMenuButton; +import haxe.Json; class Charter extends UIState { public static var __song:String; diff --git a/source/funkin/editors/charter/CharterAutoSaveUI.hx b/source/funkin/editors/charter/CharterAutoSaveUI.hx index 5f3ed9b8..81f207ad 100644 --- a/source/funkin/editors/charter/CharterAutoSaveUI.hx +++ b/source/funkin/editors/charter/CharterAutoSaveUI.hx @@ -1,8 +1,8 @@ package funkin.editors.charter; -import flixel.util.FlxTimer; -import flixel.tweens.FlxTween; import flixel.math.FlxRect; +import flixel.tweens.FlxTween; +import flixel.util.FlxTimer; using flixel.util.FlxSpriteUtil; diff --git a/source/funkin/editors/charter/CharterBackdropGroup.hx b/source/funkin/editors/charter/CharterBackdropGroup.hx index 21eeb90f..481bd76b 100644 --- a/source/funkin/editors/charter/CharterBackdropGroup.hx +++ b/source/funkin/editors/charter/CharterBackdropGroup.hx @@ -1,9 +1,9 @@ package funkin.editors.charter; +import flixel.addons.display.FlxBackdrop; import flixel.graphics.FlxGraphic; import funkin.backend.system.Conductor; import openfl.geom.Rectangle; -import flixel.addons.display.FlxBackdrop; class CharterBackdropGroup extends FlxTypedGroup { public var strumLineGroup:CharterStrumLineGroup; diff --git a/source/funkin/editors/charter/CharterEvent.hx b/source/funkin/editors/charter/CharterEvent.hx index 89a5d0d9..af8996a4 100644 --- a/source/funkin/editors/charter/CharterEvent.hx +++ b/source/funkin/editors/charter/CharterEvent.hx @@ -1,11 +1,11 @@ package funkin.editors.charter; -import funkin.editors.charter.Charter.ICharterSelectable; import flixel.math.FlxPoint; +import funkin.backend.chart.ChartData.ChartEvent; +import funkin.editors.charter.Charter.ICharterSelectable; +import funkin.editors.charter.CharterBackdropGroup.EventBackdrop; import funkin.game.Character; import funkin.game.HealthIcon; -import funkin.editors.charter.CharterBackdropGroup.EventBackdrop; -import funkin.backend.chart.ChartData.ChartEvent; class CharterEvent extends UISliceSprite implements ICharterSelectable { public var events:Array; diff --git a/source/funkin/editors/charter/CharterEventGroup.hx b/source/funkin/editors/charter/CharterEventGroup.hx index aab06d18..b81ee554 100644 --- a/source/funkin/editors/charter/CharterEventGroup.hx +++ b/source/funkin/editors/charter/CharterEventGroup.hx @@ -1,7 +1,7 @@ package funkin.editors.charter; -import funkin.editors.charter.CharterBackdropGroup.EventBackdrop; import flixel.util.FlxSort; +import funkin.editors.charter.CharterBackdropGroup.EventBackdrop; class CharterEventGroup extends FlxTypedGroup { public var eventsBackdrop:EventBackdrop; diff --git a/source/funkin/editors/charter/CharterEventScreen.hx b/source/funkin/editors/charter/CharterEventScreen.hx index 31d62580..ec9ce660 100644 --- a/source/funkin/editors/charter/CharterEventScreen.hx +++ b/source/funkin/editors/charter/CharterEventScreen.hx @@ -1,10 +1,10 @@ package funkin.editors.charter; -import funkin.backend.chart.ChartData.ChartEvent; -import funkin.backend.system.Conductor; import flixel.group.FlxGroup; -import funkin.backend.chart.EventsData; import flixel.util.FlxColor; +import funkin.backend.chart.ChartData.ChartEvent; +import funkin.backend.chart.EventsData; +import funkin.backend.system.Conductor; using StringTools; diff --git a/source/funkin/editors/charter/CharterNote.hx b/source/funkin/editors/charter/CharterNote.hx index 1d130842..bc214209 100644 --- a/source/funkin/editors/charter/CharterNote.hx +++ b/source/funkin/editors/charter/CharterNote.hx @@ -1,11 +1,10 @@ package funkin.editors.charter; import flixel.math.FlxPoint; -import funkin.editors.charter.Charter.ICharterSelectable; -import funkin.backend.system.Conductor; import flixel.tweens.FlxTween; -import funkin.backend.shaders.CustomShader; import flixel.util.FlxColor; +import funkin.backend.system.Conductor; +import funkin.editors.charter.Charter.ICharterSelectable; class CharterNote extends UISprite implements ICharterSelectable { var angleTween:FlxTween; diff --git a/source/funkin/editors/charter/CharterSelection.hx b/source/funkin/editors/charter/CharterSelection.hx index 6fd97bdc..24fe55f4 100644 --- a/source/funkin/editors/charter/CharterSelection.hx +++ b/source/funkin/editors/charter/CharterSelection.hx @@ -1,15 +1,15 @@ package funkin.editors.charter; -import funkin.backend.chart.ChartData; import funkin.backend.chart.ChartData.ChartMetaData; -import haxe.Json; -import funkin.editors.charter.SongCreationScreen.SongCreationData; -import funkin.options.type.NewOption; +import funkin.backend.chart.ChartData; import funkin.backend.system.framerate.Framerate; -import funkin.menus.FreeplayState.FreeplaySonglist; import funkin.editors.EditorTreeMenu; +import funkin.editors.charter.SongCreationScreen.SongCreationData; +import funkin.menus.FreeplayState.FreeplaySonglist; import funkin.options.*; import funkin.options.type.*; +import funkin.options.type.NewOption; +import haxe.Json; using StringTools; diff --git a/source/funkin/editors/charter/CharterStrumLineGroup.hx b/source/funkin/editors/charter/CharterStrumLineGroup.hx index 483b62ce..296cffaa 100644 --- a/source/funkin/editors/charter/CharterStrumLineGroup.hx +++ b/source/funkin/editors/charter/CharterStrumLineGroup.hx @@ -1,7 +1,7 @@ package funkin.editors.charter; -import funkin.backend.chart.EventsData; import flixel.util.FlxSort; +import funkin.backend.chart.EventsData; class CharterStrumLineGroup extends FlxTypedGroup { var __pastStrumlines:Array; diff --git a/source/funkin/editors/charter/CharterStrumline.hx b/source/funkin/editors/charter/CharterStrumline.hx index 3850c2fa..c7b332e3 100644 --- a/source/funkin/editors/charter/CharterStrumline.hx +++ b/source/funkin/editors/charter/CharterStrumline.hx @@ -1,12 +1,12 @@ package funkin.editors.charter; import flixel.group.FlxSpriteGroup; -import funkin.game.Character; -import funkin.editors.ui.UITopMenu.UITopMenuButton; -import funkin.game.HealthIcon; +import flixel.sound.FlxSound; import funkin.backend.chart.ChartData.ChartStrumLine; import funkin.backend.shaders.CustomShader; -import flixel.sound.FlxSound; +import funkin.editors.ui.UITopMenu.UITopMenuButton; +import funkin.game.Character; +import funkin.game.HealthIcon; class CharterStrumline extends UISprite { public var strumLine:ChartStrumLine; diff --git a/source/funkin/editors/charter/CharterStrumlineButton.hx b/source/funkin/editors/charter/CharterStrumlineButton.hx index c5619330..a0a8c7df 100644 --- a/source/funkin/editors/charter/CharterStrumlineButton.hx +++ b/source/funkin/editors/charter/CharterStrumlineButton.hx @@ -1,7 +1,7 @@ package funkin.editors.charter; -import flixel.tweens.FlxTween; import flixel.math.FlxPoint; +import flixel.tweens.FlxTween; class CharterStrumlineButton extends UISprite { public var button:UISprite; diff --git a/source/funkin/editors/charter/CharterStrumlineScreen.hx b/source/funkin/editors/charter/CharterStrumlineScreen.hx index 26696251..ad8f9972 100644 --- a/source/funkin/editors/charter/CharterStrumlineScreen.hx +++ b/source/funkin/editors/charter/CharterStrumlineScreen.hx @@ -1,10 +1,9 @@ package funkin.editors.charter; import flixel.math.FlxPoint; -import funkin.game.Note; +import funkin.backend.chart.ChartData.ChartStrumLine; import funkin.game.Character; import funkin.game.HealthIcon; -import funkin.backend.chart.ChartData.ChartStrumLine; class CharterStrumlineScreen extends UISubstateWindow { public var strumLineID:Int = -1; diff --git a/source/funkin/editors/charter/CharterWaveformHandler.hx b/source/funkin/editors/charter/CharterWaveformHandler.hx index 44ef5ee9..f6c5ba28 100644 --- a/source/funkin/editors/charter/CharterWaveformHandler.hx +++ b/source/funkin/editors/charter/CharterWaveformHandler.hx @@ -1,9 +1,9 @@ package funkin.editors.charter; -import flixel.util.FlxColor; -import funkin.backend.system.Conductor; import flixel.sound.FlxSound; +import flixel.util.FlxColor; import funkin.backend.shaders.CustomShader; +import funkin.backend.system.Conductor; import openfl.display.BitmapData; class CharterWaveformHandler extends FlxBasic { diff --git a/source/funkin/editors/charter/SongCreationScreen.hx b/source/funkin/editors/charter/SongCreationScreen.hx index fdd9cf1e..95c682ce 100644 --- a/source/funkin/editors/charter/SongCreationScreen.hx +++ b/source/funkin/editors/charter/SongCreationScreen.hx @@ -1,8 +1,8 @@ package funkin.editors.charter; +import flixel.group.FlxGroup; import flixel.text.FlxText.FlxTextFormat; import flixel.text.FlxText.FlxTextFormatMarkerPair; -import flixel.group.FlxGroup; import funkin.backend.chart.ChartData.ChartMetaData; import haxe.io.Bytes; diff --git a/source/funkin/editors/import.hx b/source/funkin/editors/import.hx index 75250a63..3d64ccc2 100644 --- a/source/funkin/editors/import.hx +++ b/source/funkin/editors/import.hx @@ -1,8 +1,8 @@ #if !macro package funkin.editors; -import funkin.editors.ui.*; import flixel.math.FlxPoint; +import funkin.editors.ui.*; using funkin.editors.ui.UIUtil; #end \ No newline at end of file diff --git a/source/funkin/editors/ui/IUIFocusable.hx b/source/funkin/editors/ui/IUIFocusable.hx index b2285a76..e5bd0838 100644 --- a/source/funkin/editors/ui/IUIFocusable.hx +++ b/source/funkin/editors/ui/IUIFocusable.hx @@ -1,7 +1,7 @@ package funkin.editors.ui; -import lime.ui.KeyModifier; import lime.ui.KeyCode; +import lime.ui.KeyModifier; interface IUIFocusable { public function onKeyDown(e:KeyCode, modifier:KeyModifier):Void; diff --git a/source/funkin/editors/ui/UIAudioPlayer.hx b/source/funkin/editors/ui/UIAudioPlayer.hx index b6b95448..c0f49d90 100644 --- a/source/funkin/editors/ui/UIAudioPlayer.hx +++ b/source/funkin/editors/ui/UIAudioPlayer.hx @@ -1,13 +1,13 @@ package funkin.editors.ui; import flixel.math.FlxRect; -import flixel.util.FlxColor; -import flixel.ui.FlxBar; import flixel.sound.FlxSound; +import flixel.ui.FlxBar; +import flixel.util.FlxColor; +import flixel.util.FlxStringUtil; import haxe.io.Bytes; import lime.media.AudioBuffer; import openfl.media.Sound; -import flixel.util.FlxStringUtil; using flixel.util.FlxSpriteUtil; diff --git a/source/funkin/editors/ui/UIAutoCompleteTextBox.hx b/source/funkin/editors/ui/UIAutoCompleteTextBox.hx index 938a2384..556e5522 100644 --- a/source/funkin/editors/ui/UIAutoCompleteTextBox.hx +++ b/source/funkin/editors/ui/UIAutoCompleteTextBox.hx @@ -1,7 +1,7 @@ package funkin.editors.ui; -import lime.ui.KeyModifier; import lime.ui.KeyCode; +import lime.ui.KeyModifier; class UIAutoCompleteTextBox extends UITextBox { public var suggestionText:UIText; diff --git a/source/funkin/editors/ui/UIButtonList.hx b/source/funkin/editors/ui/UIButtonList.hx index f6fbc3a1..ec8385e5 100644 --- a/source/funkin/editors/ui/UIButtonList.hx +++ b/source/funkin/editors/ui/UIButtonList.hx @@ -1,9 +1,9 @@ package funkin.editors.ui; import flixel.FlxCamera; +import flixel.math.FlxMath; import flixel.math.FlxPoint; import flixel.util.FlxSort; -import flixel.math.FlxMath; class UIButtonList extends UIWindow { public var buttons:FlxTypedGroup = new FlxTypedGroup(); diff --git a/source/funkin/editors/ui/UIColorwheel.hx b/source/funkin/editors/ui/UIColorwheel.hx index d19db808..5607853b 100644 --- a/source/funkin/editors/ui/UIColorwheel.hx +++ b/source/funkin/editors/ui/UIColorwheel.hx @@ -1,8 +1,8 @@ package funkin.editors.ui; import flixel.math.FlxPoint; -import funkin.backend.shaders.CustomShader; import flixel.util.FlxColor; +import funkin.backend.shaders.CustomShader; using flixel.util.FlxSpriteUtil; diff --git a/source/funkin/editors/ui/UIContextMenu.hx b/source/funkin/editors/ui/UIContextMenu.hx index d10b3fd9..8cc5bcb0 100644 --- a/source/funkin/editors/ui/UIContextMenu.hx +++ b/source/funkin/editors/ui/UIContextMenu.hx @@ -1,8 +1,7 @@ package funkin.editors.ui; -import flixel.util.FlxColor; -import flixel.util.typeLimit.OneOfTwo; import flixel.input.keyboard.FlxKey; +import flixel.util.FlxColor; class UIContextMenu extends MusicBeatSubstate { public var options:Array; diff --git a/source/funkin/editors/ui/UISlider.hx b/source/funkin/editors/ui/UISlider.hx index 277c7b95..d07bb915 100644 --- a/source/funkin/editors/ui/UISlider.hx +++ b/source/funkin/editors/ui/UISlider.hx @@ -1,8 +1,9 @@ package funkin.editors.ui; import flixel.util.FlxColor; -using flixel.util.FlxSpriteUtil; + using StringTools; +using flixel.util.FlxSpriteUtil; typedef SliderSegement = { var start:Float; diff --git a/source/funkin/editors/ui/UIState.hx b/source/funkin/editors/ui/UIState.hx index 077750f3..1c32fad6 100644 --- a/source/funkin/editors/ui/UIState.hx +++ b/source/funkin/editors/ui/UIState.hx @@ -1,14 +1,14 @@ package funkin.editors.ui; -import lime.ui.KeyModifier; -import lime.ui.KeyCode; +import flixel.math.FlxPoint; +import flixel.math.FlxRect; import funkin.backend.system.framerate.Framerate; import funkin.editors.ui.UIContextMenu.UIContextMenuCallback; -import openfl.ui.Mouse; import funkin.editors.ui.UIContextMenu.UIContextMenuOption; -import flixel.math.FlxPoint; +import lime.ui.KeyCode; +import lime.ui.KeyModifier; +import openfl.ui.Mouse; import openfl.ui.MouseCursor; -import flixel.math.FlxRect; class UIState extends MusicBeatState { public var curContextMenu:UIContextMenu = null; diff --git a/source/funkin/editors/ui/UISubstateWindow.hx b/source/funkin/editors/ui/UISubstateWindow.hx index b17afbba..f99e184b 100644 --- a/source/funkin/editors/ui/UISubstateWindow.hx +++ b/source/funkin/editors/ui/UISubstateWindow.hx @@ -1,8 +1,8 @@ package funkin.editors.ui; -import openfl.filters.ShaderFilter; import flixel.tweens.FlxTween; import funkin.backend.shaders.CustomShader; +import openfl.filters.ShaderFilter; // TODO: make UIWarningSubstate extend this class UISubstateWindow extends MusicBeatSubstate { diff --git a/source/funkin/editors/ui/UITextBox.hx b/source/funkin/editors/ui/UITextBox.hx index 3aa97fd2..ffc20c49 100644 --- a/source/funkin/editors/ui/UITextBox.hx +++ b/source/funkin/editors/ui/UITextBox.hx @@ -1,8 +1,8 @@ package funkin.editors.ui; import flixel.math.FlxPoint; -import lime.ui.KeyModifier; import lime.ui.KeyCode; +import lime.ui.KeyModifier; import openfl.desktop.Clipboard; import openfl.geom.Rectangle; diff --git a/source/funkin/editors/ui/UIWarningSubstate.hx b/source/funkin/editors/ui/UIWarningSubstate.hx index 2d652f6b..84edf922 100644 --- a/source/funkin/editors/ui/UIWarningSubstate.hx +++ b/source/funkin/editors/ui/UIWarningSubstate.hx @@ -1,9 +1,9 @@ package funkin.editors.ui; -import openfl.filters.ShaderFilter; -import flixel.tweens.FlxTween; import flixel.tweens.FlxEase; +import flixel.tweens.FlxTween; import funkin.backend.shaders.CustomShader; +import openfl.filters.ShaderFilter; class UIWarningSubstate extends MusicBeatSubstate { var camShaders:Array = []; diff --git a/source/funkin/game/Character.hx b/source/funkin/game/Character.hx index 2f6d0a7e..747f898d 100644 --- a/source/funkin/game/Character.hx +++ b/source/funkin/game/Character.hx @@ -1,22 +1,22 @@ package funkin.game; -import flixel.util.FlxColor; -import funkin.backend.FunkinSprite; import flixel.graphics.frames.FlxFrame; import flixel.math.FlxPoint; -import funkin.backend.system.interfaces.IBeatReceiver; -import funkin.backend.system.interfaces.IOffsetCompatible; -import funkin.backend.utils.XMLUtil; import flixel.math.FlxRect; -import haxe.xml.Access; -import haxe.Exception; -import haxe.io.Path; -import funkin.backend.system.Conductor; -import openfl.geom.ColorTransform; +import flixel.util.FlxColor; +import funkin.backend.FunkinSprite; import funkin.backend.scripting.DummyScript; import funkin.backend.scripting.Script; import funkin.backend.scripting.events.*; import funkin.backend.scripting.events.PlayAnimEvent.PlayAnimContext; +import funkin.backend.system.Conductor; +import funkin.backend.system.interfaces.IBeatReceiver; +import funkin.backend.system.interfaces.IOffsetCompatible; +import funkin.backend.utils.XMLUtil; +import haxe.Exception; +import haxe.io.Path; +import haxe.xml.Access; +import openfl.geom.ColorTransform; using StringTools; diff --git a/source/funkin/game/GameOverSubstate.hx b/source/funkin/game/GameOverSubstate.hx index 4868b130..af36ff29 100644 --- a/source/funkin/game/GameOverSubstate.hx +++ b/source/funkin/game/GameOverSubstate.hx @@ -1,15 +1,15 @@ package funkin.game; -import funkin.editors.charter.Charter; -import funkin.backend.scripting.events.GameOverCreationEvent; -import funkin.backend.scripting.events.CancellableEvent; -import funkin.backend.scripting.Script; import flixel.sound.FlxSound; import flixel.util.FlxColor; import flixel.util.FlxTimer; -import funkin.menus.StoryMenuState; -import funkin.menus.FreeplayState; +import funkin.backend.scripting.Script; +import funkin.backend.scripting.events.CancellableEvent; +import funkin.backend.scripting.events.GameOverCreationEvent; import funkin.backend.system.Conductor; +import funkin.editors.charter.Charter; +import funkin.menus.FreeplayState; +import funkin.menus.StoryMenuState; class GameOverSubstate extends MusicBeatSubstate { diff --git a/source/funkin/game/HudCamera.hx b/source/funkin/game/HudCamera.hx index accd5f30..ba7b5a83 100644 --- a/source/funkin/game/HudCamera.hx +++ b/source/funkin/game/HudCamera.hx @@ -1,6 +1,5 @@ package funkin.game; -import flixel.math.FlxMatrix; import flixel.math.FlxPoint; class HudCamera extends FlxCamera { diff --git a/source/funkin/game/Note.hx b/source/funkin/game/Note.hx index d541015d..b7251a13 100644 --- a/source/funkin/game/Note.hx +++ b/source/funkin/game/Note.hx @@ -1,10 +1,10 @@ package funkin.game; -import funkin.backend.chart.ChartData; import flixel.math.FlxPoint; import flixel.math.FlxRect; -import funkin.backend.system.Conductor; +import funkin.backend.chart.ChartData; import funkin.backend.scripting.events.*; +import funkin.backend.system.Conductor; using StringTools; diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index a3908317..c4022b10 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1,22 +1,8 @@ package funkin.game; -import funkin.editors.charter.CharterSelection; import flixel.FlxState; -import funkin.editors.SaveWarning; -import funkin.backend.chart.EventsData; -import funkin.backend.system.RotatingSpriteGroup; -import funkin.editors.charter.Charter; -import funkin.savedata.FunkinSave; -import flixel.graphics.FlxGraphic; -import funkin.backend.chart.Chart; -import funkin.backend.chart.ChartData; -import funkin.game.SplashHandler; -import funkin.backend.scripting.DummyScript; -import funkin.menus.StoryMenuState.WeekData; -import funkin.backend.FunkinText; -import funkin.backend.scripting.Script; -import funkin.backend.scripting.ScriptPack; import flixel.FlxSubState; +import flixel.graphics.FlxGraphic; import flixel.math.FlxPoint; import flixel.sound.FlxSound; import flixel.text.FlxText; @@ -25,12 +11,25 @@ import flixel.ui.FlxBar; import flixel.util.FlxColor; import flixel.util.FlxSort; import flixel.util.FlxTimer; -import haxe.io.Path; -import funkin.backend.system.Conductor; -import funkin.game.cutscenes.*; - -import funkin.menus.*; +import funkin.backend.FunkinText; +import funkin.backend.chart.Chart; +import funkin.backend.chart.ChartData; +import funkin.backend.chart.EventsData; +import funkin.backend.scripting.DummyScript; +import funkin.backend.scripting.Script; +import funkin.backend.scripting.ScriptPack; import funkin.backend.scripting.events.*; +import funkin.backend.system.Conductor; +import funkin.backend.system.RotatingSpriteGroup; +import funkin.editors.SaveWarning; +import funkin.editors.charter.Charter; +import funkin.editors.charter.CharterSelection; +import funkin.game.SplashHandler; +import funkin.game.cutscenes.*; +import funkin.menus.*; +import funkin.menus.StoryMenuState.WeekData; +import funkin.savedata.FunkinSave; +import haxe.io.Path; using StringTools; diff --git a/source/funkin/game/SplashHandler.hx b/source/funkin/game/SplashHandler.hx index d7bc4e46..dc6f7533 100644 --- a/source/funkin/game/SplashHandler.hx +++ b/source/funkin/game/SplashHandler.hx @@ -1,6 +1,5 @@ package funkin.game; - class SplashHandler extends FlxTypedGroup { /** * Map containing all of the splashes group. diff --git a/source/funkin/game/Stage.hx b/source/funkin/game/Stage.hx index af36d445..0c98960d 100644 --- a/source/funkin/game/Stage.hx +++ b/source/funkin/game/Stage.hx @@ -1,13 +1,13 @@ package funkin.game; -import funkin.backend.scripting.events.StageXMLEvent; -import funkin.backend.scripting.events.StageNodeEvent; -import flixel.math.FlxPoint; import flixel.FlxState; -import haxe.xml.Access; -import funkin.backend.system.interfaces.IBeatReceiver; +import flixel.math.FlxPoint; import funkin.backend.scripting.Script; +import funkin.backend.scripting.events.StageNodeEvent; +import funkin.backend.scripting.events.StageXMLEvent; +import funkin.backend.system.interfaces.IBeatReceiver; import haxe.io.Path; +import haxe.xml.Access; using StringTools; diff --git a/source/funkin/game/StrumLine.hx b/source/funkin/game/StrumLine.hx index 68320514..037f9744 100644 --- a/source/funkin/game/StrumLine.hx +++ b/source/funkin/game/StrumLine.hx @@ -1,14 +1,13 @@ package funkin.game; import flixel.math.FlxPoint; +import flixel.sound.FlxSound; +import flixel.tweens.FlxTween; import flixel.util.FlxSignal.FlxTypedSignal; - +import funkin.backend.chart.ChartData; import funkin.backend.scripting.events.*; import funkin.backend.system.Conductor; -import funkin.backend.chart.ChartData; import funkin.backend.system.Controls; -import flixel.tweens.FlxTween; -import flixel.sound.FlxSound; class StrumLine extends FlxTypedGroup { /** diff --git a/source/funkin/game/cutscenes/DialogueCutscene.hx b/source/funkin/game/cutscenes/DialogueCutscene.hx index 656df6f2..b3b16c8e 100644 --- a/source/funkin/game/cutscenes/DialogueCutscene.hx +++ b/source/funkin/game/cutscenes/DialogueCutscene.hx @@ -1,14 +1,14 @@ package funkin.game.cutscenes; -import funkin.backend.utils.FunkinParentDisabler; -import funkin.backend.scripting.events.dialogue.*; +import flixel.sound.FlxSound; +import funkin.backend.scripting.Script; import funkin.backend.scripting.events.CancellableEvent; import funkin.backend.scripting.events.DynamicEvent; -import funkin.backend.scripting.Script; -import flixel.sound.FlxSound; +import funkin.backend.scripting.events.dialogue.*; +import funkin.backend.utils.FunkinParentDisabler; import funkin.game.cutscenes.dialogue.*; -import haxe.xml.Access; import haxe.io.Path; +import haxe.xml.Access; /** * Substate made for dialogue cutscenes. To use it in a scripted cutscene, call `startDialogue`. diff --git a/source/funkin/game/cutscenes/ScriptedCutscene.hx b/source/funkin/game/cutscenes/ScriptedCutscene.hx index 3f36f1af..b305cca0 100644 --- a/source/funkin/game/cutscenes/ScriptedCutscene.hx +++ b/source/funkin/game/cutscenes/ScriptedCutscene.hx @@ -1,7 +1,6 @@ package funkin.game.cutscenes; import funkin.backend.scripting.DummyScript; -import flixel.addons.transition.FlxTransitionableState; import funkin.backend.scripting.Script; /** diff --git a/source/funkin/game/cutscenes/VideoCutscene.hx b/source/funkin/game/cutscenes/VideoCutscene.hx index 8e290631..f9834cbf 100644 --- a/source/funkin/game/cutscenes/VideoCutscene.hx +++ b/source/funkin/game/cutscenes/VideoCutscene.hx @@ -1,16 +1,16 @@ package funkin.game.cutscenes; -import flixel.util.FlxColor; -import haxe.io.Path; import flixel.addons.display.FlxBackdrop; +import flixel.util.FlxColor; +import flixel.util.FlxTimer; +import funkin.backend.FunkinText; +import haxe.Int64; +import haxe.io.FPHelper; +import haxe.io.Path; +import haxe.xml.Access; #if sys import sys.io.File; #end -import funkin.backend.FunkinText; -import haxe.io.FPHelper; -import haxe.xml.Access; -import haxe.Int64; -import flixel.util.FlxTimer; #if VIDEO_CUTSCENES import hxvlc.flixel.FlxVideo; #end diff --git a/source/funkin/game/cutscenes/dialogue/DialogueBox.hx b/source/funkin/game/cutscenes/dialogue/DialogueBox.hx index caf45949..47f2a58e 100644 --- a/source/funkin/game/cutscenes/dialogue/DialogueBox.hx +++ b/source/funkin/game/cutscenes/dialogue/DialogueBox.hx @@ -1,14 +1,11 @@ package funkin.game.cutscenes.dialogue; -import funkin.backend.scripting.events.dialogue.*; -import funkin.backend.scripting.events.PlayAnimEvent; -import funkin.backend.scripting.events.PlayAnimEvent.PlayAnimContext; -import funkin.backend.scripting.events.CancellableEvent; -import funkin.backend.scripting.Script; -import flixel.sound.FlxSound; import flixel.addons.text.FlxTypeText; -import flixel.math.FlxPoint; -import flixel.util.FlxColor; +import flixel.sound.FlxSound; +import funkin.backend.scripting.Script; +import funkin.backend.scripting.events.PlayAnimEvent.PlayAnimContext; +import funkin.backend.scripting.events.PlayAnimEvent; +import funkin.backend.scripting.events.dialogue.*; import haxe.xml.Access; class DialogueBox extends FunkinSprite { diff --git a/source/funkin/game/cutscenes/dialogue/DialogueCharacter.hx b/source/funkin/game/cutscenes/dialogue/DialogueCharacter.hx index 97701e1f..502b1a83 100644 --- a/source/funkin/game/cutscenes/dialogue/DialogueCharacter.hx +++ b/source/funkin/game/cutscenes/dialogue/DialogueCharacter.hx @@ -1,10 +1,9 @@ package funkin.game.cutscenes.dialogue; +import flixel.tweens.FlxTween; +import funkin.backend.scripting.Script; import funkin.backend.scripting.events.PlayAnimEvent; import funkin.backend.scripting.events.dialogue.*; -import funkin.backend.scripting.events.CancellableEvent; -import funkin.backend.scripting.Script; -import flixel.tweens.FlxTween; import haxe.xml.Access; class DialogueCharacter extends FunkinSprite { diff --git a/source/funkin/menus/BetaWarningState.hx b/source/funkin/menus/BetaWarningState.hx index 16201454..d436138f 100644 --- a/source/funkin/menus/BetaWarningState.hx +++ b/source/funkin/menus/BetaWarningState.hx @@ -1,7 +1,7 @@ package funkin.menus; -import flixel.util.FlxColor; import flixel.text.FlxText; +import flixel.util.FlxColor; import funkin.backend.FunkinText; class BetaWarningState extends MusicBeatState { diff --git a/source/funkin/menus/FreeplayState.hx b/source/funkin/menus/FreeplayState.hx index 7ca66b02..7eeef342 100644 --- a/source/funkin/menus/FreeplayState.hx +++ b/source/funkin/menus/FreeplayState.hx @@ -1,15 +1,12 @@ package funkin.menus; -import funkin.backend.chart.Chart; -import funkin.backend.chart.ChartData.ChartMetaData; -import haxe.io.Path; -import openfl.text.TextField; import flixel.text.FlxText; import flixel.util.FlxColor; -import lime.utils.Assets; +import funkin.backend.chart.Chart; +import funkin.backend.chart.ChartData.ChartMetaData; +import funkin.backend.scripting.events.*; import funkin.game.HealthIcon; import funkin.savedata.FunkinSave; -import funkin.backend.scripting.events.*; using StringTools; diff --git a/source/funkin/menus/MainMenuState.hx b/source/funkin/menus/MainMenuState.hx index b17e9db6..171f7959 100644 --- a/source/funkin/menus/MainMenuState.hx +++ b/source/funkin/menus/MainMenuState.hx @@ -1,17 +1,13 @@ package funkin.menus; -import haxe.Json; -import funkin.backend.FunkinText; -import funkin.menus.credits.CreditsMain; import flixel.FlxState; import flixel.effects.FlxFlicker; -import flixel.text.FlxText; import flixel.tweens.FlxTween; -import flixel.util.FlxColor; -import lime.app.Application; +import funkin.backend.FunkinText; import funkin.backend.scripting.events.*; - +import funkin.menus.credits.CreditsMain; import funkin.options.OptionsMenu; +import lime.app.Application; using StringTools; diff --git a/source/funkin/menus/ModSwitchMenu.hx b/source/funkin/menus/ModSwitchMenu.hx index 1b23b9d2..eb14ddcd 100644 --- a/source/funkin/menus/ModSwitchMenu.hx +++ b/source/funkin/menus/ModSwitchMenu.hx @@ -1,10 +1,10 @@ package funkin.menus; #if MOD_SUPPORT -import haxe.io.Path; -import funkin.backend.assets.ModsFolder; -import sys.FileSystem; import flixel.tweens.FlxTween; +import funkin.backend.assets.ModsFolder; +import haxe.io.Path; +import sys.FileSystem; class ModSwitchMenu extends MusicBeatSubstate { var mods:Array = []; diff --git a/source/funkin/menus/PauseSubState.hx b/source/funkin/menus/PauseSubState.hx index edc0cb61..870725bd 100644 --- a/source/funkin/menus/PauseSubState.hx +++ b/source/funkin/menus/PauseSubState.hx @@ -1,18 +1,18 @@ package funkin.menus; -import funkin.editors.charter.Charter; -import funkin.backend.scripting.events.MenuChangeEvent; -import funkin.options.OptionsMenu; -import funkin.backend.scripting.events.PauseCreationEvent; -import funkin.backend.scripting.events.NameEvent; -import funkin.backend.scripting.Script; import flixel.sound.FlxSound; import flixel.text.FlxText; import flixel.tweens.FlxTween; import flixel.util.FlxColor; -import funkin.options.keybinds.KeybindsOptions; -import funkin.menus.StoryMenuState; +import funkin.backend.scripting.Script; +import funkin.backend.scripting.events.MenuChangeEvent; +import funkin.backend.scripting.events.NameEvent; +import funkin.backend.scripting.events.PauseCreationEvent; import funkin.backend.utils.FunkinParentDisabler; +import funkin.editors.charter.Charter; +import funkin.menus.StoryMenuState; +import funkin.options.OptionsMenu; +import funkin.options.keybinds.KeybindsOptions; class PauseSubState extends MusicBeatSubstate { diff --git a/source/funkin/menus/PlaytestingWarningSubstate.hx b/source/funkin/menus/PlaytestingWarningSubstate.hx index e366bf9f..32859705 100644 --- a/source/funkin/menus/PlaytestingWarningSubstate.hx +++ b/source/funkin/menus/PlaytestingWarningSubstate.hx @@ -1,11 +1,11 @@ package funkin.menus; -import flixel.tweens.FlxTween; -import funkin.editors.ui.UIWarningSubstate.WarningButton; -import flixel.util.FlxColor; import flixel.text.FlxText.FlxTextFormat; import flixel.text.FlxText.FlxTextFormatMarkerPair; +import flixel.tweens.FlxTween; +import flixel.util.FlxColor; import funkin.backend.FunkinText; +import funkin.editors.ui.UIWarningSubstate.WarningButton; class PlaytestingWarningSubstate extends MusicBeatSubstate { diff --git a/source/funkin/menus/StoryMenuState.hx b/source/funkin/menus/StoryMenuState.hx index 384118e5..e8ab5c25 100644 --- a/source/funkin/menus/StoryMenuState.hx +++ b/source/funkin/menus/StoryMenuState.hx @@ -1,15 +1,15 @@ package funkin.menus; -import funkin.savedata.FunkinSave; -import haxe.io.Path; -import funkin.backend.scripting.events.*; -import flixel.util.FlxTimer; import flixel.math.FlxPoint; +import flixel.text.FlxText; import flixel.tweens.FlxTween; import flixel.util.FlxColor; +import flixel.util.FlxTimer; import funkin.backend.FunkinText; +import funkin.backend.scripting.events.*; +import funkin.savedata.FunkinSave; +import haxe.io.Path; import haxe.xml.Access; -import flixel.text.FlxText; class StoryMenuState extends MusicBeatState { public var characters:Map = []; diff --git a/source/funkin/menus/TitleState.hx b/source/funkin/menus/TitleState.hx index 4aca30db..edf5dd26 100644 --- a/source/funkin/menus/TitleState.hx +++ b/source/funkin/menus/TitleState.hx @@ -1,14 +1,14 @@ package funkin.menus; -import funkin.backend.MusicBeatGroup; -import funkin.backend.utils.XMLUtil; -import flixel.util.typeLimit.OneOfTwo; import flixel.group.FlxGroup; import flixel.input.gamepad.FlxGamepad; import flixel.util.FlxColor; import flixel.util.FlxTimer; -import openfl.Assets; +import flixel.util.typeLimit.OneOfTwo; +import funkin.backend.MusicBeatGroup; +import funkin.backend.utils.XMLUtil; import haxe.xml.Access; +import openfl.Assets; using StringTools; diff --git a/source/funkin/menus/credits/CreditsCodename.hx b/source/funkin/menus/credits/CreditsCodename.hx index 579360ed..54071446 100644 --- a/source/funkin/menus/credits/CreditsCodename.hx +++ b/source/funkin/menus/credits/CreditsCodename.hx @@ -1,10 +1,10 @@ package funkin.menus.credits; -import funkin.options.PlayerSettings; +import flixel.text.FlxText; import flixel.util.FlxColor; import funkin.backend.system.github.GitHub; +import funkin.options.PlayerSettings; import funkin.options.type.GithubIconOption; -import flixel.text.FlxText; using StringTools; diff --git a/source/funkin/menus/credits/CreditsMain.hx b/source/funkin/menus/credits/CreditsMain.hx index 56507274..7a6e8d9c 100644 --- a/source/funkin/menus/credits/CreditsMain.hx +++ b/source/funkin/menus/credits/CreditsMain.hx @@ -1,8 +1,8 @@ package funkin.menus.credits; import funkin.options.OptionsScreen; -import funkin.options.type.*; import funkin.options.TreeMenu; +import funkin.options.type.*; import haxe.xml.Access; class CreditsMain extends TreeMenu { diff --git a/source/funkin/menus/ui/Alphabet.hx b/source/funkin/menus/ui/Alphabet.hx index d4c3db47..a1859d0f 100644 --- a/source/funkin/menus/ui/Alphabet.hx +++ b/source/funkin/menus/ui/Alphabet.hx @@ -1,12 +1,12 @@ package funkin.menus.ui; -import openfl.utils.AssetLibrary; -import haxe.xml.Access; -import funkin.backend.assets.LimeLibrarySymbol; -import funkin.backend.assets.IModsAssetLibrary; import flixel.group.FlxSpriteGroup; -import flixel.util.FlxTimer; import flixel.util.FlxColor; +import flixel.util.FlxTimer; +import funkin.backend.assets.IModsAssetLibrary; +import funkin.backend.assets.LimeLibrarySymbol; +import haxe.xml.Access; +import openfl.utils.AssetLibrary; using StringTools; diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx index a9bf72ac..972ff69c 100644 --- a/source/funkin/options/Options.hx +++ b/source/funkin/options/Options.hx @@ -1,8 +1,8 @@ package funkin.options; -import openfl.Lib; -import flixel.util.FlxSave; import flixel.input.keyboard.FlxKey; +import flixel.util.FlxSave; +import openfl.Lib; @:build(funkin.backend.system.macros.OptionsMacro.build()) @:build(funkin.backend.system.macros.FunkinSaveMacro.build("__save", "__flush", "__load")) diff --git a/source/funkin/options/OptionsMenu.hx b/source/funkin/options/OptionsMenu.hx index f9232e13..dff76067 100644 --- a/source/funkin/options/OptionsMenu.hx +++ b/source/funkin/options/OptionsMenu.hx @@ -1,11 +1,11 @@ package funkin.options; import funkin.backend.system.framerate.Framerate; +import funkin.options.TreeMenu; +import funkin.options.categories.*; +import funkin.options.type.*; import funkin.options.type.Checkbox; import haxe.xml.Access; -import funkin.options.type.*; -import funkin.options.categories.*; -import funkin.options.TreeMenu; class OptionsMenu extends TreeMenu { public static var mainOptions:Array = [ diff --git a/source/funkin/options/PlayerSettings.hx b/source/funkin/options/PlayerSettings.hx index 5c6dc9b5..bbb0d6e1 100644 --- a/source/funkin/options/PlayerSettings.hx +++ b/source/funkin/options/PlayerSettings.hx @@ -1,10 +1,10 @@ package funkin.options; -import funkin.backend.system.Controls; import flixel.util.FlxSignal; +import funkin.backend.system.Controls; -// import ui.DeviceManager; // import props.Player; +// import ui.DeviceManager; class PlayerSettings { static public var numPlayers(default, null) = 0; diff --git a/source/funkin/options/TreeMenu.hx b/source/funkin/options/TreeMenu.hx index ac027134..6fb4a8a5 100644 --- a/source/funkin/options/TreeMenu.hx +++ b/source/funkin/options/TreeMenu.hx @@ -1,11 +1,11 @@ package funkin.options; -import funkin.editors.ui.UIState; import flixel.FlxState; -import funkin.backend.FunkinText; import flixel.tweens.FlxTween; -import funkin.menus.MainMenuState; import flixel.util.typeLimit.OneOfTwo; +import funkin.backend.FunkinText; +import funkin.editors.ui.UIState; +import funkin.menus.MainMenuState; import funkin.options.type.OptionType; class TreeMenu extends UIState { diff --git a/source/funkin/options/type/GithubIconOption.hx b/source/funkin/options/type/GithubIconOption.hx index 5c780165..d5553486 100644 --- a/source/funkin/options/type/GithubIconOption.hx +++ b/source/funkin/options/type/GithubIconOption.hx @@ -1,10 +1,10 @@ package funkin.options.type; -import openfl.display.BitmapData; import flixel.graphics.FlxGraphic; +import flixel.util.FlxColor; import funkin.backend.shaders.CustomShader; import funkin.backend.system.github.GitHub; -import flixel.util.FlxColor; +import openfl.display.BitmapData; class GithubIconOption extends TextOption { diff --git a/source/funkin/options/type/OptionType.hx b/source/funkin/options/type/OptionType.hx index c7de837d..26699723 100644 --- a/source/funkin/options/type/OptionType.hx +++ b/source/funkin/options/type/OptionType.hx @@ -1,7 +1,7 @@ package funkin.options.type; -import funkin.backend.system.Controls; import flixel.group.FlxSpriteGroup; +import funkin.backend.system.Controls; class OptionType extends FlxSpriteGroup { public var controls(get, null):Controls; diff --git a/source/funkin/savedata/FunkinSave.hx b/source/funkin/savedata/FunkinSave.hx index f0e4163e..20337df6 100644 --- a/source/funkin/savedata/FunkinSave.hx +++ b/source/funkin/savedata/FunkinSave.hx @@ -1,8 +1,8 @@ package funkin.savedata; +import flixel.util.FlxSave; import lime.app.Application; import openfl.Lib; -import flixel.util.FlxSave; /** * Class used for saves WITHOUT going through the struggle of type checks