reorganize backend

.hxpkg

@@ -1 +1,76 @@
-[{"profile":"default","pkgs":[{"name":"flixel","version":"5.8.0"},{"name":"openfl","version":"9.3.4"},{"name":"lime","version":"8.1.3"},{"name":"flixel-tools"},{"name":"flixel-addons"},{"name":"flixel-text-input"},{"name":"hxcpp-debug-server"},{"name":"polymod","link":"https://github.com/swordcube/scriptless-polymod.git"},{"name":"hxvlc"},{"name":"hscript"},{"name":"hxdiscord_rpc","link":"https://github.com/MAJigsaw77/hxdiscord_rpc.git"},{"name":"haxeui-core","link":"https://github.com/haxeui/haxeui-core.git"},{"name":"haxeui-flixel","link":"https://github.com/haxeui/haxeui-flixel.git"},{"name":"hxcpp"},{"name":"thx.semver"},{"name":"thx.core","link":"https://github.com/fponticelli/thx.core.git"},{"name":"linc_luajit","link":"https://github.com/superpowers04/linc_luajit"},{"name":"hscript-improved","link":"https://github.com/FNF-CNE-Devs/hscript-improved.git"},{"name":"moonchart","link":"https://github.com/MaybeMaru/moonchart.git"}]}]
+[
+	{
+		"profile": "default",
+		"pkgs": [
+			{
+				"name": "flixel",
+				"version": "5.8.0"
+			},
+			{
+				"name": "openfl",
+				"version": "9.3.4"
+			},
+			{
+				"name": "lime",
+				"version": "8.1.3"
+			},
+			{
+				"name": "flixel-tools"
+			},
+			{
+				"name": "flixel-addons"
+			},
+			{
+				"name": "flixel-text-input"
+			},
+			{
+				"name": "hxcpp-debug-server"
+			},
+			{
+				"name": "polymod",
+				"link": "https://github.com/swordcube/scriptless-polymod.git"
+			},
+			{
+				"name": "hxvlc"
+			},
+			{
+				"name": "hscript"
+			},
+			{
+				"name": "hxdiscord_rpc",
+				"link": "https://github.com/MAJigsaw77/hxdiscord_rpc.git"
+			},
+			{
+				"name": "haxeui-core",
+				"link": "https://github.com/haxeui/haxeui-core.git"
+			},
+			{
+				"name": "hxcpp"
+			},
+			{
+				"name": "thx.semver"
+			},
+			{
+				"name": "thx.core",
+				"link": "https://github.com/fponticelli/thx.core.git"
+			},
+			{
+				"name": "linc_luajit",
+				"link": "https://github.com/superpowers04/linc_luajit"
+			},
+			{
+				"name": "hscript-improved",
+				"link": "https://github.com/FNF-CNE-Devs/hscript-improved.git"
+			},
+			{
+				"name": "moonchart",
+				"link": "https://github.com/MaybeMaru/moonchart.git"
+			},
+			{
+				"name": "haxeui-flixel",
+				"link": "https://github.com/haxeui/haxeui-flixel.git",
+				"branch": "master"
+			}
+		]
+	}
+]

Project.xml

@@ -6,15 +6,17 @@
 	<set name="APP_ID" value="0x0100f6c013bbc000" />
 	<haxedef name="LINC_LUA_RELATIVE_DYNAMIC_LIB" />
 	<!--
-	The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
+	The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into
+	a html file
 	or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"
 	-->
 	<!-- <app preloader="Preloader" resizable="true" /> -->
 	<app preloader="flixel.system.FlxPreloader" />
 	<!-- Minimum without FLX_NO_GAMEPAD: 11.8, without FLX_NO_NATIVE_CURSOR: 11.2 -->
 	<set name="SWF_VERSION" value="11.8" />
 	<!-- Use defines to ensure compile-time definitions have readable context. -->
-	<!-- Allowed inputs are mobile,desktop,web,ios,android,windows,mac,linux,switch,html5,cpp,neko,flash,js -->
+	<!-- Allowed inputs are
+	mobile,desktop,web,ios,android,windows,mac,linux,switch,html5,cpp,neko,flash,js -->
 	<!-- Defines whether the Discord client should be enabled. Only works on desktop. -->
 	<define name="FEATURE_DISCORD" if="cpp" />
 	<!-- Defines whether the file system can be read/written directly. Does not work in browser. -->
@@ -38,7 +40,8 @@
 	<!-- Clicking outside a dialog should deselect the current focused component. -->
 	<!-- Discord Thingy -->
 	<haxedef name="DISCORD_DISABLE_IO_THREAD" />
