time to break your mods again for ease of use

Project.xml

@@ -3,7 +3,7 @@
 	<!-- _________________________ Application Settings _________________________ -->
 
 	<app
-		title="Friday Night Funkin' - Codename Engine" main="funkin.system.Main"
+		title="Friday Night Funkin' - Codename Engine" main="funkin.backend.system.Main"
 		file="CodenameEngine" packageName="com.yoshman29.codenameengine"
 		package="com.yoshman29.codenameengine"
 		version="0.1.0" company="Yoshman29" />
@@ -68,7 +68,7 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
-	<haxeflag name="--macro" value="funkin.system.macros.NewHaxeWarning.warn()" />
+	<haxeflag name="--macro" value="funkin.backend.system.macros.NewHaxeWarning.warn()" />
 
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
@@ -180,10 +180,10 @@
 
 	<section if="COMPILE_ALL_CLASSES">
 		<haxeflag name="-dce" value="no" />
-		<haxeflag name="--macro" value="funkin.system.macros.ScriptsMacro.addAdditionalClasses()" />
+		<haxeflag name="--macro" value="funkin.backend.system.macros.ScriptsMacro.addAdditionalClasses()" />
 	</section>
 
-	<haxeflag name="--macro" value="exclude('funkin.system.updating')" unless="UPDATE_CHECKING"/>
+	<haxeflag name="--macro" value="exclude('funkin.backend.system.updating')" unless="UPDATE_CHECKING"/>
 
 	<haxedef name="HXCPP_CHECK_POINTER" if="release" />
 	<haxedef name="HXCPP_STACK_LINE" if="release" />

source/Main.hx

@@ -1 +1 @@
-typedef Main = funkin.system.Main;
+typedef Main = funkin.backend.system.Main;

source/flx3d/Flx3DCamera.hx

@@ -10,7 +10,7 @@ import away3d.library.Asset3DLibraryBundle;
 import away3d.events.LoaderEvent;
 import away3d.loaders.AssetLoader;
 import away3d.loaders.misc.AssetLoaderToken;
-import funkin.system.Logs;
+import funkin.backend.system.Logs;
 import flixel.FlxG;
 import flx3d.Flx3DUtil;
 import away3d.library.assets.Asset3DType;
@@ -24,7 +24,7 @@ import away3d.loaders.misc.AssetLoaderContext;
 import openfl.Assets;
 import away3d.entities.Mesh;
 import away3d.loaders.Loader3D;
-import funkin.utils.NativeAPI.ConsoleColor;
+import funkin.backend.utils.NativeAPI.ConsoleColor;
 import flixel.FlxCamera;
 import away3d.containers.View3D;
 

source/flx3d/Flx3DView.hx

@@ -10,7 +10,7 @@ import away3d.library.Asset3DLibraryBundle;
 import away3d.events.LoaderEvent;
 import away3d.loaders.AssetLoader;
 import away3d.loaders.misc.AssetLoaderToken;
-import funkin.system.Logs;
+import funkin.backend.system.Logs;
 import flixel.FlxG;
 import flx3d.Flx3DUtil;
 import away3d.library.assets.Asset3DType;
@@ -24,7 +24,7 @@ import away3d.loaders.misc.AssetLoaderContext;
 import openfl.Assets;
 import away3d.entities.Mesh;
 import away3d.loaders.Loader3D;
-import funkin.utils.NativeAPI.ConsoleColor;
+import funkin.backend.utils.NativeAPI.ConsoleColor;
 
 // FlxView3D with helpers for easier updating
 

source/funkin/backend/FlxAnimate.hx

@@ -1,4 +1,4 @@
-package funkin.system;
+package funkin.backend;
 
 import flixel.graphics.frames.FlxFramesCollection;
 import openfl.geom.ColorTransform;

source/funkin/backend/FunkinSprite.hx

@@ -1,15 +1,15 @@
-package funkin.system;
+package funkin.backend;
 
-import funkin.utils.XMLUtil.IXMLEvents;
+import funkin.backend.utils.XMLUtil.IXMLEvents;
 import flixel.system.FlxAssets.FlxGraphicAsset;
 import flixel.addons.effects.FlxSkewedSprite;
 import haxe.io.Path;
-import funkin.scripting.events.PlayAnimEvent.PlayAnimContext;
-import funkin.system.interfaces.IOffsetCompatible;
+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 funkin.system.interfaces.IBeatReceiver;
+import funkin.backend.system.interfaces.IBeatReceiver;
 
 @:enum
 abstract XMLAnimType(Int)

source/funkin/backend/FunkinText.hx

@@ -1,4 +1,4 @@
-package funkin.system;
+package funkin.backend;
 
 import flixel.util.FlxColor;
 import flixel.text.FlxText;

source/funkin/backend/MusicBeatGroup.hx

@@ -1,6 +1,6 @@
-package funkin.system;
+package funkin.backend;
 
