From 6dd2854d2c5ecc59fdb64909338f6d6adcf9dafd Mon Sep 17 00:00:00 2001
From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com>
Date: Wed, 11 Jan 2023 14:21:04 +0100
Subject: [PATCH] moved utils (update your scripts!!!!)
---
Project.xml | 1 -
buildnumber.txt | 2 +-
source/funkin/desktop/editors/CharacterEditor.hx | 2 +-
source/funkin/game/Character.hx | 2 +-
source/funkin/game/Stage.hx | 1 -
source/funkin/import.hx | 6 ++++--
source/funkin/menus/StoryMenuState.hx | 1 -
source/funkin/menus/TitleState.hx | 2 +-
source/funkin/scripting/Script.hx | 7 +++++--
source/funkin/updating/AsyncUpdater.hx | 6 +++---
source/funkin/updating/UpdateAvailableScreen.hx | 2 +-
source/funkin/{system => utils}/CoolUtil.hx | 6 ++++--
source/funkin/{system/IniUtils.hx => utils/IniUtil.hx} | 4 ++--
source/funkin/{system => utils}/MarkdownUtil.hx | 2 +-
source/funkin/{system => utils}/ThreadUtil.hx | 2 +-
source/funkin/{system => utils}/XMLUtil.hx | 4 +++-
source/funkin/{system/ZipUtils.hx => utils/ZipUtil.hx} | 4 ++--
17 files changed, 30 insertions(+), 24 deletions(-)
rename source/funkin/{system => utils}/CoolUtil.hx (98%)
rename source/funkin/{system/IniUtils.hx => utils/IniUtil.hx} (97%)
rename source/funkin/{system => utils}/MarkdownUtil.hx (99%)
rename source/funkin/{system => utils}/ThreadUtil.hx (97%)
rename source/funkin/{system => utils}/XMLUtil.hx (98%)
rename source/funkin/{system/ZipUtils.hx => utils/ZipUtil.hx} (99%)
diff --git a/Project.xml b/Project.xml
index 8a3e9c87..b24a6fc7 100644
--- a/Project.xml
+++ b/Project.xml
@@ -167,6 +167,5 @@
-
diff --git a/buildnumber.txt b/buildnumber.txt
index b3f27df8..153038f1 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-2001
\ No newline at end of file
+2003
\ No newline at end of file
diff --git a/source/funkin/desktop/editors/CharacterEditor.hx b/source/funkin/desktop/editors/CharacterEditor.hx
index 75b4a153..cd4cebea 100644
--- a/source/funkin/desktop/editors/CharacterEditor.hx
+++ b/source/funkin/desktop/editors/CharacterEditor.hx
@@ -7,7 +7,7 @@ import flixel.FlxObject;
import flixel.FlxCamera;
import flixel.FlxG;
-using funkin.system.XMLUtil;
+using funkin.utils.XMLUtil;
class CharacterEditor extends WindowContent {
public function new(curCharacter:String) {
diff --git a/source/funkin/game/Character.hx b/source/funkin/game/Character.hx
index 279521d0..bda815e6 100644
--- a/source/funkin/game/Character.hx
+++ b/source/funkin/game/Character.hx
@@ -5,7 +5,7 @@ import flixel.graphics.frames.FlxFrame;
import flixel.math.FlxPoint;
import funkin.interfaces.IBeatReceiver;
import funkin.interfaces.IOffsetCompatible;
-import funkin.system.XMLUtil;
+import funkin.utils.XMLUtil;
import flixel.FlxG;
import flixel.FlxSprite;
diff --git a/source/funkin/game/Stage.hx b/source/funkin/game/Stage.hx
index 3f2d054e..a5521990 100644
--- a/source/funkin/game/Stage.hx
+++ b/source/funkin/game/Stage.hx
@@ -2,7 +2,6 @@ package funkin.game;
import flixel.FlxG;
import flixel.FlxState;
-import funkin.system.XMLUtil;
import flixel.FlxSprite;
import openfl.utils.Assets;
import haxe.xml.Access;
diff --git a/source/funkin/import.hx b/source/funkin/import.hx
index 1570bdec..297166ca 100644
--- a/source/funkin/import.hx
+++ b/source/funkin/import.hx
@@ -2,12 +2,14 @@
import funkin.system.Paths;
import funkin.system.MusicBeatState;
import funkin.system.MusicBeatSubstate;
-import funkin.system.CoolUtil;
+import funkin.system.MusicBeatGroup;
+import funkin.system.FunkinSprite;
+import funkin.utils.*;
import funkin.system.Logs;
import funkin.game.PlayState;
import funkin.scripting.EventManager;
using StringTools;
-using funkin.system.CoolUtil;
+using funkin.utils.CoolUtil;
#end
diff --git a/source/funkin/menus/StoryMenuState.hx b/source/funkin/menus/StoryMenuState.hx
index 6be885f7..dcbf17fb 100644
--- a/source/funkin/menus/StoryMenuState.hx
+++ b/source/funkin/menus/StoryMenuState.hx
@@ -3,7 +3,6 @@ package funkin.menus;
import funkin.scripting.events.*;
import flixel.util.FlxTimer;
import flixel.math.FlxPoint;
-import funkin.system.XMLUtil;
import flixel.graphics.frames.FlxFramesCollection;
import flixel.group.FlxGroup.FlxTypedGroup;
import funkin.game.Highscore;
diff --git a/source/funkin/menus/TitleState.hx b/source/funkin/menus/TitleState.hx
index a3f6e6f8..b3766a10 100644
--- a/source/funkin/menus/TitleState.hx
+++ b/source/funkin/menus/TitleState.hx
@@ -2,7 +2,7 @@ package funkin.menus;
import funkin.github.GitHub;
import funkin.system.MusicBeatGroup;
-import funkin.system.XMLUtil;
+import funkin.utils.XMLUtil;
import flixel.util.typeLimit.OneOfThree;
import flixel.util.typeLimit.OneOfTwo;
import flixel.FlxG;
diff --git a/source/funkin/scripting/Script.hx b/source/funkin/scripting/Script.hx
index 4367665d..4ced6877 100644
--- a/source/funkin/scripting/Script.hx
+++ b/source/funkin/scripting/Script.hx
@@ -74,12 +74,15 @@ class Script extends FlxBasic implements IFlxDestroyable {
"Options" => funkin.options.Options,
"Paths" => funkin.system.Paths,
"Conductor" => funkin.system.Conductor,
- "CoolUtil" => funkin.system.CoolUtil,
- "XMLUtil" => funkin.system.XMLUtil,
"FunkinShader" => funkin.shaders.FunkinShader,
"CustomShader" => funkin.shaders.CustomShader,
"FunkinText" => funkin.ui.FunkinText,
"Alphabet" => funkin.ui.Alphabet,
+ "CoolUtil" => funkin.utils.CoolUtil,
+ "IniUtil" => funkin.utils.IniUtil,
+ "XMLUtil" => funkin.utils.XMLUtil,
+ "ZipUtil" => funkin.utils.ZipUtil,
+ "MarkdownUtil" => funkin.utils.MarkdownUtil,
];
}
public static function getDefaultPreprocessors():Map {
diff --git a/source/funkin/updating/AsyncUpdater.hx b/source/funkin/updating/AsyncUpdater.hx
index fc798734..772306cb 100644
--- a/source/funkin/updating/AsyncUpdater.hx
+++ b/source/funkin/updating/AsyncUpdater.hx
@@ -3,7 +3,7 @@ package funkin.updating;
import openfl.Lib;
import sys.io.Process;
import haxe.zip.Reader;
-import funkin.system.ZipUtils;
+import funkin.utils.ZipUtil;
import haxe.io.Path;
import openfl.utils.ByteArray;
import sys.io.File;
@@ -63,10 +63,10 @@ class AsyncUpdater {
progress.curFile = k+1;
progress.curFileName = e;
trace('extracting file ${path}');
- var reader = ZipUtils.openZip(path);
+ var reader = ZipUtil.openZip(path);
progress.curZipProgress = new ZipProgress();
- ZipUtils.uncompressZip(reader, './', null, progress.curZipProgress);
+ ZipUtil.uncompressZip(reader, './', null, progress.curZipProgress);
// FileSystem.deleteFile(path);
}
if (executableReplaced = FileSystem.exists('$path$executableName')) {
diff --git a/source/funkin/updating/UpdateAvailableScreen.hx b/source/funkin/updating/UpdateAvailableScreen.hx
index 001c9709..858adcfe 100644
--- a/source/funkin/updating/UpdateAvailableScreen.hx
+++ b/source/funkin/updating/UpdateAvailableScreen.hx
@@ -1,6 +1,6 @@
package funkin.updating;
-import funkin.system.MarkdownUtil;
+import funkin.utils.MarkdownUtil;
import funkin.menus.MainMenuState;
import flixel.math.FlxPoint;
import flixel.math.FlxMath;
diff --git a/source/funkin/system/CoolUtil.hx b/source/funkin/utils/CoolUtil.hx
similarity index 98%
rename from source/funkin/system/CoolUtil.hx
rename to source/funkin/utils/CoolUtil.hx
index 5699dd5e..7bf5f982 100644
--- a/source/funkin/system/CoolUtil.hx
+++ b/source/funkin/utils/CoolUtil.hx
@@ -1,5 +1,7 @@
-package funkin.system;
+package funkin.utils;
+import funkin.system.Song;
+import funkin.system.Conductor;
import flixel.system.FlxSoundGroup;
import animateatlas.AtlasFrameMaker;
import haxe.Json;
@@ -164,7 +166,7 @@ class CoolUtil
var infoPath = '${Path.withoutExtension(path)}.ini';
if (Assets.exists(infoPath)) {
- var musicInfo = IniUtils.parseAsset(infoPath, [
+ var musicInfo = IniUtil.parseAsset(infoPath, [
"BPM" => null
]);
var parsedBPM:Null = Std.parseFloat(musicInfo["BPM"]);
diff --git a/source/funkin/system/IniUtils.hx b/source/funkin/utils/IniUtil.hx
similarity index 97%
rename from source/funkin/system/IniUtils.hx
rename to source/funkin/utils/IniUtil.hx
index 0184a595..d7bded8f 100644
--- a/source/funkin/system/IniUtils.hx
+++ b/source/funkin/utils/IniUtil.hx
@@ -1,11 +1,11 @@
-package funkin.system;
+package funkin.utils;
import openfl.utils.Assets;
/**
* DOESNT SUPPORT CATEGORIES YET!!
*/
-class IniUtils {
+class IniUtil {
public static inline function parseAsset(assetPath:String, ?defaultVariables:Map)
return parseString(Assets.getText(assetPath), defaultVariables);
diff --git a/source/funkin/system/MarkdownUtil.hx b/source/funkin/utils/MarkdownUtil.hx
similarity index 99%
rename from source/funkin/system/MarkdownUtil.hx
rename to source/funkin/utils/MarkdownUtil.hx
index bcf592cc..1f240f96 100644
--- a/source/funkin/system/MarkdownUtil.hx
+++ b/source/funkin/utils/MarkdownUtil.hx
@@ -1,4 +1,4 @@
-package funkin.system;
+package funkin.utils;
import flixel.util.FlxColor;
import flixel.text.FlxText;
diff --git a/source/funkin/system/ThreadUtil.hx b/source/funkin/utils/ThreadUtil.hx
similarity index 97%
rename from source/funkin/system/ThreadUtil.hx
rename to source/funkin/utils/ThreadUtil.hx
index 6906d97f..2ecab02a 100644
--- a/source/funkin/system/ThreadUtil.hx
+++ b/source/funkin/utils/ThreadUtil.hx
@@ -1,4 +1,4 @@
-package funkin.system;
+package funkin.utils;
#if ALLOW_MULTITHREADING
class ThreadUtil {
diff --git a/source/funkin/system/XMLUtil.hx b/source/funkin/utils/XMLUtil.hx
similarity index 98%
rename from source/funkin/system/XMLUtil.hx
rename to source/funkin/utils/XMLUtil.hx
index ec543c75..76092647 100644
--- a/source/funkin/system/XMLUtil.hx
+++ b/source/funkin/utils/XMLUtil.hx
@@ -1,5 +1,7 @@
-package funkin.system;
+package funkin.utils;
+import funkin.system.FunkinSprite;
+import funkin.system.ErrorCode;
import funkin.system.FunkinSprite.XMLAnimType;
import flixel.math.FlxMath;
import funkin.interfaces.IBeatReceiver;
diff --git a/source/funkin/system/ZipUtils.hx b/source/funkin/utils/ZipUtil.hx
similarity index 99%
rename from source/funkin/system/ZipUtils.hx
rename to source/funkin/utils/ZipUtil.hx
index 24362a88..5c5a8b93 100644
--- a/source/funkin/system/ZipUtils.hx
+++ b/source/funkin/utils/ZipUtil.hx
@@ -1,4 +1,4 @@
-package funkin.system;
+package funkin.utils;
#if (!macro && sys)
import openfl.display.BitmapData;
@@ -22,7 +22,7 @@ using StringTools;
// import ZipUtils; ZipUtils.uncompressZip(ZipUtils.openZip("E:\\Desktop\\test\\termination lua.ycemod"), "E:\\Desktop\\test\\uncompressed\\");
// import ZipUtils; var e = ZipUtils.createZipFile("gjnsdghs.ycemod"); ZipUtils.writeFolderToZip(e, "./mods/Friday Night Funkin'/", "Friday Night Funkin'/"); e.flush(); e.close();
-class ZipUtils {
+class ZipUtil {
public static var bannedNames:Array = [".git", ".gitignore", ".github", ".vscode", ".gitattributes", "readme.txt"];
/**