Merge pull request #96 from cabaletta/movement-duplicate-switch

Cleaned up 7 duplicate switch statements

src/main/java/baritone/pathing/movement/Movement.java

@@ -270,6 +270,11 @@ public abstract class Movement implements Helper, MovementHelper {
         } else if (state.getStatus() == MovementStatus.PREPPING) {
             state.setStatus(MovementStatus.WAITING);
         }
+
+        if (state.getStatus() == MovementStatus.WAITING) {
+            state.setStatus(MovementStatus.RUNNING);
+        }
+
         return state;
     }
 

src/main/java/baritone/pathing/movement/movements/MovementAscend.java

@@ -123,14 +123,8 @@ public class MovementAscend extends Movement {
         super.updateState(state);
         // TODO incorporate some behavior from ActionClimb (specifically how it waited until it was at most 1.2 blocks away before starting to jump
         // for efficiency in ascending minimal height staircases, which is just repeated MovementAscend, so that it doesn't bonk its head on the ceiling repeatedly)
-        switch (state.getStatus()) {
+        if (state.getStatus() != MovementStatus.RUNNING)
-            case WAITING:
-                state.setStatus(MovementStatus.RUNNING);
-            case RUNNING:
-                break;
-            default:
             return state;
-        }
 
         if (playerFeet().equals(dest)) {
             return state.setStatus(MovementStatus.SUCCESS);

src/main/java/baritone/pathing/movement/movements/MovementDescend.java

@@ -67,14 +67,8 @@ public class MovementDescend extends Movement {
     @Override
     public MovementState updateState(MovementState state) {
         super.updateState(state);
-        switch (state.getStatus()) {
+        if (state.getStatus() != MovementStatus.RUNNING)
-            case WAITING:
-                state.setStatus(MovementStatus.RUNNING);
-            case RUNNING:
-                break;
-            default:
             return state;
-        }
 
         BlockPos playerFeet = playerFeet();
         if (playerFeet.equals(dest)) {

src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java

@@ -119,14 +119,8 @@ public class MovementDiagonal extends Movement {
     @Override
     public MovementState updateState(MovementState state) {
         super.updateState(state);
-        switch (state.getStatus()) {
+        if (state.getStatus() != MovementState.MovementStatus.RUNNING)
-            case WAITING:
-                state.setStatus(MovementState.MovementStatus.RUNNING);
-            case RUNNING:
-                break;
-            default:
             return state;
-        }
 
         if (playerFeet().equals(dest)) {
             state.setStatus(MovementState.MovementStatus.SUCCESS);

src/main/java/baritone/pathing/movement/movements/MovementDownward.java

@@ -60,14 +60,8 @@ public class MovementDownward extends Movement {
     @Override
     public MovementState updateState(MovementState state) {
         super.updateState(state);
-        switch (state.getStatus()) {
+        if (state.getStatus() != MovementState.MovementStatus.RUNNING)
-            case WAITING:
-                state.setStatus(MovementState.MovementStatus.RUNNING);
-            case RUNNING:
-                break;
-            default:
             return state;
-        }
 
         if (playerFeet().equals(dest)) {
             state.setStatus(MovementState.MovementStatus.SUCCESS);

src/main/java/baritone/pathing/movement/movements/MovementFall.java

@@ -96,14 +96,8 @@ public class MovementFall extends Movement {
     @Override
     public MovementState updateState(MovementState state) {
         super.updateState(state);
-        switch (state.getStatus()) {
+        if (state.getStatus() != MovementStatus.RUNNING)
-            case WAITING:
-                state.setStatus(MovementStatus.RUNNING);
-            case RUNNING:
-                break;
-            default:
             return state;
-        }
 
         BlockPos playerFeet = playerFeet();
         Rotation targetRotation = null;

src/main/java/baritone/pathing/movement/movements/MovementPillar.java

@@ -121,14 +121,8 @@ public class MovementPillar extends Movement {
     @Override
     public MovementState updateState(MovementState state) {
         super.updateState(state);
-        switch (state.getStatus()) {
+        if (state.getStatus() != MovementState.MovementStatus.RUNNING)
-            case WAITING:
-                state.setStatus(MovementState.MovementStatus.RUNNING);
-            case RUNNING:
-                break;
-            default:
             return state;
-        }
 
         IBlockState fromDown = BlockStateInterface.get(src);
         boolean ladder = fromDown.getBlock() instanceof BlockLadder || fromDown.getBlock() instanceof BlockVine;

src/main/java/baritone/pathing/movement/movements/MovementTraverse.java

@@ -125,14 +125,8 @@ public class MovementTraverse extends Movement {
     @Override
     public MovementState updateState(MovementState state) {
         super.updateState(state);
-        switch (state.getStatus()) {
+        if (state.getStatus() != MovementState.MovementStatus.RUNNING)
-            case WAITING:
-                state.setStatus(MovementState.MovementStatus.RUNNING);
-            case RUNNING:
-                break;
-            default:
             return state;
-        }
 
         state.setInput(InputOverrideHandler.Input.SNEAK, false);