-	<!-- Disables the use of precompiled headers but can cause issues with build times and memory usage -->
+	<!-- Disables the use of precompiled headers but can cause issues with build times and memory
+	usage -->
 	<haxedef name="NO_PRECOMPILED_HEADERS" if="linux" />
 	<!-- ____________________________ Window Settings ___________________________ -->
 	<!-- These window settings apply to all targets -->
@@ -72,7 +75,7 @@
 	<!-- _______________________________ Libraries ______________________________ -->
 	<haxedev set="webgl" />
 	<!-- Flixel -->
-	<haxelib name="flixel" version="5.8.0"/>
+	<haxelib name="flixel" />
 	<haxelib name="flixel-addons" />
 	<haxelib name="haxeui-flixel" />
 	<haxelib name="haxeui-core" />
@@ -99,7 +102,8 @@
 	<haxedef name="FLX_NO_TOUCH" if="desktop" />
 	<!-- Disable the Flixel core focus lost screen -->
 	<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />
-	<!-- Disable the Flixel core debugger. Automatically gets set whenever you compile in release mode! -->
+	<!-- Disable the Flixel core debugger. Automatically gets set whenever you compile in release
+	mode! -->
 	<haxedef name="FLX_NO_DEBUG" unless="debug" />
 	<!-- Enable this for Nape release builds for a serious peformance improvement -->
 	<haxedef name="NAPE_RELEASE_BUILD" unless="debug" />
@@ -143,4 +147,4 @@
 	<icon path="art/icon512.png" size="512" />
 	<icon path="art/iconOG.png" />
 	<haxedef name="gl_stats" if="desktop" />
-</project>
+</project>

assets/shared/images/hud/default/default.xml

@@ -1,20 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextureAtlas imagePath="default.png">
-	<!-- Created with Adobe Animate version 22.0.2.168 -->
-	<!-- http://www.adobe.com/products/animate.html -->
-	<SubTexture name="bad" x="1" y="1" width="261" height="131"/>
-	<SubTexture name="good" x="265" y="1" width="317" height="126"/>
-	<SubTexture name="marv" x="585" y="1" width="403" height="152"/>
-	<SubTexture name="num0" x="1" y="156" width="56" height="68"/>
-	<SubTexture name="num1" x="60" y="156" width="56" height="68"/>
-	<SubTexture name="num2" x="119" y="156" width="56" height="68"/>
-	<SubTexture name="num3" x="178" y="156" width="56" height="68"/>
-	<SubTexture name="num4" x="237" y="156" width="56" height="68"/>
-	<SubTexture name="num5" x="296" y="156" width="56" height="68"/>
-	<SubTexture name="num6" x="355" y="156" width="56" height="68"/>
-	<SubTexture name="num7" x="414" y="156" width="56" height="68"/>
-	<SubTexture name="num8" x="473" y="156" width="56" height="68"/>
-	<SubTexture name="num9" x="532" y="156" width="56" height="68"/>
-	<SubTexture name="shit" x="591" y="156" width="285" height="163"/>
-	<SubTexture name="sick" x="1" y="322" width="403" height="152"/>
-</TextureAtlas>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Created with Funkin Packer v0.1.3 https://neeeoo.github.io/funkin-packer/
+-->
+<TextureAtlas imagePath="default.png" width="482" height="478">
+	<SubTexture name="bad" x="244" y="285" width="187" height="123" frameX="-24" frameY="-5" frameWidth="261" frameHeight="131"/>
+	<SubTexture name="good" x="350" y="1" width="108" height="260" rotated="true" frameX="-25" frameY="-8" frameWidth="317" frameHeight="126"/>
+	<SubTexture name="marv" x="1" y="1" width="346" height="139" frameX="-11" frameY="-7" frameWidth="403" frameHeight="152"/>
+	<SubTexture name="num0" x="244" y="411" width="47" height="58" frameX="-6" frameY="-5" frameWidth="56" frameHeight="68"/>
+	<SubTexture name="num1" x="184" y="430" width="57" height="47" rotated="true" frameX="-6" frameY="-7" frameWidth="56" frameHeight="68"/>
+	<SubTexture name="num2" x="434" y="325" width="47" height="57" frameX="-6" frameY="-6" frameWidth="56" frameHeight="68"/>
+	<SubTexture name="num3" x="294" y="411" width="47" height="58" frameX="-6" frameY="-6" frameWidth="56" frameHeight="68"/>
+	<SubTexture name="num4" x="344" y="411" width="47" height="58" frameX="-6" frameY="-6" frameWidth="56" frameHeight="68"/>
+	<SubTexture name="num5" x="394" y="411" width="47" height="58" frameX="-6" frameY="-6" frameWidth="56" frameHeight="68"/>
+	<SubTexture name="num6" x="1" y="430" width="58" height="47" rotated="true" frameX="-6" frameY="-6" frameWidth="56" frameHeight="68"/>
+	<SubTexture name="num7" x="62" y="430" width="58" height="47" rotated="true" frameX="-6" frameY="-6" frameWidth="56" frameHeight="68"/>
+	<SubTexture name="num8" x="123" y="430" width="58" height="47" rotated="true" frameX="-6" frameY="-6" frameWidth="56" frameHeight="68"/>
+	<SubTexture name="num9" x="434" y="264" width="47" height="58" frameX="-6" frameY="-6" frameWidth="56" frameHeight="68"/>
+	<SubTexture name="shit" x="1" y="285" width="240" height="142" frameX="-13" frameY="-10" frameWidth="285" frameHeight="163"/>
+	<SubTexture name="sick" x="1" y="143" width="346" height="139" frameX="-11" frameY="-7" frameWidth="403" frameHeight="152"/>
+</TextureAtlas>

