Upkeep 6 (#53)

* flixel 6.0.0 upkeep

* formatting

Author: Geokureli

.vscode/settings.json

@@ -3,7 +3,7 @@
 		"editor.formatOnSave": true,
 		"editor.formatOnPaste": true,
 		"editor.codeActionsOnSave": {
-			"source.sortImports": true
+			"source.sortImports": "explicit"
 		}
 	}
 }

demos/collision/moving-platforms/source/PlayState.hx

@@ -54,8 +54,8 @@ class PlayState extends FlxState
 		if (sprite.y >= FlxG.height - (16 * 3))
 			resetSprite();
 
-		var left:Bool = pad.buttonLeft.pressed || FlxG.keys.anyPressed([A, LEFT]);
-		var right:Bool = pad.buttonRight.pressed || FlxG.keys.anyPressed([D, RIGHT]);
+		var left:Bool = pad.getButton(LEFT).pressed || FlxG.keys.anyPressed([A, LEFT]);
+		var right:Bool = pad.getButton(RIGHT).pressed || FlxG.keys.anyPressed([D, RIGHT]);
 
 		if (left && right)
 			left = right = false;

demos/input/basics/source/PlayState.hx

@@ -30,31 +30,31 @@ class PlayState extends FlxState
 	{
 		super.update(elapsed);
 
-		if (pad.buttonA.justPressed || FlxG.keys.justPressed.X)
+		if (pad.getButton(A).justPressed || FlxG.keys.justPressed.X)
 		{
 			if (lastInput != 0)
 			{
 				status.text += "\nJust Pressed";
 				lastInput = 0;
 			}
 		}
-		else if (pad.buttonA.pressed || FlxG.keys.pressed.X)
+		else if (pad.getButton(A).pressed || FlxG.keys.pressed.X)
 		{
 			if (lastInput != 1)
 			{
 				status.text += "\nPressed";
 				lastInput = 1;
 			}
 		}
-		else if (pad.buttonA.justReleased || FlxG.keys.justReleased.X)
+		else if (pad.getButton(A).justReleased || FlxG.keys.justReleased.X)
 		{
 			if (lastInput != 2)
 			{
 				status.text += "\nJust Released";
 				lastInput = 2;
 			}
 		}
-		else if (pad.buttonA.released || !FlxG.keys.pressed.X)
+		else if (pad.getButton(A).released || !FlxG.keys.pressed.X)
 		{
 			if (lastInput != -1)
 			{

demos/input/keyboard/source/PlayState.hx

@@ -26,10 +26,10 @@ class PlayState extends FlxState
 	{
 		super.update(elapsed);
 
-		var up:Bool = pad.buttonUp.pressed || FlxG.keys.anyPressed([UP, W]);
-		var down:Bool = pad.buttonDown.pressed || FlxG.keys.anyPressed([DOWN, S]);
-		var left:Bool = pad.buttonLeft.pressed || FlxG.keys.anyPressed([LEFT, A]);
-		var right:Bool = pad.buttonRight.pressed || FlxG.keys.anyPressed([RIGHT, D]);
+		var up:Bool = pad.getButton(UP).pressed || FlxG.keys.anyPressed([UP, W]);
+		var down:Bool = pad.getButton(DOWN).pressed || FlxG.keys.anyPressed([DOWN, S]);
+		var left:Bool = pad.getButton(LEFT).pressed || FlxG.keys.anyPressed([LEFT, A]);
+		var right:Bool = pad.getButton(RIGHT).pressed || FlxG.keys.anyPressed([RIGHT, D]);
 
 		if (up && down)
 			up = down = false;

demos/movement/jumping/source/PlayState.hx

@@ -40,7 +40,7 @@ class PlayState extends FlxState
 		FlxG.collide(box, sprite);
 
 		// jump if touching the box, and jump is pressed
-		if (sprite.isTouching(DOWN) && pad.buttonA.justPressed)
+		if (sprite.isTouching(DOWN) && pad.getButton(A).justPressed)
 		{
 			sprite.velocity.y = -300;
 		}

demos/movement/variable-jumping/source/PlayState.hx

@@ -45,7 +45,7 @@ class PlayState extends FlxState
 		FlxG.collide(box, sprite);
 
 		// Reset jumpTimer when touching the floor and jump is pressed
-		if (sprite.isTouching(DOWN) && pad.buttonA.justPressed)
+		if (sprite.isTouching(DOWN) && pad.getButton(A).justPressed)
 		{
 			jumpTimer = 0;
 		}

demos/states/flxstate/source/PlayState.hx

@@ -29,7 +29,7 @@ class PlayState extends FlxState
 
 	private function switchState():Void
 	{
-		FlxG.switchState(new OtherState());
+		FlxG.switchState(OtherState.new);
 	}
 }
 
@@ -55,6 +55,6 @@ class OtherState extends FlxState
 
 	private function switchState():Void
 	{
-		FlxG.switchState(new PlayState());
+		FlxG.switchState(PlayState.new);
 	}
 }