From da3f5251b57c09e3f6bea9f40803c1407c7f1d40 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Mon, 24 Sep 2018 15:36:59 -0700 Subject: [PATCH] refactor --- src/main/java/baritone/pathing/calc/AStarPathFinder.java | 2 +- src/main/java/baritone/pathing/movement/Moves.java | 2 +- .../baritone/pathing/movement/movements/MovementDescend.java | 4 ++-- .../baritone/pathing/movement/movements/MovementFall.java | 2 +- .../baritone/pathing/movement/movements/MovementParkour.java | 4 ++-- .../movements/result => utils/pathing}/MoveResult.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename src/main/java/baritone/{pathing/movement/movements/result => utils/pathing}/MoveResult.java (96%) diff --git a/src/main/java/baritone/pathing/calc/AStarPathFinder.java b/src/main/java/baritone/pathing/calc/AStarPathFinder.java index ddee9582..b1f83bde 100644 --- a/src/main/java/baritone/pathing/calc/AStarPathFinder.java +++ b/src/main/java/baritone/pathing/calc/AStarPathFinder.java @@ -23,7 +23,7 @@ import baritone.api.pathing.goals.Goal; import baritone.pathing.movement.ActionCosts; import baritone.pathing.movement.CalculationContext; import baritone.pathing.movement.Moves; -import baritone.pathing.movement.movements.result.MoveResult; +import baritone.utils.pathing.MoveResult; import baritone.pathing.path.IPath; import baritone.utils.BlockStateInterface; import baritone.utils.Helper; diff --git a/src/main/java/baritone/pathing/movement/Moves.java b/src/main/java/baritone/pathing/movement/Moves.java index e81aaf3e..bf4ce890 100644 --- a/src/main/java/baritone/pathing/movement/Moves.java +++ b/src/main/java/baritone/pathing/movement/Moves.java @@ -18,7 +18,7 @@ package baritone.pathing.movement; import baritone.pathing.movement.movements.*; -import baritone.pathing.movement.movements.result.MoveResult; +import baritone.utils.pathing.MoveResult; import baritone.utils.pathing.BetterBlockPos; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/baritone/pathing/movement/movements/MovementDescend.java b/src/main/java/baritone/pathing/movement/movements/MovementDescend.java index 2a90f31a..4966b41e 100644 --- a/src/main/java/baritone/pathing/movement/movements/MovementDescend.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementDescend.java @@ -23,7 +23,7 @@ import baritone.pathing.movement.Movement; import baritone.pathing.movement.MovementHelper; import baritone.pathing.movement.MovementState; import baritone.pathing.movement.MovementState.MovementStatus; -import baritone.pathing.movement.movements.result.MoveResult; +import baritone.utils.pathing.MoveResult; import baritone.utils.BlockStateInterface; import baritone.utils.InputOverrideHandler; import baritone.utils.pathing.BetterBlockPos; @@ -33,7 +33,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -import static baritone.pathing.movement.movements.result.MoveResult.IMPOSSIBLE; +import static baritone.utils.pathing.MoveResult.IMPOSSIBLE; public class MovementDescend extends Movement { diff --git a/src/main/java/baritone/pathing/movement/movements/MovementFall.java b/src/main/java/baritone/pathing/movement/movements/MovementFall.java index 1e6a36ac..3dc327d3 100644 --- a/src/main/java/baritone/pathing/movement/movements/MovementFall.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementFall.java @@ -25,7 +25,7 @@ import baritone.pathing.movement.MovementHelper; import baritone.pathing.movement.MovementState; import baritone.pathing.movement.MovementState.MovementStatus; import baritone.pathing.movement.MovementState.MovementTarget; -import baritone.pathing.movement.movements.result.MoveResult; +import baritone.utils.pathing.MoveResult; import baritone.utils.BlockStateInterface; import baritone.utils.InputOverrideHandler; import baritone.utils.RayTraceUtils; diff --git a/src/main/java/baritone/pathing/movement/movements/MovementParkour.java b/src/main/java/baritone/pathing/movement/movements/MovementParkour.java index 7c04dfff..9d61ac5e 100644 --- a/src/main/java/baritone/pathing/movement/movements/MovementParkour.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementParkour.java @@ -23,7 +23,7 @@ import baritone.pathing.movement.CalculationContext; import baritone.pathing.movement.Movement; import baritone.pathing.movement.MovementHelper; import baritone.pathing.movement.MovementState; -import baritone.pathing.movement.movements.result.MoveResult; +import baritone.utils.pathing.MoveResult; import baritone.utils.BlockStateInterface; import baritone.utils.InputOverrideHandler; import baritone.utils.Utils; @@ -37,7 +37,7 @@ import net.minecraft.util.math.Vec3d; import java.util.Objects; -import static baritone.pathing.movement.movements.result.MoveResult.IMPOSSIBLE; +import static baritone.utils.pathing.MoveResult.IMPOSSIBLE; public class MovementParkour extends Movement { diff --git a/src/main/java/baritone/pathing/movement/movements/result/MoveResult.java b/src/main/java/baritone/utils/pathing/MoveResult.java similarity index 96% rename from src/main/java/baritone/pathing/movement/movements/result/MoveResult.java rename to src/main/java/baritone/utils/pathing/MoveResult.java index 95edb665..1ec96f76 100644 --- a/src/main/java/baritone/pathing/movement/movements/result/MoveResult.java +++ b/src/main/java/baritone/utils/pathing/MoveResult.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.pathing.movement.movements.result; +package baritone.utils.pathing; import static baritone.pathing.movement.ActionCosts.COST_INF;