From 8c4d114dad878cbc168ade64e5941a6d6653a03b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?= Date: Wed, 31 Aug 2022 13:57:29 +0200 Subject: [PATCH] Simplify input handler --- .../demo/map/BaseMapHandler.java | 23 ++----------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/bartlomiejpluta/demo/map/BaseMapHandler.java b/src/main/java/com/bartlomiejpluta/demo/map/BaseMapHandler.java index 0a18137..067e46e 100644 --- a/src/main/java/com/bartlomiejpluta/demo/map/BaseMapHandler.java +++ b/src/main/java/com/bartlomiejpluta/demo/map/BaseMapHandler.java @@ -14,6 +14,7 @@ import com.bartlomiejpluta.base.api.move.Direction; import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.lib.camera.CameraController; import com.bartlomiejpluta.base.lib.camera.FollowingCameraController; +import com.bartlomiejpluta.base.util.input.InputUtil; import com.bartlomiejpluta.base.util.world.CharacterSpawner; import com.bartlomiejpluta.base.util.world.Warp; import com.bartlomiejpluta.demo.entity.Chest; @@ -70,27 +71,7 @@ public abstract class BaseMapHandler implements MapHandler { player.interact(); } - if (input.isKeyPressed(Key.KEY_LEFT_CONTROL)) { - if (input.isKeyPressed(Key.KEY_DOWN)) { - player.setFaceDirection(Direction.DOWN); - } else if (input.isKeyPressed(Key.KEY_UP)) { - player.setFaceDirection(Direction.UP); - } else if (input.isKeyPressed(Key.KEY_LEFT)) { - player.setFaceDirection(Direction.LEFT); - } else if (input.isKeyPressed(Key.KEY_RIGHT)) { - player.setFaceDirection(Direction.RIGHT); - } - } else { - if (input.isKeyPressed(Key.KEY_DOWN)) { - player.getLayer().pushMovement(player.prepareMovement(Direction.DOWN)); - } else if (input.isKeyPressed(Key.KEY_UP)) { - player.getLayer().pushMovement(player.prepareMovement(Direction.UP)); - } else if (input.isKeyPressed(Key.KEY_LEFT)) { - player.getLayer().pushMovement(player.prepareMovement(Direction.LEFT)); - } else if (input.isKeyPressed(Key.KEY_RIGHT)) { - player.getLayer().pushMovement(player.prepareMovement(Direction.RIGHT)); - } - } + InputUtil.handleBasicControl(player, input); } @Override