fix flixel 6 warnings (#374)

* fix flixel 6 warnings

* d'oh!

* add flash sounds fix CI warnings

Features/FlxCamera/source/input/PlayerControls.hx

@@ -105,10 +105,17 @@ abstract VirtualPad(FlxVirtualPad) from FlxVirtualPad to FlxVirtualPad
 	{
 		return switch(input)
 		{
+			#if (flixel >= version("6.0.0"))
+			case Input.LEFT : this.getButton(FlxVirtualInputID.LEFT).pressed;
+			case Input.RIGHT: this.getButton(FlxVirtualInputID.RIGHT).pressed;
+			case Input.UP   : this.getButton(FlxVirtualInputID.UP).pressed;
+			case Input.DOWN : this.getButton(FlxVirtualInputID.DOWN).pressed;
+			#else
 			case Input.LEFT : this.buttonLeft.pressed;
 			case Input.RIGHT: this.buttonRight.pressed;
 			case Input.UP   : this.buttonUp.pressed;
 			case Input.DOWN : this.buttonDown.pressed;
+			#end
 			default: false;
 		}
 	}

Features/FlxFSM/Project.xml

@@ -31,7 +31,8 @@
 
 	<set name="BUILD_DIR" value="export" />
 	<source path="source" />
-	<assets path="assets" />
+	<assets path="assets" exclude="*.mp3" unless="flash"/>
+	<assets path="assets" exclude="*.ogg" if="flash"/>
 
 	<!-- _______________________________ Libraries ______________________________ -->
 
@@ -65,6 +66,7 @@
 	<haxedef name="FLX_NO_KEYBOARD" if="mobile" />
 	<haxedef name="FLX_NO_TOUCH"  />
 	<haxedef name="FLX_NO_GAMEPAD" />
+	<haxedef name="FLX_DEFAULT_SOUND_EXT" />
 
 	<!--Disable the Flixel core sound tray-->
 	<!--<haxedef name="FLX_NO_SOUND_TRAY" />-->

Features/FlxFSM/source/PlayState.hx

@@ -33,7 +33,7 @@ class PlayState extends FlxState
 		// Music by 8-BITek
 		// Licensed under CC BY-NC-ND 3.0
 		// https://www.newgrounds.com/audio/listen/1341678
-		FlxG.sound.playMusic("assets/happynewyear.ogg", 0);
+		FlxG.sound.playMusic("assets/sounds/happynewyear", 0);
 		FlxG.sound.music.fadeIn(2, 0, 0.2);
 
 		final J = 99;
@@ -66,16 +66,16 @@ class PlayState extends FlxState
 
 		final tileSize = 16;
 		_map = new FlxTilemap();
-		_map.loadMapFromArray(data, 20, 15, "assets/tiles.png", tileSize, tileSize);
+		_map.loadMapFromArray(data, 20, 15, "assets/images/tiles.png", tileSize, tileSize);
 		add(_map);
 
 		_slime = new Slime(192, 128);
 		add(_slime);
 
-		_superJump = new FlxSprite((superJumpIndex % columns) * tileSize, Std.int(superJumpIndex / columns) * tileSize, "assets/powerup.png");
+		_superJump = new FlxSprite((superJumpIndex % columns) * tileSize, Std.int(superJumpIndex / columns) * tileSize, "assets/images/powerup.png");
 		add(_superJump);
 
-		_groundPound = new FlxSprite((groundPoundIndex % columns) * tileSize, Std.int(groundPoundIndex / columns) * tileSize, "assets/powerup.png");
+		_groundPound = new FlxSprite((groundPoundIndex % columns) * tileSize, Std.int(groundPoundIndex / columns) * tileSize, "assets/images/powerup.png");
 		_groundPound.flipY = true;
 		_groundPound.y += 4;
 		add(_groundPound);
@@ -92,14 +92,14 @@ class PlayState extends FlxState
 
 		FlxG.overlap(_slime, _superJump, function (_, _)
 		{
-			FlxG.sound.play("assets/powerup.ogg");
+			FlxG.sound.play("assets/sounds/powerup");
 			_slime.addSuperJump();
 			_superJump.kill();
 		});
 
 		FlxG.overlap(_slime, _groundPound, function (_, _)
 		{
-			FlxG.sound.play("assets/powerup.ogg");
+			FlxG.sound.play("assets/sounds/powerup");
 			_slime.addGroundPound();
 			_groundPound.kill();
 			startGroundPoundInfoTween();

Features/FlxFSM/source/Slime.hx

@@ -15,7 +15,7 @@ class Slime extends FlxSprite
 	{
 		super(X, Y);
 
-		loadGraphic("assets/slime.png", true, 16, 16);
+		loadGraphic("assets/images/slime.png", true, 16, 16);
 		setFacingFlip(LEFT, true, false);
 		setFacingFlip(RIGHT, false, false);
 		facing = RIGHT;
@@ -100,7 +100,7 @@ class Idle extends FlxFSMState<Slime>
 
 	override function enter(owner:Slime, fsm:FlxFSM<Slime>):Void
 	{
-		walkSnd = FlxG.sound.load("assets/walk.ogg", 0.4);
+		walkSnd = FlxG.sound.load("assets/sounds/walk", 0.4);
 		owner.animation.play("standing");
 	}
 
@@ -131,7 +131,7 @@ class Jump extends FlxFSMState<Slime>
 {
 	override function enter(owner:Slime, fsm:FlxFSM<Slime>):Void
 	{
-		FlxG.sound.play("assets/jump.ogg", FlxG.random.float(0.9, 1.0));
+		FlxG.sound.play("assets/sounds/jump", FlxG.random.float(0.9, 1.0));
 		owner.animation.play("jumping");
 		owner.velocity.y = -200;
 	}
@@ -150,7 +150,7 @@ class SuperJump extends Jump
 {
 	override function enter(owner:Slime, fsm:FlxFSM<Slime>):Void
 	{
-		FlxG.sound.play("assets/superjump.ogg", FlxG.random.float(0.9, 1.0));
+		FlxG.sound.play("assets/sounds/superjump", FlxG.random.float(0.9, 1.0));
 		owner.animation.play("jumping");
 		owner.velocity.y = -300;
 	}
@@ -162,7 +162,7 @@ class GroundPound extends FlxFSMState<Slime>
 
 	override function enter(owner:Slime, fsm:FlxFSM<Slime>):Void
 	{
-		FlxG.sound.play("assets/groundpound.ogg");
+		FlxG.sound.play("assets/sounds/groundpound");
 		owner.animation.play("pound");
 		owner.velocity.x = 0;
 		owner.acceleration.x = 0;
@@ -187,7 +187,7 @@ class GroundPoundFinish extends FlxFSMState<Slime>
 {
 	override function enter(owner:Slime, fsm:FlxFSM<Slime>):Void
 	{
-		FlxG.sound.play("assets/groundpoundfinish.ogg");
+		FlxG.sound.play("assets/sounds/groundpoundfinish");
 		owner.animation.play("landing");
 		FlxG.camera.shake(0.025, 0.25);
 		owner.velocity.x = 0;

Input/FlxAction/source/Player.hx

@@ -144,10 +144,17 @@ class Player extends FlxSprite
 
 	function updateDigital():Void
 	{
+		#if (flixel >= version("6.0.0"))
+		_virtualPad.getButton(UP).color = FlxColor.WHITE;
+		_virtualPad.getButton(DOWN).color = FlxColor.WHITE;
+		_virtualPad.getButton(LEFT).color = FlxColor.WHITE;
+		_virtualPad.getButton(RIGHT).color = FlxColor.WHITE;
+		#else
 		_virtualPad.buttonUp.color = FlxColor.WHITE;
 		_virtualPad.buttonDown.color = FlxColor.WHITE;
 		_virtualPad.buttonLeft.color = FlxColor.WHITE;
 		_virtualPad.buttonRight.color = FlxColor.WHITE;
+		#end
 
 		if (down.triggered)
 		{