Organize Imports and remove unused Imports

This commit is contained in:
NeeEoo
2024-04-11 14:23:02 +02:00
parent 92f6717b1c
commit d17ea72c74
118 changed files with 358 additions and 431 deletions
+2 -2
View File
@@ -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 =
{
-2
View File
@@ -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;
+2 -2
View File
@@ -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;
+16 -19
View File
@@ -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)
+4 -4
View File
@@ -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
@@ -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")
@@ -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() {
@@ -1,6 +1,5 @@
package funkin.backend.system.framerate;
class ConductorInfo extends FramerateCategory {
public function new() {
super("Conductor Info");
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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.
@@ -1,6 +1,5 @@
package funkin.backend.system.github;
typedef GitHubUser = {
/**
* Username of the user.
@@ -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
@@ -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() {
@@ -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
@@ -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
@@ -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;
@@ -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;
@@ -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;