fix ui textboxes, divorce macos

.github/workflows/build.yml

@@ -81,29 +81,3 @@ jobs:
         with:
           name: windows32Build
           path: export/32bit/windows/bin
-  buildMac:
-    runs-on: macos-latest
-
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      - uses: krdlab/setup-haxe@master
-        with:
-          haxe-version: 4.3.4
-      # Runs a set of commands using the runners shell
-      - name: Install Haxelib
-        run: |
-          haxelib setup ~/haxelib
-          haxelib --global install hmm
-          haxelib --global run hmm install
-          haxelib list
-      - name: Create Version Tag
-        run: echo "${{github.run_id}}" > VERSION
-      - name: Compile
-        run: haxelib run lime build mac --app-version="2.0.0-${{ github.run_id}}"
-      - name: Publish Artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: macBuild
-          path: export/macos/bin

Project.xml

@@ -53,6 +53,8 @@
 	<haxelib name="thx.core"/>
 	<haxelib name="thx.semver"/>
 
+	<haxelib name="flixel-text-input"/>
+
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
 	<!--Enable the Flixel core recording system-->
@@ -71,7 +73,7 @@
 	<!--<haxedef name="FLX_NO_GAMEPAD" />-->
 
 	<!--Disable the Flixel core sound tray-->
-	<!--<haxedef name="FLX_NO_SOUND_TRAY" />-->
+	<haxedef name="FLX_NO_SOUND_TRAY" />
 
 	<!--Disable the Flixel sound management code-->
 	<!--<haxedef name="FLX_NO_SOUND_SYSTEM" />-->

hmm.json

@@ -10,6 +10,11 @@
       "type": "haxelib",
       "version": "3.2.1"
     },
+    {
+      "name": "flixel-text-input",
+      "type": "haxelib",
+      "version": null
+    },
     {
       "name": "flixel-ui",
       "type": "haxelib",

source/Note.hx

@@ -89,8 +89,6 @@ class Note extends FlxSprite
 		animation.add('mineNote', [21]);
 		animation.add('nukeNote', [22]);
 
-		setGraphicSize(Std.int(40));
-		// updateHitbox();
 		antialiasing = false;
 
 	}

source/PlayState.hx

@@ -120,6 +120,11 @@ class PlayState extends UIState{
 	function get_haxeUIDialogOpen(): Bool {
 		return FocusManager.instance.focus != null;
 	}
+
+	var currentGamemode(get, never): Null<Gamemode>;
+	function get_currentGamemode(): Null<Gamemode> {
+		return Gamemode.gamemodes[selectedChart.gamemode];
+	}
 	var chart:FlxSpriteGroup;
 	//var staffLines:FlxSprite;
 	var staffLineGroup:FlxTypedSpriteGroup<Line>;
@@ -522,7 +527,9 @@ class PlayState extends UIState{
 			FlxG.keys.justPressed.FIVE,
 			FlxG.keys.justPressed.SIX,
 			FlxG.keys.justPressed.SEVEN,
-			FlxG.keys.justPressed.EIGHT
+			FlxG.keys.justPressed.EIGHT,
+			FlxG.keys.justPressed.NINE,
+			FlxG.keys.justPressed.ZERO,
 		];
 		noteRelease = [
 			FlxG.keys.justReleased.ONE,
@@ -532,7 +539,9 @@ class PlayState extends UIState{
 			FlxG.keys.justReleased.FIVE,
 			FlxG.keys.justReleased.SIX,
 			FlxG.keys.justReleased.SEVEN,
-			FlxG.keys.justReleased.EIGHT
+			FlxG.keys.justReleased.EIGHT,
+			FlxG.keys.justReleased.NINE,
+			FlxG.keys.justReleased.ZERO,
 		];
 		noteHold = [
 			FlxG.keys.pressed.ONE,
@@ -542,7 +551,9 @@ class PlayState extends UIState{
 			FlxG.keys.pressed.FIVE,
 			FlxG.keys.pressed.SIX,
 			FlxG.keys.pressed.SEVEN,
-			FlxG.keys.pressed.EIGHT
+			FlxG.keys.pressed.EIGHT,
+			FlxG.keys.pressed.NINE,
+			FlxG.keys.pressed.ZERO,
 		];
 		if (FocusManager.instance.focus == null)
 		{
@@ -673,7 +684,8 @@ class PlayState extends UIState{
 
 		for (i in 0...noteControls.length)
 		{
-			if (!noteControls[i] || FocusManager.instance.focus != null)
+
+			if (!noteControls[i] || FocusManager.instance.focus != null || currentGamemode.noteCount <= i)
 				continue;
 			if (FlxG.keys.pressed.CONTROL)
 			{
@@ -692,7 +704,7 @@ class PlayState extends UIState{
 		}
 		for (i in 0...noteRelease.length)
 		{
-			if (!noteRelease[i])
+			if (!noteRelease[i] || currentGamemode.noteCount <= i)
 				continue;
 			if (curHoldSelect != null && curHoldSelect.data == i)
 			{
@@ -971,7 +983,7 @@ class PlayState extends UIState{
 		chartDirty = false;
 
 		if (currentSongChart != null) {
-			strumLine.setup(Gamemode.gamemodes[currentSongChart.chartKey.gamemode]);
+			strumLine.setup(currentGamemode);
 			strumLine.screenCenter(X);
 		}