From aef3af50c2675f75a93a4b9ba2dbc4e6d7ed349c Mon Sep 17 00:00:00 2001 From: Leijurv Date: Tue, 14 Aug 2018 17:37:19 -0700 Subject: [PATCH] unused cases --- .../bot/pathing/movement/movements/MovementAscend.java | 6 +----- .../bot/pathing/movement/movements/MovementDescend.java | 6 +----- .../bot/pathing/movement/movements/MovementDiagonal.java | 4 ---- .../bot/pathing/movement/movements/MovementDownward.java | 4 ---- .../bot/pathing/movement/movements/MovementFall.java | 6 +----- .../bot/pathing/movement/movements/MovementPillar.java | 6 +----- .../bot/pathing/movement/movements/MovementTraverse.java | 6 +----- 7 files changed, 5 insertions(+), 33 deletions(-) diff --git a/src/main/java/baritone/bot/pathing/movement/movements/MovementAscend.java b/src/main/java/baritone/bot/pathing/movement/movements/MovementAscend.java index 7d68608c..7a8d5176 100644 --- a/src/main/java/baritone/bot/pathing/movement/movements/MovementAscend.java +++ b/src/main/java/baritone/bot/pathing/movement/movements/MovementAscend.java @@ -17,7 +17,6 @@ package baritone.bot.pathing.movement.movements; -import baritone.bot.utils.InputOverrideHandler; import baritone.bot.behavior.impl.LookBehaviorUtils; import baritone.bot.pathing.movement.CalculationContext; import baritone.bot.pathing.movement.Movement; @@ -25,6 +24,7 @@ import baritone.bot.pathing.movement.MovementHelper; import baritone.bot.pathing.movement.MovementState; import baritone.bot.pathing.movement.MovementState.MovementStatus; import baritone.bot.utils.BlockStateInterface; +import baritone.bot.utils.InputOverrideHandler; import baritone.bot.utils.Utils; import net.minecraft.block.BlockFalling; import net.minecraft.block.state.IBlockState; @@ -98,10 +98,6 @@ public class MovementAscend extends Movement { // 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()) { - case PREPPING: - case UNREACHABLE: - case FAILED: - return state; case WAITING: case RUNNING: break; diff --git a/src/main/java/baritone/bot/pathing/movement/movements/MovementDescend.java b/src/main/java/baritone/bot/pathing/movement/movements/MovementDescend.java index fa2381e2..7be59858 100644 --- a/src/main/java/baritone/bot/pathing/movement/movements/MovementDescend.java +++ b/src/main/java/baritone/bot/pathing/movement/movements/MovementDescend.java @@ -17,13 +17,13 @@ package baritone.bot.pathing.movement.movements; -import baritone.bot.utils.InputOverrideHandler; import baritone.bot.pathing.movement.CalculationContext; import baritone.bot.pathing.movement.Movement; import baritone.bot.pathing.movement.MovementHelper; import baritone.bot.pathing.movement.MovementState; import baritone.bot.pathing.movement.MovementState.MovementStatus; import baritone.bot.utils.BlockStateInterface; +import baritone.bot.utils.InputOverrideHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockLadder; import net.minecraft.block.BlockVine; @@ -59,10 +59,6 @@ public class MovementDescend extends Movement { public MovementState updateState(MovementState state) { super.updateState(state); switch (state.getStatus()) { - case PREPPING: - case UNREACHABLE: - case FAILED: - return state; case WAITING: state.setStatus(MovementStatus.RUNNING); case RUNNING: diff --git a/src/main/java/baritone/bot/pathing/movement/movements/MovementDiagonal.java b/src/main/java/baritone/bot/pathing/movement/movements/MovementDiagonal.java index 5254d415..776f2037 100644 --- a/src/main/java/baritone/bot/pathing/movement/movements/MovementDiagonal.java +++ b/src/main/java/baritone/bot/pathing/movement/movements/MovementDiagonal.java @@ -51,10 +51,6 @@ public class MovementDiagonal extends Movement { public MovementState updateState(MovementState state) { super.updateState(state); switch (state.getStatus()) { - case PREPPING: - case UNREACHABLE: - case FAILED: - return state; case WAITING: case RUNNING: break; diff --git a/src/main/java/baritone/bot/pathing/movement/movements/MovementDownward.java b/src/main/java/baritone/bot/pathing/movement/movements/MovementDownward.java index 10c84c5e..20aad6df 100644 --- a/src/main/java/baritone/bot/pathing/movement/movements/MovementDownward.java +++ b/src/main/java/baritone/bot/pathing/movement/movements/MovementDownward.java @@ -53,10 +53,6 @@ public class MovementDownward extends Movement { public MovementState updateState(MovementState state) { super.updateState(state); switch (state.getStatus()) { - case PREPPING: - case UNREACHABLE: - case FAILED: - return state; case WAITING: case RUNNING: break; diff --git a/src/main/java/baritone/bot/pathing/movement/movements/MovementFall.java b/src/main/java/baritone/bot/pathing/movement/movements/MovementFall.java index d1312a39..dec79f4b 100644 --- a/src/main/java/baritone/bot/pathing/movement/movements/MovementFall.java +++ b/src/main/java/baritone/bot/pathing/movement/movements/MovementFall.java @@ -17,12 +17,12 @@ package baritone.bot.pathing.movement.movements; -import baritone.bot.utils.InputOverrideHandler; import baritone.bot.behavior.impl.LookBehaviorUtils; import baritone.bot.pathing.movement.*; import baritone.bot.pathing.movement.MovementState.MovementStatus; import baritone.bot.pathing.movement.MovementState.MovementTarget; import baritone.bot.utils.BlockStateInterface; +import baritone.bot.utils.InputOverrideHandler; import baritone.bot.utils.Rotation; import baritone.bot.utils.Utils; import net.minecraft.init.Items; @@ -67,10 +67,6 @@ public class MovementFall extends Movement { public MovementState updateState(MovementState state) { super.updateState(state); switch (state.getStatus()) { - case PREPPING: - case UNREACHABLE: - case FAILED: - return state; case WAITING: state.setStatus(MovementStatus.RUNNING); case RUNNING: diff --git a/src/main/java/baritone/bot/pathing/movement/movements/MovementPillar.java b/src/main/java/baritone/bot/pathing/movement/movements/MovementPillar.java index d8d68c87..db858b25 100644 --- a/src/main/java/baritone/bot/pathing/movement/movements/MovementPillar.java +++ b/src/main/java/baritone/bot/pathing/movement/movements/MovementPillar.java @@ -17,12 +17,12 @@ package baritone.bot.pathing.movement.movements; -import baritone.bot.utils.InputOverrideHandler; import baritone.bot.pathing.movement.CalculationContext; import baritone.bot.pathing.movement.Movement; import baritone.bot.pathing.movement.MovementHelper; import baritone.bot.pathing.movement.MovementState; import baritone.bot.utils.BlockStateInterface; +import baritone.bot.utils.InputOverrideHandler; import baritone.bot.utils.Rotation; import baritone.bot.utils.Utils; import net.minecraft.block.*; @@ -99,10 +99,6 @@ public class MovementPillar extends Movement { public MovementState updateState(MovementState state) { super.updateState(state); switch (state.getStatus()) { - case PREPPING: - case UNREACHABLE: - case FAILED: - return state; case WAITING: case RUNNING: break; diff --git a/src/main/java/baritone/bot/pathing/movement/movements/MovementTraverse.java b/src/main/java/baritone/bot/pathing/movement/movements/MovementTraverse.java index 92d147e2..fecbeae3 100644 --- a/src/main/java/baritone/bot/pathing/movement/movements/MovementTraverse.java +++ b/src/main/java/baritone/bot/pathing/movement/movements/MovementTraverse.java @@ -17,13 +17,13 @@ package baritone.bot.pathing.movement.movements; -import baritone.bot.utils.InputOverrideHandler; import baritone.bot.behavior.impl.LookBehaviorUtils; import baritone.bot.pathing.movement.CalculationContext; import baritone.bot.pathing.movement.Movement; import baritone.bot.pathing.movement.MovementHelper; import baritone.bot.pathing.movement.MovementState; import baritone.bot.utils.BlockStateInterface; +import baritone.bot.utils.InputOverrideHandler; import baritone.bot.utils.Utils; import net.minecraft.block.Block; import net.minecraft.block.BlockLadder; @@ -118,10 +118,6 @@ public class MovementTraverse extends Movement { public MovementState updateState(MovementState state) { super.updateState(state); switch (state.getStatus()) { - case PREPPING: - case UNREACHABLE: - case FAILED: - return state; case WAITING: case RUNNING: break;