Forgot to organize these

This commit is contained in:
NeeEoo
2024-04-11 14:27:37 +02:00
parent d17ea72c74
commit 75e35b30e1
13 changed files with 35 additions and 67 deletions
@@ -1,24 +1,5 @@
package funkin.backend.assets; 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; using StringTools;
interface IModsAssetLibrary { interface IModsAssetLibrary {
+4 -12
View File
@@ -1,25 +1,17 @@
package funkin.backend.assets; package funkin.backend.assets;
import flixel.util.FlxSignal.FlxTypedSignal;
import funkin.backend.system.MainState; import funkin.backend.system.MainState;
import funkin.menus.TitleState; import haxe.io.Path;
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 lime.text.Font; import lime.text.Font;
import openfl.text.Font as OpenFLFont; import openfl.text.Font as OpenFLFont;
import openfl.utils.AssetLibrary;
import openfl.utils.AssetManifest;
#if MOD_SUPPORT #if MOD_SUPPORT
import sys.FileSystem; import sys.FileSystem;
#end #end
import flixel.FlxState;
import haxe.io.Path;
using StringTools; using StringTools;
class ModsFolder { class ModsFolder {
@@ -1,11 +1,10 @@
package funkin.backend.assets; package funkin.backend.assets;
import lime.graphics.Image;
import lime.media.AudioBuffer;
import lime.text.Font;
import lime.utils.AssetLibrary; import lime.utils.AssetLibrary;
import lime.utils.Assets as LimeAssets; import lime.utils.Assets as LimeAssets;
import lime.media.AudioBuffer;
import lime.graphics.Image;
import lime.text.Font;
import lime.utils.Bytes; import lime.utils.Bytes;
#if MOD_SUPPORT #if MOD_SUPPORT
@@ -1,10 +1,10 @@
package funkin.backend.assets; package funkin.backend.assets;
import flixel.graphics.frames.FlxFramesCollection;
import flixel.FlxG; import flixel.FlxG;
import flixel.graphics.FlxGraphic; import flixel.graphics.FlxGraphic;
import flixel.graphics.frames.FlxFrame.FlxFrameAngle; import flixel.graphics.frames.FlxFrame.FlxFrameAngle;
import flixel.graphics.frames.FlxFrame.FlxFrameType; import flixel.graphics.frames.FlxFrame.FlxFrameType;
import flixel.graphics.frames.FlxFramesCollection;
import flixel.math.FlxMath; import flixel.math.FlxMath;
import flixel.math.FlxPoint; import flixel.math.FlxPoint;
import flixel.math.FlxRect; import flixel.math.FlxRect;
+9 -9
View File
@@ -1,17 +1,17 @@
package funkin.backend.assets; package funkin.backend.assets;
import lime.utils.AssetLibrary; import flixel.graphics.FlxGraphic;
import flixel.graphics.frames.FlxFramesCollection;
import haxe.io.Path;
import funkin.backend.assets.LimeLibrarySymbol;
import flixel.graphics.frames.FlxAtlasFrames; import flixel.graphics.frames.FlxAtlasFrames;
import openfl.utils.AssetType; import flixel.graphics.frames.FlxAtlasFrames;
import openfl.utils.Assets as OpenFlAssets; import flixel.graphics.frames.FlxFramesCollection;
import flixel.system.FlxAssets.FlxGraphicAsset;
import funkin.backend.assets.LimeLibrarySymbol;
import funkin.backend.assets.ModsFolder; import funkin.backend.assets.ModsFolder;
import funkin.backend.scripting.Script; import funkin.backend.scripting.Script;
import flixel.graphics.frames.FlxAtlasFrames; import haxe.io.Path;
import flixel.system.FlxAssets.FlxGraphicAsset; import lime.utils.AssetLibrary;
import flixel.graphics.FlxGraphic; import openfl.utils.AssetType;
import openfl.utils.Assets as OpenFlAssets;
using StringTools; using StringTools;
@@ -1,12 +1,11 @@
package funkin.backend.assets; package funkin.backend.assets;
import funkin.backend.scripting.Script; import funkin.backend.scripting.Script;
import lime.graphics.Image;
import lime.media.AudioBuffer;
import lime.text.Font;
import lime.utils.AssetLibrary; import lime.utils.AssetLibrary;
import lime.utils.Assets as LimeAssets; import lime.utils.Assets as LimeAssets;
import lime.media.AudioBuffer;
import lime.graphics.Image;
import lime.text.Font;
import lime.utils.Bytes; import lime.utils.Bytes;
#if MOD_SUPPORT #if MOD_SUPPORT
@@ -1,29 +1,26 @@
package funkin.backend.assets; package funkin.backend.assets;
import lime.utils.Log; #if MOD_SUPPORT
import lime.utils.AssetLibrary; import funkin.backend.utils.SysZip.SysZipEntry;
import lime.utils.AssetManifest; import funkin.backend.utils.SysZip;
import haxe.io.Path; import haxe.io.Path;
import haxe.zip.Reader;
import lime.app.Event; import lime.app.Event;
import lime.app.Future; import lime.app.Future;
import lime.app.Promise; import lime.app.Promise;
import lime.media.AudioBuffer;
import lime.graphics.Image; import lime.graphics.Image;
import lime.media.AudioBuffer;
import lime.text.Font; import lime.text.Font;
import lime.utils.AssetLibrary;
import lime.utils.AssetManifest;
import lime.utils.AssetType; import lime.utils.AssetType;
import lime.utils.Bytes;
import lime.utils.Assets as LimeAssets; import lime.utils.Assets as LimeAssets;
import lime.utils.Bytes;
import lime.utils.Log;
import openfl.text.Font as OpenFLFont; import openfl.text.Font as OpenFLFont;
#if MOD_SUPPORT
import sys.FileStat; import sys.FileStat;
import sys.FileSystem; import sys.FileSystem;
import sys.io.File; 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 { class ZipFolderLibrary extends AssetLibrary implements IModsAssetLibrary {
public var zipPath:String; public var zipPath:String;
@@ -1,7 +1,7 @@
package funkin.backend.scripting.events; package funkin.backend.scripting.events;
import funkin.game.StrumLine;
import flixel.math.FlxPoint; import flixel.math.FlxPoint;
import funkin.game.StrumLine;
final class CamMoveEvent extends CancellableEvent { final class CamMoveEvent extends CancellableEvent {
/** /**
@@ -1,7 +1,7 @@
package funkin.backend.scripting.events; package funkin.backend.scripting.events;
import flixel.tweens.FlxTween;
import flixel.sound.FlxSound; import flixel.sound.FlxSound;
import flixel.tweens.FlxTween;
final class CountdownEvent extends CancellableEvent { final class CountdownEvent extends CancellableEvent {
/** /**
@@ -1,7 +1,7 @@
package funkin.backend.scripting.events; package funkin.backend.scripting.events;
import funkin.game.Note;
import funkin.game.Character; import funkin.game.Character;
import funkin.game.Note;
final class NoteHitEvent extends CancellableEvent { final class NoteHitEvent extends CancellableEvent {
@:dox(hide) public var animCancelled:Bool = false; @:dox(hide) public var animCancelled:Bool = false;
@@ -1,7 +1,7 @@
package funkin.backend.scripting.events; package funkin.backend.scripting.events;
import funkin.game.Note;
import funkin.game.Character; import funkin.game.Character;
import funkin.game.Note;
final class NoteMissEvent extends CancellableEvent { final class NoteMissEvent extends CancellableEvent {
@:dox(hide) public var animCancelled:Bool = false; @:dox(hide) public var animCancelled:Bool = false;
@@ -1,7 +1,7 @@
package funkin.backend.scripting.events.dialogue; package funkin.backend.scripting.events.dialogue;
import funkin.backend.utils.XMLUtil.TextFormat;
import flixel.sound.FlxSound; import flixel.sound.FlxSound;
import funkin.backend.utils.XMLUtil.TextFormat;
final class DialogueBoxPlayBubbleEvent extends CancellableEvent final class DialogueBoxPlayBubbleEvent extends CancellableEvent
{ {
@@ -1,7 +1,7 @@
package funkin.backend.scripting.events.dialogue; package funkin.backend.scripting.events.dialogue;
import funkin.backend.utils.XMLUtil.TextFormat;
import flixel.sound.FlxSound; import flixel.sound.FlxSound;
import funkin.backend.utils.XMLUtil.TextFormat;
final class DialogueBoxSetTextEvent extends CancellableEvent final class DialogueBoxSetTextEvent extends CancellableEvent
{ {