-import funkin.system.interfaces.IBeatReceiver;
+import funkin.backend.system.interfaces.IBeatReceiver;
 
 class MusicBeatGroup extends FlxTypedSpriteGroup<FlxSprite> implements IBeatReceiver {
 	public function beatHit(curBeat:Int) {

source/funkin/backend/MusicBeatState.hx

@@ -1,14 +1,16 @@
-package funkin.system;
+package funkin.backend;
 
 import flixel.addons.transition.FlxTransitionableState;
-import funkin.system.framerate.Framerate;
-import funkin.scripting.DummyScript;
+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.scripting.events.*;
-import funkin.scripting.Script;
-import funkin.system.interfaces.IBeatReceiver;
-import funkin.system.Conductor;
+import funkin.backend.scripting.events.*;
+import funkin.backend.scripting.Script;
+import funkin.backend.system.interfaces.IBeatReceiver;
+import funkin.backend.system.Conductor;
 import funkin.options.PlayerSettings;
 
 class MusicBeatState extends FlxState implements IBeatReceiver

source/funkin/backend/MusicBeatSubstate.hx

@@ -1,12 +1,13 @@
-package funkin.system;
+package funkin.backend;
 
 import flixel.FlxState;
-import funkin.scripting.events.*;
-import funkin.scripting.Script;
-import funkin.scripting.DummyScript;
-import funkin.system.interfaces.IBeatReceiver;
-import funkin.system.Conductor.BPMChangeEvent;
-import funkin.system.Conductor;
+import funkin.backend.scripting.events.*;
+import funkin.backend.scripting.Script;
+import funkin.backend.scripting.DummyScript;
+import funkin.backend.system.interfaces.IBeatReceiver;
+import funkin.backend.system.Conductor.BPMChangeEvent;
+import funkin.backend.system.Conductor;
+import funkin.backend.system.Controls;
 import funkin.options.PlayerSettings;
 import flixel.FlxSubState;
 

source/funkin/backend/MusicBeatTransition.hx

@@ -1,8 +1,8 @@
-package funkin.system;
+package funkin.backend;
 
 import flixel.tweens.FlxTween;
 import flixel.FlxState;
-import funkin.utils.FunkinParentDisabler;
+import funkin.backend.utils.FunkinParentDisabler;
 
 class MusicBeatTransition extends MusicBeatSubstate {
 	var nextFrameSkip:Bool = false;

source/funkin/backend/assets/AssetPaths.hx

@@ -1,6 +1,6 @@
 // UNUSED
 
-package funkin.assets;
+package funkin.backend.assets;
 
 /**
  * {

source/funkin/backend/assets/AssetsLibraryList.hx

@@ -1,13 +1,13 @@
-package funkin.assets;
+package funkin.backend.assets;
 
-import funkin.assets.ModsAssetLibrary;
+import funkin.backend.assets.ModsAssetLibrary;
 import lime.utils.AssetLibrary;
 
 class AssetsLibraryList extends AssetLibrary {
 	public var libraries:Array<AssetLibrary> = [];
 
-	@:allow(funkin.system.Main)
-	@:allow(funkin.system.MainState)
+	@:allow(funkin.backend.system.Main)
+	@:allow(funkin.backend.system.MainState)
 	private var __defaultLibraries:Array<AssetLibrary> = [];
 	public var base:AssetLibrary;
 

source/funkin/backend/assets/LimeLibrarySymbol.hx

@@ -1,4 +1,4 @@
-package funkin.assets;
+package funkin.backend.assets;
 
 /**
  * COPIED DIRECTLY FROM LIME SOURCE CAUSE LIME IS SO FUCKING DUMB!!

source/funkin/backend/assets/ModdableAssetsFolder.hx

@@ -1,4 +1,4 @@
-package funkin.assets;
+package funkin.backend.assets;
 
 import lime.utils.AssetLibrary;
 

source/funkin/backend/assets/ModsAssetLibrary.hx

@@ -1,4 +1,4 @@
-package funkin.assets;
+package funkin.backend.assets;
 
 import lime.utils.Log;
 import lime.utils.AssetLibrary;

source/funkin/backend/assets/ModsFolder.hx

@@ -1,8 +1,8 @@
-package funkin.assets;
+package funkin.backend.assets;
 
-import funkin.system.MainState;
+import funkin.backend.system.MainState;
 import funkin.menus.TitleState;
-import funkin.system.Main;
+import funkin.backend.system.Main;
 import openfl.utils.AssetCache;
 import flixel.util.FlxSignal.FlxTypedSignal;
 import openfl.utils.AssetManifest;

source/funkin/backend/assets/ModsFolderLibrary.hx

@@ -1,4 +1,4 @@
-package funkin.assets;
+package funkin.backend.assets;
 
 import lime.utils.AssetLibrary;
 import lime.utils.Assets as LimeAssets;

source/funkin/backend/assets/Paths.hx

@@ -1,13 +1,13 @@
-package funkin.assets;
+package funkin.backend.assets;
 
 import flixel.graphics.frames.FlxFramesCollection;
 import haxe.io.Path;
-import funkin.assets.LimeLibrarySymbol;
+import funkin.backend.assets.LimeLibrarySymbol;
 import flixel.graphics.frames.FlxAtlasFrames;
 import openfl.utils.AssetType;
 import openfl.utils.Assets as OpenFlAssets;
-import funkin.assets.ModsFolder;
-import funkin.scripting.Script;
+import funkin.backend.assets.ModsFolder;
+import funkin.backend.scripting.Script;
 import animateatlas.AtlasFrameMaker;
 import flixel.graphics.frames.FlxAtlasFrames;
 import flixel.system.FlxAssets.FlxGraphicAsset;
@@ -261,9 +261,9 @@ class Paths
 
 		var content:Array<String> = [];
 		#if MOD_SUPPORT
-		if (library is funkin.assets.ModsAssetLibrary) {
+		if (library is funkin.backend.assets.ModsAssetLibrary) {
 			// easy task, can immediately scan for files!
-			var lib = cast(library, funkin.assets.ModsAssetLibrary);
+			var lib = cast(library, funkin.backend.assets.ModsAssetLibrary);
 			content = lib.getFiles(libThing.symbolName);
 			if (addPath)
 				for(i in 0...content.length)

source/funkin/backend/assets/ZipFolderLibrary.hx

@@ -1,4 +1,4 @@
-package funkin.assets;
+package funkin.backend.assets;
 
 import lime.utils.Log;
 import lime.utils.AssetLibrary;
@@ -22,8 +22,8 @@ import sys.FileStat;
 import sys.FileSystem;
 import sys.io.File;
 import haxe.zip.Reader;
-import funkin.utils.SysZip;
-import funkin.utils.SysZip.SysZipEntry;
+import funkin.backend.utils.SysZip;
+import funkin.backend.utils.SysZip.SysZipEntry;
 
 class ZipFolderLibrary extends AssetLibrary implements ModsAssetLibrary {
 	public var zipPath:String;

source/funkin/backend/chart/BaseGameParser.hx

@@ -1,4 +1,4 @@
-package funkin.chart;
+package funkin.backend.chart;
 
 class BaseGameParser {
 	public static function parse(data:Dynamic, result:ChartData) {

source/funkin/backend/chart/Chart.hx

@@ -1,6 +1,6 @@
-package funkin.chart;
+package funkin.backend.chart;
 
-import funkin.chart.ChartData;
+import funkin.backend.chart.ChartData;
 import flixel.util.FlxColor;
 import haxe.io.Path;
 import haxe.Json;

source/funkin/backend/chart/ChartData.hx

@@ -1,4 +1,4 @@
-package funkin.chart;
+package funkin.backend.chart;
 
 import flixel.util.FlxColor;
 

source/funkin/backend/scripting/DummyScript.hx

@@ -1,4 +1,4 @@
-package funkin.scripting;
+package funkin.backend.scripting;
 
 /**
  * Simple class for empty scripts or scripts whose language isn't imported yet.

source/funkin/backend/scripting/EventManager.hx

@@ -1,7 +1,7 @@
-package funkin.scripting;
+package funkin.backend.scripting;
 
 import flixel.FlxState;
-import funkin.scripting.events.*;
+import funkin.backend.scripting.events.*;
 
 class EventManager {
 	// map doesnt work for that

source/funkin/backend/scripting/GlobalScript.hx

@@ -1,9 +1,9 @@
-package funkin.scripting;
+package funkin.backend.scripting;
 
-import funkin.scripting.events.CancellableEvent;
-import funkin.system.Conductor;
+import funkin.backend.scripting.events.CancellableEvent;
+import funkin.backend.system.Conductor;
 import flixel.FlxState;
-import funkin.assets.ModsFolder;
+import funkin.backend.assets.ModsFolder;
 #if GLOBAL_SCRIPT
 /**
  * Class for THE Global Script, aka script that runs in the background at all times.

source/funkin/backend/scripting/HScript.hx

@@ -1,4 +1,4 @@
-package funkin.scripting;
+package funkin.backend.scripting;
 
 import haxe.io.Path;
 import hscript.Expr.ClassDecl;

source/funkin/backend/scripting/ModState.hx

@@ -1,4 +1,4 @@
-package funkin.scripting;
+package funkin.backend.scripting;
 
 class ModState extends MusicBeatState {
 	public static var lastName:String = null;

source/funkin/backend/scripting/ModSubState.hx

@@ -1,4 +1,4 @@
-package funkin.scripting;
+package funkin.backend.scripting;
 
 class ModSubState extends MusicBeatSubstate {
 	public static var lastName:String = null;

source/funkin/backend/scripting/MultiThreadedScript.hx

@@ -1,4 +1,4 @@
-package funkin.scripting;
+package funkin.backend.scripting;
 
 #if ALLOW_MULTITHREADING
 import sys.thread.Thread;

source/funkin/backend/scripting/Script.hx

@@ -1,4 +1,4 @@
-package funkin.scripting;
+package funkin.backend.scripting;
 
 import lime.app.Application;
 import flixel.util.FlxDestroyUtil.IFlxDestroyable;
@@ -31,7 +31,7 @@ class Script extends FlxBasic implements IFlxDestroyable {
 
 			// Flixel related stuff
 			"FlxG"			  => flixel.FlxG,
-			"FlxSprite"		 => funkin.system.FunkinSprite,
+			"FlxSprite"		 => funkin.backend.FunkinSprite,
 			"FlxBasic"		  => flixel.FlxBasic,
 			"FlxCamera"		 => flixel.FlxCamera,
 			"state"			 => flixel.FlxG.state,
@@ -52,13 +52,13 @@ class Script extends FlxBasic implements IFlxDestroyable {
 
 			// Engine related stuff
 			"engine"			=> {
-				commit: funkin.system.macros.GitCommitMacro.commitNumber,
-				hash: funkin.system.macros.GitCommitMacro.commitHash,
+				commit: funkin.backend.system.macros.GitCommitMacro.commitNumber,
+				hash: funkin.backend.system.macros.GitCommitMacro.commitHash,
 				build: 2675, // 2675 being the last build num before it was removed
 				name: "Codename Engine"
 			},
-			"ModState"		  => funkin.scripting.ModState,
-			"ModSubState"	   => funkin.scripting.ModSubState,
+			"ModState"		  => funkin.backend.scripting.ModState,
+			"ModSubState"	   => funkin.backend.scripting.ModSubState,
 			"PlayState"		 => funkin.game.PlayState,
 			"GameOverSubstate"  => funkin.game.GameOverSubstate,
 			"HealthIcon"		=> funkin.game.HealthIcon,
@@ -75,29 +75,29 @@ class Script extends FlxBasic implements IFlxDestroyable {
 			"StoryMenuState"	=> funkin.menus.StoryMenuState,
 			"TitleState"		=> funkin.menus.TitleState,
 			"Options"		   => funkin.options.Options,
-			"Paths"			 => funkin.assets.Paths,
-			"Conductor"		 => funkin.system.Conductor,
-			"FunkinShader"	  => funkin.shaders.FunkinShader,
-			"CustomShader"	  => funkin.shaders.CustomShader,
-			"FunkinText"		=> funkin.system.FunkinText,
+			"Paths"			 => funkin.backend.assets.Paths,
+			"Conductor"		 => funkin.backend.system.Conductor,
+			"FunkinShader"	  => funkin.backend.shaders.FunkinShader,
+			"CustomShader"	  => funkin.backend.shaders.CustomShader,
+			"FunkinText"		=> funkin.backend.FunkinText,
 			"Alphabet"		  => funkin.menus.ui.Alphabet,
 
-			"CoolUtil"		  => funkin.utils.CoolUtil,
-			"IniUtil"		   => funkin.utils.IniUtil,
-			"XMLUtil"		   => funkin.utils.XMLUtil,
-			#if sys "ZipUtil"   => funkin.utils.ZipUtil, #end
-			"MarkdownUtil"	  => funkin.utils.MarkdownUtil,
-			"EngineUtil"		=> funkin.utils.EngineUtil,
-			"MemoryUtil"		=> funkin.utils.MemoryUtil,
-			"BitmapUtil"		=> funkin.utils.BitmapUtil,
+			"CoolUtil"		  => funkin.backend.utils.CoolUtil,
+			"IniUtil"		   => funkin.backend.utils.IniUtil,
+			"XMLUtil"		   => funkin.backend.utils.XMLUtil,
+			#if sys "ZipUtil"   => funkin.backend.utils.ZipUtil, #end
+			"MarkdownUtil"	  => funkin.backend.utils.MarkdownUtil,
+			"EngineUtil"		=> funkin.backend.utils.EngineUtil,
+			"MemoryUtil"		=> funkin.backend.utils.MemoryUtil,
+			"BitmapUtil"		=> funkin.backend.utils.BitmapUtil,
 		];
 	}
 	public static function getDefaultPreprocessors():Map<String, Dynamic> {
-		var defines = funkin.system.macros.DefinesMacro.defines;
+		var defines = funkin.backend.system.macros.DefinesMacro.defines;
 		defines.set("CODENAME_ENGINE", true);
 		defines.set("CODENAME_VER", Application.current.meta.get('version'));
 		defines.set("CODENAME_BUILD", 2675); // 2675 being the last build num before it was removed
-		defines.set("CODENAME_COMMIT", funkin.system.macros.GitCommitMacro.commitNumber);
+		defines.set("CODENAME_COMMIT", funkin.backend.system.macros.GitCommitMacro.commitNumber);
 		return defines;
 	}
 	/**

source/funkin/backend/scripting/ScriptPack.hx

@@ -1,6 +1,6 @@
-package funkin.scripting;
+package funkin.backend.scripting;
 
-import funkin.scripting.events.CancellableEvent;
+import funkin.backend.scripting.events.CancellableEvent;
 
 @:access(CancellableEvent)
 class ScriptPack extends Script {

source/funkin/backend/scripting/events/CamMoveEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 import funkin.game.StrumLine;
 import flixel.math.FlxPoint;

source/funkin/backend/scripting/events/CancellableEvent.hx

@@ -1,9 +1,9 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 import flixel.util.FlxDestroyUtil.IFlxDestroyable;
 
 @:allow(ScriptPack)
-@:autoBuild(funkin.system.macros.EventMacro.build())
+@:autoBuild(funkin.backend.system.macros.EventMacro.build())
 @:noCustomClass
 class CancellableEvent implements IFlxDestroyable {
 	@:dox(hide) public var cancelled:Bool = false;

source/funkin/backend/scripting/events/CountdownEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 import flixel.tweens.FlxTween;
 import flixel.sound.FlxSound;

source/funkin/backend/scripting/events/DanceEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 final class DanceEvent extends CancellableEvent {
 	public var danced:Bool;

source/funkin/backend/scripting/events/DirectionAnimEvent.hx

@@ -1,6 +1,6 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
-import funkin.scripting.events.PlayAnimEvent.PlayAnimContext;
+import funkin.backend.scripting.events.PlayAnimEvent.PlayAnimContext;
 
 final class DirectionAnimEvent extends CancellableEvent {
 	/**

source/funkin/backend/scripting/events/DiscordPresenceUpdateEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 #if DISCORD_RPC
 import discord_rpc.DiscordRpc.DiscordPresenceOptions;

source/funkin/backend/scripting/events/FreeplaySongSelectEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 final class FreeplaySongSelectEvent extends CancellableEvent {
 	/**

source/funkin/backend/scripting/events/InputSystemEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 import funkin.game.StrumLine;
 

source/funkin/backend/scripting/events/MenuChangeEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 final class MenuChangeEvent extends CancellableEvent {
 	/**

source/funkin/backend/scripting/events/NameEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 final class NameEvent extends CancellableEvent {
 	/**

source/funkin/backend/scripting/events/NoteCreationEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 import funkin.game.Note;
 

source/funkin/backend/scripting/events/NoteHitEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 import funkin.game.Note;
 import funkin.game.Character;

source/funkin/backend/scripting/events/NoteUpdateEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 import funkin.game.Note;
 import funkin.game.Strum;

source/funkin/backend/scripting/events/PauseCreationEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 /**
  * CANCEL this event to prevent default behaviour!

source/funkin/backend/scripting/events/PlayAnimEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 final class PlayAnimEvent extends CancellableEvent {
 	/**

source/funkin/backend/scripting/events/PointEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 final class PointEvent extends CancellableEvent {
 	/**

source/funkin/backend/scripting/events/RatingUpdateEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 final class RatingUpdateEvent extends CancellableEvent {
 	/**

source/funkin/backend/scripting/events/ResizeEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 final class ResizeEvent extends CancellableEvent {
 	/**

source/funkin/backend/scripting/events/SimpleNoteEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 import funkin.game.Note;
 

source/funkin/backend/scripting/events/StateEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 import flixel.FlxState;
 

source/funkin/backend/scripting/events/StrumCreationEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 import funkin.game.Strum;
 

source/funkin/backend/scripting/events/WeekSelectEvent.hx

@@ -1,4 +1,4 @@
-package funkin.scripting.events;
+package funkin.backend.scripting.events;
 
 import funkin.menus.StoryMenuState.WeekData;
 

source/funkin/backend/shaders/BlendModeEffect.hx

@@ -1,4 +1,4 @@
-package funkin.shaders;
+package funkin.backend.shaders;
 
 import flixel.util.FlxColor;
 import openfl.display.ShaderParameter;

source/funkin/backend/shaders/CustomShader.hx

@@ -1,4 +1,4 @@
-package funkin.shaders;
+package funkin.backend.shaders;
 
 import haxe.Exception;
 import openfl.Assets;

source/funkin/backend/shaders/FunkinShader.hx

@@ -1,4 +1,4 @@
-package funkin.shaders;
+package funkin.backend.shaders;
 
 import haxe.Exception;
 import hscript.IHScriptCustomBehaviour;

source/funkin/backend/shaders/OverlayShader.hx

@@ -1,4 +1,4 @@
-package funkin.shaders;
+package funkin.backend.shaders;
 
 import flixel.system.FlxAssets.FlxShader;
 

source/funkin/backend/shaders/WiggleEffect.hx

@@ -1,4 +1,4 @@
-package funkin.shaders;
+package funkin.backend.shaders;
 
 // STOLEN FROM HAXEFLIXEL DEMO LOL
 import flixel.system.FlxAssets.FlxShader;

source/funkin/backend/system/CommandLineHandler.hx

@@ -1,4 +1,4 @@
-package funkin.system;
+package funkin.backend.system;
 
 import sys.FileSystem;
 #if sys
@@ -37,7 +37,7 @@ class CommandLineHandler {
 						Sys.println("[ERROR] You need to specify the mod folder path");
 						Sys.exit(0);
 					} else if (FileSystem.exists(arg)) {
-						funkin.assets.ModsFolder.modsPath = arg;
+						funkin.backend.assets.ModsFolder.modsPath = arg;
 					} else {
 						Sys.println('[ERROR] Mod folder at "${arg}" does not exist.');
 						Sys.exit(0);

source/funkin/backend/system/Conductor.hx

@@ -1,10 +1,10 @@
-package funkin.system;
+package funkin.backend.system;
 
-import funkin.chart.Chart;
-import funkin.chart.ChartData;
+import funkin.backend.chart.Chart;
+import funkin.backend.chart.ChartData;
 import openfl.Lib;
 import flixel.FlxState;
-import funkin.system.interfaces.IBeatReceiver;
+import funkin.backend.system.interfaces.IBeatReceiver;
 import flixel.util.FlxSignal.FlxTypedSignal;
 
 /**

source/funkin/backend/system/Controls.hx

@@ -1,4 +1,4 @@
-package funkin.system;
+package funkin.backend.system;
 
 import flixel.input.FlxInput;
 import flixel.input.actions.FlxAction;

source/funkin/backend/system/ErrorCode.hx

@@ -1,4 +1,4 @@
-package funkin.system;
+package funkin.backend.system;
 
 @:enum
 abstract ErrorCode(Int) {

source/funkin/backend/system/FunkinGame.hx

@@ -1,4 +1,4 @@
-package funkin.system;
+package funkin.backend.system;
 
 import flixel.FlxGame;
 

source/funkin/backend/system/FunkinRatioScaleMode.hx

@@ -1,4 +1,4 @@
-package funkin.system;
+package funkin.backend.system;
 
 import flixel.system.scaleModes.RatioScaleMode;
 

source/funkin/backend/system/GraphicCacheSprite.hx

@@ -1,4 +1,4 @@
-package funkin.system;
+package funkin.backend.system;
 
 import flixel.graphics.FlxGraphic;
 

source/funkin/backend/system/Logs.hx

@@ -1,10 +1,10 @@
-package funkin.system;
+package funkin.backend.system;
 
 import flixel.system.debug.log.LogStyle;
 import flixel.system.frontEnds.LogFrontEnd;
 import haxe.Log;
-import funkin.utils.NativeAPI;
-import funkin.utils.NativeAPI.ConsoleColor;
+import funkin.backend.utils.NativeAPI;
+import funkin.backend.utils.NativeAPI.ConsoleColor;
 
 class Logs {
 	private static var __showing:Bool = false;

source/funkin/backend/system/Main.hx

@@ -1,12 +1,12 @@
-package funkin.system;
+package funkin.backend.system;
 
-import funkin.assets.AssetsLibraryList;
-import funkin.system.framerate.SystemInfo;
+import funkin.backend.assets.AssetsLibraryList;
+import funkin.backend.system.framerate.SystemInfo;
 import openfl.utils.AssetLibrary;
 import openfl.utils.AssetCache;
 import openfl.text.TextFormat;
 import flixel.system.ui.FlxSoundTray;
-import funkin.utils.NativeAPI;
+import funkin.backend.utils.NativeAPI;
 import funkin.menus.BetaWarningState;
 import funkin.menus.TitleState;
 import flixel.FlxGame;
@@ -23,7 +23,7 @@ import flixel.addons.transition.TransitionData;
 import flixel.math.FlxPoint;
 import flixel.math.FlxRect;
 import lime.app.Application;
-import funkin.system.modules.*;
+import funkin.backend.system.modules.*;
 
 #if ALLOW_MULTITHREADING
 import sys.thread.Thread;
@@ -31,7 +31,7 @@ import sys.thread.Thread;
 #if sys
 import sys.io.File;
 #end
-import funkin.assets.ModsFolder;
+import funkin.backend.assets.ModsFolder;
 
 class Main extends Sprite
 {
@@ -42,7 +42,7 @@ class Main extends Sprite
 
 	public static var scaleMode:FunkinRatioScaleMode;
 	#if !mobile
-	public static var framerateSprite:funkin.system.framerate.Framerate;
+	public static var framerateSprite:funkin.backend.system.framerate.Framerate;
 	#end
 
 	var gameWidth:Int = 1280; // Width of the game in pixels (might be less / more in actual pixels depending on your zoom).
@@ -70,7 +70,7 @@ class Main extends Sprite
 		addChild(game = new FunkinGame(gameWidth, gameHeight, MainState, framerate, framerate, skipSplash, startFullscreen));
 
 		#if !mobile
-		addChild(framerateSprite = new funkin.system.framerate.Framerate());
+		addChild(framerateSprite = new funkin.backend.system.framerate.Framerate());
 		framerateSprite.scaleX = framerateSprite.scaleY = stage.window.scale;
 		SystemInfo.init();
 		#end
@@ -116,7 +116,7 @@ class Main extends Sprite
 		Paths.assetsTree = new AssetsLibraryList();
 
 		#if UPDATE_CHECKING
-		funkin.system.updating.UpdateUtil.init();
+		funkin.backend.system.updating.UpdateUtil.init();
 		#end
 		CrashHandler.init();
 		Logs.init();
@@ -124,7 +124,7 @@ class Main extends Sprite
 		ModsFolder.init();
 		DiscordUtil.init();
 		#if GLOBAL_SCRIPT
-		funkin.scripting.GlobalScript.init();
+		funkin.backend.scripting.GlobalScript.init();
 		#end
 
 		#if sys

source/funkin/backend/system/MainState.hx

@@ -1,9 +1,9 @@
-package funkin.system;
+package funkin.backend.system;
 
 #if MOD_SUPPORT
 import sys.FileSystem;
 #end
-import funkin.assets.ModsFolder;
+import funkin.backend.assets.ModsFolder;
 import funkin.menus.TitleState;
 import funkin.menus.BetaWarningState;
 import flixel.FlxState;

source/funkin/backend/system/OptimizedBitmapData.hx

@@ -1,4 +1,4 @@
-package funkin.system;
+package funkin.backend.system;
 
 import lime.graphics.Image;
 import openfl.geom.Rectangle;

source/funkin/backend/system/framerate/AssetTreeInfo.hx

@@ -1,6 +1,6 @@
-package funkin.system.framerate;
+package funkin.backend.system.framerate;
 
-import funkin.assets.ModsAssetLibrary;
+import funkin.backend.assets.ModsAssetLibrary;
 
 class AssetTreeInfo extends FramerateCategory {
 	public function new() {

source/funkin/backend/system/framerate/CodenameBuildField.hx

@@ -1,9 +1,9 @@
-package funkin.system.framerate;
+package funkin.backend.system.framerate;
 
 import openfl.text.TextFormat;
 import openfl.display.Sprite;
 import openfl.text.TextField;
-import funkin.system.macros.GitCommitMacro;
+import funkin.backend.system.macros.GitCommitMacro;
 
 class CodenameBuildField extends TextField {
 	public function new() {

source/funkin/backend/system/framerate/ConductorInfo.hx

@@ -1,4 +1,4 @@
-package funkin.system.framerate;
+package funkin.backend.system.framerate;
 
 
 class ConductorInfo extends FramerateCategory {

source/funkin/backend/system/framerate/FlixelInfo.hx

@@ -1,4 +1,4 @@
-package funkin.system.framerate;
+package funkin.backend.system.framerate;
 
 class FlixelInfo extends FramerateCategory {
 	public function new() {

source/funkin/backend/system/framerate/Framerate.hx

@@ -1,4 +1,4 @@
-package funkin.system.framerate;
+package funkin.backend.system.framerate;
 
 import openfl.display.Bitmap;
 import openfl.display.BitmapData;

source/funkin/backend/system/framerate/FramerateCategory.hx

@@ -1,4 +1,4 @@
-package funkin.system.framerate;
+package funkin.backend.system.framerate;
 
 import openfl.display.Bitmap;
 import openfl.text.TextFormat;

source/funkin/backend/system/framerate/FramerateCounter.hx

@@ -1,4 +1,4 @@
-package funkin.system.framerate;
+package funkin.backend.system.framerate;
 
 import openfl.text.TextFormat;
 import openfl.display.Sprite;

source/funkin/backend/system/framerate/MemoryCounter.hx

@@ -1,4 +1,4 @@
-package funkin.system.framerate;
+package funkin.backend.system.framerate;
 
 import openfl.text.TextFormat;
 import openfl.display.Sprite;

source/funkin/backend/system/framerate/StatsInfo.hx

@@ -1,4 +1,4 @@
-package funkin.system.framerate;
+package funkin.backend.system.framerate;
 
 #if (gl_stats && !disable_cffi && (!html5 || !canvas))
 import openfl.display._internal.stats.Context3DStats;

source/funkin/backend/system/framerate/SystemInfo.hx

@@ -1,7 +1,7 @@
-package funkin.system.framerate;
+package funkin.backend.system.framerate;
 
-import funkin.utils.native.HiddenProcess;
-import funkin.utils.MemoryUtil;
+import funkin.backend.utils.native.HiddenProcess;
+import funkin.backend.utils.MemoryUtil;
 
 using StringTools;
 

source/funkin/backend/system/github/GitHub.hx

@@ -1,4 +1,4 @@
-package funkin.system.github;
+package funkin.backend.system.github;
 
 #if GITHUB_API
 import haxe.Json;

source/funkin/backend/system/github/GitHubAsset.hx

@@ -1,6 +1,6 @@
-package funkin.system.github;
+package funkin.backend.system.github;
 
-import funkin.system.github.GitHubUser;
+import funkin.backend.system.github.GitHubUser;
 
 typedef GitHubAsset = {
 	var url:String;

source/funkin/backend/system/github/GitHubContributor.hx

@@ -1,4 +1,4 @@
-package funkin.system.github;
+package funkin.backend.system.github;
 
 typedef GitHubContributor = {
 	var login:String;

source/funkin/backend/system/github/GitHubException.hx

@@ -1,4 +1,4 @@
-package funkin.system.github;
+package funkin.backend.system.github;
 
 import haxe.Exception;
 

source/funkin/backend/system/github/GitHubReactions.hx

@@ -1,4 +1,4 @@
-package funkin.system.github;
+package funkin.backend.system.github;
 
 typedef GitHubReactions = {
 	var url:String;

source/funkin/backend/system/github/GitHubRelease.hx

@@ -1,4 +1,4 @@
-package funkin.system.github;
+package funkin.backend.system.github;
 
 typedef GitHubRelease = {
 	/**

source/funkin/backend/system/github/GitHubUser.hx

@@ -1,4 +1,4 @@
-package funkin.system.github;
+package funkin.backend.system.github;
 
 
 typedef GitHubUser = {

source/funkin/backend/system/interfaces/IBeatReceiver.hx

@@ -1,4 +1,4 @@
-package funkin.system.interfaces;
+package funkin.backend.system.interfaces;
 
 interface IBeatReceiver {
 	public function measureHit(curMeasure:Int):Void;

source/funkin/backend/system/interfaces/IOffsetCompatible.hx

@@ -1,4 +1,4 @@
-package funkin.system.interfaces;
+package funkin.backend.system.interfaces;
 
 interface IOffsetCompatible {
 	public function addOffset(anim:String, x:Float = 0, y:Float = 0):Void;

source/funkin/backend/system/macros/DefinesMacro.hx

@@ -1,4 +1,4 @@
-package funkin.system.macros;
+package funkin.backend.system.macros;
 
 #if macro
 import sys.io.Process;

source/funkin/backend/system/macros/EventMacro.hx

@@ -1,4 +1,4 @@
-package funkin.system.macros;
+package funkin.backend.system.macros;
 
 #if macro
 /**

source/funkin/backend/system/macros/FunkinSaveMacro.hx

@@ -1,4 +1,4 @@
-package funkin.system.macros;
+package funkin.backend.system.macros;
 
 #if macro
 /**

source/funkin/backend/system/macros/GitCommitMacro.hx

@@ -1,4 +1,4 @@
-package funkin.system.macros;
+package funkin.backend.system.macros;
 
 #if macro
 import sys.io.Process;

source/funkin/backend/system/macros/NewHaxeWarning.hx

@@ -1,4 +1,4 @@
-package funkin.system.macros;
+package funkin.backend.system.macros;
 
 #if macro
 class NewHaxeWarning {

source/funkin/backend/system/macros/OptionsMacro.hx

@@ -1,4 +1,4 @@
-package funkin.system.macros;
+package funkin.backend.system.macros;
 
 #if macro
 using StringTools;

source/funkin/backend/system/macros/ScriptsMacro.hx

@@ -1,4 +1,4 @@
-package funkin.system.macros;
+package funkin.backend.system.macros;
 
 #if macro
 import haxe.macro.Context;
@@ -21,7 +21,7 @@ class ScriptsMacro {
 			"flixel.addons.util",
 			// OTHER LIBRARIES & STUFF
 			"away3d", "flx3d", #if sys "sys", #end "openfl.net",
-			"funkin.system.net",
+			"funkin.backend.system.net",
 			// BASE HAXE
 			"DateTools", "EReg", "Lambda", "StringBuf", "haxe.crypto", "haxe.display", "haxe.exceptions", "haxe.extern", "scripting"
 		])

source/funkin/backend/system/macros/SoftcodedClassMacro.hx

@@ -1,17 +1,17 @@
-package funkin.system.macros;
+package funkin.backend.system.macros;
 
 using StringTools;
 class SoftcodedClassMacro {
 	#if macro
 	private static var nonAllowedSuffixes:Array<String> = ["__Softcoded", "_HSC", "_HSX", "_Impl_"];
 	public static function init() {
-		Compiler.addGlobalMetadata('funkin.game.cutscenes', '@:build(funkin.system.macros.SoftcodedClassMacro.build())');
-		Compiler.addGlobalMetadata('funkin.game', '@:build(funkin.system.macros.SoftcodedClassMacro.build())');
-		Compiler.addGlobalMetadata('funkin.menus', '@:build(funkin.system.macros.SoftcodedClassMacro.build())');
-		Compiler.addGlobalMetadata('funkin.options', '@:build(funkin.system.macros.SoftcodedClassMacro.build())');
-		Compiler.addGlobalMetadata('funkin.scripting', '@:build(funkin.system.macros.SoftcodedClassMacro.build())');
-		Compiler.addGlobalMetadata('funkin.shaders', '@:build(funkin.system.macros.SoftcodedClassMacro.build())');
-		Compiler.addGlobalMetadata('flixel', '@:build(funkin.system.macros.SoftcodedClassMacro.build())', false);
+		Compiler.addGlobalMetadata('funkin.game.cutscenes', '@:build(funkin.backend.system.macros.SoftcodedClassMacro.build())');
+		Compiler.addGlobalMetadata('funkin.game', '@:build(funkin.backend.system.macros.SoftcodedClassMacro.build())');
+		Compiler.addGlobalMetadata('funkin.menus', '@:build(funkin.backend.system.macros.SoftcodedClassMacro.build())');
+		Compiler.addGlobalMetadata('funkin.options', '@:build(funkin.backend.system.macros.SoftcodedClassMacro.build())');
+		Compiler.addGlobalMetadata('funkin.backend.scripting', '@:build(funkin.backend.system.macros.SoftcodedClassMacro.build())');
+		Compiler.addGlobalMetadata('funkin.backend.shaders', '@:build(funkin.backend.system.macros.SoftcodedClassMacro.build())');
+		Compiler.addGlobalMetadata('flixel', '@:build(funkin.backend.system.macros.SoftcodedClassMacro.build())', false);
 	}
 
 	public static function build():Array<Field> {

source/funkin/backend/system/modules/AudioSwitchFix.hx

@@ -1,9 +1,9 @@
-package funkin.system.modules;
+package funkin.backend.system.modules;
 
 import lime.media.AudioManager;
 import flixel.sound.FlxSound;
 import flixel.FlxState;
-import funkin.utils.NativeAPI;
+import funkin.backend.utils.NativeAPI;
 
 /**
  * if youre stealing this keep this comment at least please lol

source/funkin/backend/system/modules/CrashHandler.hx

@@ -1,7 +1,7 @@
-package funkin.system.modules;
+package funkin.backend.system.modules;
 
 import lime.system.System;
-import funkin.utils.NativeAPI;
+import funkin.backend.utils.NativeAPI;
 import openfl.Lib;
 import openfl.events.UncaughtErrorEvent;
 import openfl.events.ErrorEvent;