From 3f2d1b4c1b188bba6fbe5ad0413abebf43db3bfa Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Thu, 14 Dec 2023 17:34:02 -0500
Subject: [PATCH] Update haxelibs, add flixel-text-input to fix overlapping
 text

---
 .vscode/settings.json                               |  3 +--
 Project.xml                                         | 10 ++++++----
 hmm.json                                            | 13 +++++++++----
 .../funkin/play/character/MultiSparrowCharacter.hx  |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 92d49c3d4..cefbadcf6 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,8 +4,7 @@
     "editor.formatOnSave": true,
     "editor.formatOnPaste": true,
     "editor.codeActionsOnSave": {
-      // Compilation server issues can cause auto-cleanup to remove valid imports.
-      "source.organizeImports": false
+      "source.organizeImports": "never"
     },
     "editor.defaultFormatter": "nadako.vshaxe",
     "editor.tabSize": 2
diff --git a/Project.xml b/Project.xml
index 4c0ffdce7..e0677b026 100644
--- a/Project.xml
+++ b/Project.xml
@@ -99,18 +99,20 @@
 
 	<haxelib name="flixel-addons" /> <!-- Additional utilities for Flixel -->
 	<haxelib name="hscript" /> <!-- Scripting -->
-	<haxelib name="flixel-ui" /> <!-- UI framework (deprecate this? -->
+	<haxelib name="flixel-ui" /> <!-- UI framework (DEPRECATED) -->
 	<haxelib name="haxeui-core" /> <!-- UI framework -->
 	<haxelib name="haxeui-flixel" /> <!-- Integrate HaxeUI with Flixel -->
+	<haxelib name="flixel-text-input" /> <!-- Improved text field rendering for HaxeUI -->
 	<haxelib name="polymod" /> <!-- Modding framework -->
 	<haxelib name="flxanimate" /> <!-- Texture atlas rendering -->
 	<haxelib name="hxCodec" /> <!-- Video playback -->
 
 	<haxelib name="json2object" /> <!-- JSON parsing -->
-	<haxelib name="tink_json" /> <!-- JSON parsing -->
+	<haxelib name="tink_json" /> <!-- JSON parsing (DEPRECATED) -->
+	<haxelib name="thx.semver" /> <!-- Version string handling -->
+
+	<haxelib name="hxcpp-debug-server" if="desktop debug" /> <!-- VSCode debug support -->
 
-	<haxelib name="thx.semver" />
-	<haxelib name="hxcpp-debug-server" if="desktop debug" />
 	<!--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!-->
diff --git a/hmm.json b/hmm.json
index a10eed1a6..b85413bae 100644
--- a/hmm.json
+++ b/hmm.json
@@ -11,7 +11,7 @@
       "name": "flixel",
       "type": "git",
       "dir": null,
-      "ref": "da04cbda49a4c5eebe93fb61296dbaf4f0f1b556",
+      "ref": "9bdea914f3d0485b9b3ec158f28875b5ac95d476",
       "url": "https://github.com/EliteMasterEric/flixel"
     },
     {
@@ -21,6 +21,11 @@
       "ref": "c8c41e26d463aaf2edc0582fb23b6e228235bd16",
       "url": "https://github.com/EliteMasterEric/flixel-addons"
     },
+    {
+      "name": "flixel-text-input",
+      "type": "haxelib",
+      "version": "1.1.0"
+    },
     {
       "name": "flixel-ui",
       "type": "git",
@@ -32,8 +37,8 @@
       "name": "flxanimate",
       "type": "git",
       "dir": null,
-      "ref": "dd2903f7dc7024335b981edf2a770760cec912e1",
-      "url": "https://github.com/ninjamuffin99/flxanimate"
+      "ref": "d7c5621be742e2c98d523dfe5af7528835eaff1e",
+      "url": "https://github.com/EliteMasterEric/flxanimate"
     },
     {
       "name": "format",
@@ -158,4 +163,4 @@
       "version": "0.11.0"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/source/funkin/play/character/MultiSparrowCharacter.hx b/source/funkin/play/character/MultiSparrowCharacter.hx
index 968f613ff..0fc07399c 100644
--- a/source/funkin/play/character/MultiSparrowCharacter.hx
+++ b/source/funkin/play/character/MultiSparrowCharacter.hx
@@ -205,7 +205,7 @@ class MultiSparrowCharacter extends BaseCharacter
       graphic = value.parent;
       this.frames = value;
       this.frame = value.getByIndex(0);
-      this.numFrames = value.numFrames;
+      // this.numFrames = value.numFrames;
       resetHelpers();
       this.bakedRotationAngle = 0;
       this.animation.frameIndex = 0;