From 75e35b30e195b785b172ce2b247c19227c49e063 Mon Sep 17 00:00:00 2001 From: NeeEoo Date: Thu, 11 Apr 2024 14:27:37 +0200 Subject: [PATCH] Forgot to organize these --- .../backend/assets/IModsAssetLibrary.hx | 19 ----------------- source/funkin/backend/assets/ModsFolder.hx | 16 ++++---------- .../backend/assets/ModsFolderLibrary.hx | 7 +++---- .../backend/assets/MultiFramesCollection.hx | 2 +- source/funkin/backend/assets/Paths.hx | 18 ++++++++-------- .../backend/assets/ScriptedAssetLibrary.hx | 7 +++---- .../funkin/backend/assets/ZipFolderLibrary.hx | 21 ++++++++----------- .../backend/scripting/events/CamMoveEvent.hx | 2 +- .../scripting/events/CountdownEvent.hx | 2 +- .../backend/scripting/events/NoteHitEvent.hx | 2 +- .../backend/scripting/events/NoteMissEvent.hx | 2 +- .../dialogue/DialogueBoxPlayBubbleEvent.hx | 2 +- .../dialogue/DialogueBoxSetTextEvent.hx | 2 +- 13 files changed, 35 insertions(+), 67 deletions(-) diff --git a/source/funkin/backend/assets/IModsAssetLibrary.hx b/source/funkin/backend/assets/IModsAssetLibrary.hx index a080189b..809a2143 100644 --- a/source/funkin/backend/assets/IModsAssetLibrary.hx +++ b/source/funkin/backend/assets/IModsAssetLibrary.hx @@ -1,24 +1,5 @@ package funkin.backend.assets; -import lime.utils.Log; -import lime.utils.AssetLibrary; -import lime.utils.AssetManifest; - -import haxe.io.Path; -import lime.app.Event; -import lime.app.Future; -import lime.app.Promise; -import lime.media.AudioBuffer; -import lime.graphics.Image; -import lime.text.Font; -import lime.utils.AssetType; -import lime.utils.Bytes; - -#if MOD_SUPPORT -import sys.FileStat; -import sys.FileSystem; -#end - using StringTools; interface IModsAssetLibrary { diff --git a/source/funkin/backend/assets/ModsFolder.hx b/source/funkin/backend/assets/ModsFolder.hx index cd1704ed..9f761b85 100644 --- a/source/funkin/backend/assets/ModsFolder.hx +++ b/source/funkin/backend/assets/ModsFolder.hx @@ -1,25 +1,17 @@ package funkin.backend.assets; +import flixel.util.FlxSignal.FlxTypedSignal; import funkin.backend.system.MainState; -import funkin.menus.TitleState; -import funkin.backend.system.Main; -import openfl.utils.AssetCache; -import flixel.util.FlxSignal.FlxTypedSignal; -import openfl.utils.AssetManifest; -import openfl.utils.AssetLibrary; -import flixel.graphics.FlxGraphic; -import flixel.util.FlxSignal.FlxTypedSignal; - +import haxe.io.Path; import lime.text.Font; import openfl.text.Font as OpenFLFont; +import openfl.utils.AssetLibrary; +import openfl.utils.AssetManifest; #if MOD_SUPPORT import sys.FileSystem; #end -import flixel.FlxState; -import haxe.io.Path; - using StringTools; class ModsFolder { diff --git a/source/funkin/backend/assets/ModsFolderLibrary.hx b/source/funkin/backend/assets/ModsFolderLibrary.hx index ed608bda..23fa0d43 100644 --- a/source/funkin/backend/assets/ModsFolderLibrary.hx +++ b/source/funkin/backend/assets/ModsFolderLibrary.hx @@ -1,11 +1,10 @@ package funkin.backend.assets; +import lime.graphics.Image; +import lime.media.AudioBuffer; +import lime.text.Font; import lime.utils.AssetLibrary; import lime.utils.Assets as LimeAssets; - -import lime.media.AudioBuffer; -import lime.graphics.Image; -import lime.text.Font; import lime.utils.Bytes; #if MOD_SUPPORT diff --git a/source/funkin/backend/assets/MultiFramesCollection.hx b/source/funkin/backend/assets/MultiFramesCollection.hx index a3d9c733..2a03c64c 100644 --- a/source/funkin/backend/assets/MultiFramesCollection.hx +++ b/source/funkin/backend/assets/MultiFramesCollection.hx @@ -1,10 +1,10 @@ package funkin.backend.assets; -import flixel.graphics.frames.FlxFramesCollection; import flixel.FlxG; import flixel.graphics.FlxGraphic; import flixel.graphics.frames.FlxFrame.FlxFrameAngle; import flixel.graphics.frames.FlxFrame.FlxFrameType; +import flixel.graphics.frames.FlxFramesCollection; import flixel.math.FlxMath; import flixel.math.FlxPoint; import flixel.math.FlxRect; diff --git a/source/funkin/backend/assets/Paths.hx b/source/funkin/backend/assets/Paths.hx index d8c6ba39..aac40ad5 100644 --- a/source/funkin/backend/assets/Paths.hx +++ b/source/funkin/backend/assets/Paths.hx @@ -1,17 +1,17 @@ package funkin.backend.assets; -import lime.utils.AssetLibrary; -import flixel.graphics.frames.FlxFramesCollection; -import haxe.io.Path; -import funkin.backend.assets.LimeLibrarySymbol; +import flixel.graphics.FlxGraphic; import flixel.graphics.frames.FlxAtlasFrames; -import openfl.utils.AssetType; -import openfl.utils.Assets as OpenFlAssets; +import flixel.graphics.frames.FlxAtlasFrames; +import flixel.graphics.frames.FlxFramesCollection; +import flixel.system.FlxAssets.FlxGraphicAsset; +import funkin.backend.assets.LimeLibrarySymbol; import funkin.backend.assets.ModsFolder; import funkin.backend.scripting.Script; -import flixel.graphics.frames.FlxAtlasFrames; -import flixel.system.FlxAssets.FlxGraphicAsset; -import flixel.graphics.FlxGraphic; +import haxe.io.Path; +import lime.utils.AssetLibrary; +import openfl.utils.AssetType; +import openfl.utils.Assets as OpenFlAssets; using StringTools; diff --git a/source/funkin/backend/assets/ScriptedAssetLibrary.hx b/source/funkin/backend/assets/ScriptedAssetLibrary.hx index 0fd8d380..e0fd2e33 100644 --- a/source/funkin/backend/assets/ScriptedAssetLibrary.hx +++ b/source/funkin/backend/assets/ScriptedAssetLibrary.hx @@ -1,12 +1,11 @@ package funkin.backend.assets; import funkin.backend.scripting.Script; +import lime.graphics.Image; +import lime.media.AudioBuffer; +import lime.text.Font; import lime.utils.AssetLibrary; import lime.utils.Assets as LimeAssets; - -import lime.media.AudioBuffer; -import lime.graphics.Image; -import lime.text.Font; import lime.utils.Bytes; #if MOD_SUPPORT diff --git a/source/funkin/backend/assets/ZipFolderLibrary.hx b/source/funkin/backend/assets/ZipFolderLibrary.hx index 21e425d8..736cb3ea 100644 --- a/source/funkin/backend/assets/ZipFolderLibrary.hx +++ b/source/funkin/backend/assets/ZipFolderLibrary.hx @@ -1,29 +1,26 @@ package funkin.backend.assets; -import lime.utils.Log; -import lime.utils.AssetLibrary; -import lime.utils.AssetManifest; - +#if MOD_SUPPORT +import funkin.backend.utils.SysZip.SysZipEntry; +import funkin.backend.utils.SysZip; import haxe.io.Path; +import haxe.zip.Reader; import lime.app.Event; import lime.app.Future; import lime.app.Promise; -import lime.media.AudioBuffer; import lime.graphics.Image; +import lime.media.AudioBuffer; import lime.text.Font; +import lime.utils.AssetLibrary; +import lime.utils.AssetManifest; import lime.utils.AssetType; -import lime.utils.Bytes; import lime.utils.Assets as LimeAssets; +import lime.utils.Bytes; +import lime.utils.Log; import openfl.text.Font as OpenFLFont; - - -#if MOD_SUPPORT import sys.FileStat; import sys.FileSystem; import sys.io.File; -import haxe.zip.Reader; -import funkin.backend.utils.SysZip; -import funkin.backend.utils.SysZip.SysZipEntry; class ZipFolderLibrary extends AssetLibrary implements IModsAssetLibrary { public var zipPath:String; diff --git a/source/funkin/backend/scripting/events/CamMoveEvent.hx b/source/funkin/backend/scripting/events/CamMoveEvent.hx index 970c00a7..3dcbda78 100644 --- a/source/funkin/backend/scripting/events/CamMoveEvent.hx +++ b/source/funkin/backend/scripting/events/CamMoveEvent.hx @@ -1,7 +1,7 @@ package funkin.backend.scripting.events; -import funkin.game.StrumLine; import flixel.math.FlxPoint; +import funkin.game.StrumLine; final class CamMoveEvent extends CancellableEvent { /** diff --git a/source/funkin/backend/scripting/events/CountdownEvent.hx b/source/funkin/backend/scripting/events/CountdownEvent.hx index 36a01b87..7c6b4308 100644 --- a/source/funkin/backend/scripting/events/CountdownEvent.hx +++ b/source/funkin/backend/scripting/events/CountdownEvent.hx @@ -1,7 +1,7 @@ package funkin.backend.scripting.events; -import flixel.tweens.FlxTween; import flixel.sound.FlxSound; +import flixel.tweens.FlxTween; final class CountdownEvent extends CancellableEvent { /** diff --git a/source/funkin/backend/scripting/events/NoteHitEvent.hx b/source/funkin/backend/scripting/events/NoteHitEvent.hx index e3c8bbc0..d5f64dc3 100644 --- a/source/funkin/backend/scripting/events/NoteHitEvent.hx +++ b/source/funkin/backend/scripting/events/NoteHitEvent.hx @@ -1,7 +1,7 @@ package funkin.backend.scripting.events; -import funkin.game.Note; import funkin.game.Character; +import funkin.game.Note; final class NoteHitEvent extends CancellableEvent { @:dox(hide) public var animCancelled:Bool = false; diff --git a/source/funkin/backend/scripting/events/NoteMissEvent.hx b/source/funkin/backend/scripting/events/NoteMissEvent.hx index 1b7d0901..e9475bb0 100644 --- a/source/funkin/backend/scripting/events/NoteMissEvent.hx +++ b/source/funkin/backend/scripting/events/NoteMissEvent.hx @@ -1,7 +1,7 @@ package funkin.backend.scripting.events; -import funkin.game.Note; import funkin.game.Character; +import funkin.game.Note; final class NoteMissEvent extends CancellableEvent { @:dox(hide) public var animCancelled:Bool = false; diff --git a/source/funkin/backend/scripting/events/dialogue/DialogueBoxPlayBubbleEvent.hx b/source/funkin/backend/scripting/events/dialogue/DialogueBoxPlayBubbleEvent.hx index 66363a4d..0f7a4e95 100644 --- a/source/funkin/backend/scripting/events/dialogue/DialogueBoxPlayBubbleEvent.hx +++ b/source/funkin/backend/scripting/events/dialogue/DialogueBoxPlayBubbleEvent.hx @@ -1,7 +1,7 @@ package funkin.backend.scripting.events.dialogue; -import funkin.backend.utils.XMLUtil.TextFormat; import flixel.sound.FlxSound; +import funkin.backend.utils.XMLUtil.TextFormat; final class DialogueBoxPlayBubbleEvent extends CancellableEvent { diff --git a/source/funkin/backend/scripting/events/dialogue/DialogueBoxSetTextEvent.hx b/source/funkin/backend/scripting/events/dialogue/DialogueBoxSetTextEvent.hx index 91c3d113..59fe5158 100644 --- a/source/funkin/backend/scripting/events/dialogue/DialogueBoxSetTextEvent.hx +++ b/source/funkin/backend/scripting/events/dialogue/DialogueBoxSetTextEvent.hx @@ -1,7 +1,7 @@ package funkin.backend.scripting.events.dialogue; -import funkin.backend.utils.XMLUtil.TextFormat; import flixel.sound.FlxSound; +import funkin.backend.utils.XMLUtil.TextFormat; final class DialogueBoxSetTextEvent extends CancellableEvent {