Collapse impl package for default behaviors

src/launch/java/baritone/launch/mixins/MixinMinecraft.java

@@ -22,7 +22,7 @@ import baritone.api.event.events.BlockInteractEvent;
 import baritone.api.event.events.TickEvent;
 import baritone.api.event.events.WorldEvent;
 import baritone.api.event.events.type.EventState;
-import baritone.behavior.impl.PathingBehavior;
+import baritone.behavior.PathingBehavior;
 import baritone.utils.ExampleBaritoneControl;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;

src/main/java/baritone/Baritone.java

@@ -19,7 +19,7 @@ package baritone;
 
 import baritone.api.event.listener.IGameEventListener;
 import baritone.api.behavior.Behavior;
-import baritone.behavior.impl.*;
+import baritone.behavior.*;
 import baritone.event.GameEventHandler;
 import baritone.utils.InputOverrideHandler;
 import net.minecraft.client.Minecraft;

src/main/java/baritone/behavior/FollowBehavior.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.behavior.impl;
+package baritone.behavior;
 
 import baritone.api.event.events.TickEvent;
 import baritone.api.behavior.Behavior;
@@ -28,14 +28,14 @@ import net.minecraft.util.math.BlockPos;
  *
  * @author leijurv
  */
-public class FollowBehavior extends Behavior {
+public final class FollowBehavior extends Behavior {
 
     public static final FollowBehavior INSTANCE = new FollowBehavior();
 
     private FollowBehavior() {
     }
 
-    Entity following;
+    private Entity following;
 
     @Override
     public void onTick(TickEvent event) {

src/main/java/baritone/behavior/LocationTrackingBehavior.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.behavior.impl;
+package baritone.behavior;
 
 import baritone.api.behavior.Behavior;
 import baritone.cache.Waypoint;

src/main/java/baritone/behavior/LookBehavior.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.behavior.impl;
+package baritone.behavior;
 
 import baritone.Baritone;
 import baritone.Settings;
@@ -25,7 +25,7 @@ import baritone.api.behavior.Behavior;
 import baritone.utils.Helper;
 import baritone.utils.Rotation;
 
-public class LookBehavior extends Behavior implements Helper {
+public final class LookBehavior extends Behavior implements Helper {
 
     public static final LookBehavior INSTANCE = new LookBehavior();
 

src/main/java/baritone/behavior/LookBehaviorUtils.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.behavior.impl;
+package baritone.behavior;
 
 import baritone.utils.*;
 import net.minecraft.block.BlockFire;

src/main/java/baritone/behavior/MemoryBehavior.java

@@ -1,4 +1,21 @@
-package baritone.behavior.impl;
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.behavior;
 
 import baritone.api.event.events.PacketEvent;
 import baritone.api.event.events.PlayerUpdateEvent;
@@ -21,7 +38,7 @@ import java.util.*;
  * @author Brady
  * @since 8/6/2018 9:47 PM
  */
-public class MemoryBehavior extends Behavior implements Helper {
+public final class MemoryBehavior extends Behavior implements Helper {
 
     public static MemoryBehavior INSTANCE = new MemoryBehavior();
 

src/main/java/baritone/behavior/MineBehavior.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.behavior.impl;
+package baritone.behavior;
 
 import baritone.api.event.events.PathEvent;
 import baritone.api.behavior.Behavior;
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
  *
  * @author leijurv
  */
-public class MineBehavior extends Behavior implements Helper {
+public final class MineBehavior extends Behavior implements Helper {
 
     public static final MineBehavior INSTANCE = new MineBehavior();
 

src/main/java/baritone/behavior/PathingBehavior.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.behavior.impl;
+package baritone.behavior;
 
 import baritone.Baritone;
 import baritone.api.event.events.PathEvent;

src/main/java/baritone/pathing/calc/AbstractNodeCostSearch.java

@@ -17,7 +17,7 @@
 
 package baritone.pathing.calc;
 
-import baritone.behavior.impl.PathingBehavior;
+import baritone.behavior.PathingBehavior;
 import baritone.pathing.goals.Goal;
 import baritone.pathing.path.IPath;
 import baritone.utils.pathing.BetterBlockPos;

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

@@ -18,8 +18,8 @@
 package baritone.pathing.movement;
 
 import baritone.Baritone;
-import baritone.behavior.impl.LookBehavior;
+import baritone.behavior.LookBehavior;
-import baritone.behavior.impl.LookBehaviorUtils;
+import baritone.behavior.LookBehaviorUtils;
 import baritone.pathing.movement.MovementState.MovementStatus;
 import baritone.utils.*;
 import baritone.utils.pathing.BetterBlockPos;

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

@@ -18,7 +18,7 @@
 package baritone.pathing.movement;
 
 import baritone.Baritone;
-import baritone.behavior.impl.LookBehaviorUtils;
+import baritone.behavior.LookBehaviorUtils;
 import baritone.pathing.movement.MovementState.MovementTarget;
 import baritone.pathing.movement.movements.MovementDescend;
 import baritone.pathing.movement.movements.MovementFall;

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

@@ -18,7 +18,7 @@
 package baritone.pathing.movement.movements;
 
 import baritone.Baritone;
-import baritone.behavior.impl.LookBehaviorUtils;
+import baritone.behavior.LookBehaviorUtils;
 import baritone.pathing.movement.CalculationContext;
 import baritone.pathing.movement.Movement;
 import baritone.pathing.movement.MovementHelper;

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

@@ -18,7 +18,7 @@
 package baritone.pathing.movement.movements;
 
 import baritone.Baritone;
-import baritone.behavior.impl.LookBehaviorUtils;
+import baritone.behavior.LookBehaviorUtils;
 import baritone.pathing.movement.CalculationContext;
 import baritone.pathing.movement.Movement;
 import baritone.pathing.movement.MovementHelper;

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

@@ -18,7 +18,7 @@
 package baritone.pathing.movement.movements;
 
 import baritone.Baritone;
-import baritone.behavior.impl.LookBehaviorUtils;
+import baritone.behavior.LookBehaviorUtils;
 import baritone.pathing.movement.CalculationContext;
 import baritone.pathing.movement.Movement;
 import baritone.pathing.movement.MovementHelper;

src/main/java/baritone/utils/ExampleBaritoneControl.java

@@ -21,9 +21,9 @@ import baritone.Baritone;
 import baritone.Settings;
 import baritone.api.event.events.ChatEvent;
 import baritone.api.behavior.Behavior;
-import baritone.behavior.impl.FollowBehavior;
+import baritone.behavior.FollowBehavior;
-import baritone.behavior.impl.MineBehavior;
+import baritone.behavior.MineBehavior;
-import baritone.behavior.impl.PathingBehavior;
+import baritone.behavior.PathingBehavior;
 import baritone.cache.ChunkPacker;
 import baritone.cache.Waypoint;
 import baritone.cache.WorldProvider;

src/main/java/baritone/utils/RayTraceUtils.java

@@ -20,7 +20,7 @@ package baritone.utils;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
 
-import static baritone.behavior.impl.LookBehaviorUtils.calcVec3dFromRotation;
+import static baritone.behavior.LookBehaviorUtils.calcVec3dFromRotation;
 
 /**
  * @author Brady