source/Init.hx

@@ -1,6 +1,6 @@
 package;
 
-import kec.backend.util.FilterUtils;
+import kec.util.FilterUtils;
 #if cpp
 import kec.backend.cpp.CPPInterface;
 #end
@@ -32,10 +32,10 @@ class Init extends MusicBeatState
 		FilterUtils.setColorBlindess(FlxG.save.data.colorblind);
 
 		// Gotta run this before any assets get loaded.
-		kec.backend.modding.ModCore.initialize();
+		kec.backend.ModCore.initialize();
 
-		kec.backend.util.NoteStyleHelper.updateNoteskins();
-		kec.backend.util.NoteStyleHelper.updateNotesplashes();
+		kec.util.NoteStyleHelper.updateNoteskins();
+		kec.util.NoteStyleHelper.updateNotesplashes();
 
 		if (FlxG.save.data.volDownBind == null)
 			FlxG.save.data.volDownBind = "MINUS";
@@ -50,7 +50,7 @@ class Init extends MusicBeatState
 
 		FlxG.mouse.load('assets/shared/images/curser.png');
 
-		kec.backend.util.Highscore.load();
+		kec.util.Highscore.load();
 
 		FlxG.autoPause = FlxG.save.data.autoPause;
 		FlxG.mouse.visible = true;

source/flixel/FlxCamera.hx

@@ -1281,8 +1281,8 @@ class FlxCamera extends FlxBasic
 		}
 		else
 		{
-			scroll.x += (_scrollTarget.x - scroll.x) * kec.backend.util.CoolUtil.camLerpShit(followLerp);
-			scroll.y += (_scrollTarget.y - scroll.y) * kec.backend.util.CoolUtil.camLerpShit(followLerp);
+			scroll.x += (_scrollTarget.x - scroll.x) * kec.util.CoolUtil.camLerpShit(followLerp);
+			scroll.y += (_scrollTarget.y - scroll.y) * kec.util.CoolUtil.camLerpShit(followLerp);
 		}
 	}
 

source/flixel/FunkinSoundTray.hx

@@ -76,8 +76,8 @@ class FunkinSoundTray extends FlxSoundTray
 
 	override public function update(MS:Float):Void
 	{
-		y = kec.backend.util.CoolUtil.coolLerp(y, lerpYPos, 0.1);
-		alpha = kec.backend.util.CoolUtil.coolLerp(alpha, alphaTarget, 0.25);
+		y = kec.util.CoolUtil.coolLerp(y, lerpYPos, 0.1);
+		alpha = kec.util.CoolUtil.coolLerp(alpha, alphaTarget, 0.25);
 
 		// Animate sound tray thing
 		if (_timer > 0)

source/haxe/ui/backend/TextInputImpl.hx

@@ -0,0 +1,13 @@
+package haxe.ui.backend;
+
+typedef TextInputEvent = {type:String, stageX:Float, stageY:Float};
+
+#if flixel_text_input
+
+typedef TextInputImpl = haxe.ui.backend.flixel.textinputs.FlxTextInput;
+
+#else
+
+typedef TextInputImpl = haxe.ui.backend.flixel.textinputs.OpenFLTextInput;
+
+#end