cherry pick refactor

src/main/java/baritone/Baritone.java

@@ -15,14 +15,14 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot;
+package baritone;
 
-import baritone.bot.behavior.Behavior;
-import baritone.bot.behavior.impl.LookBehavior;
-import baritone.bot.behavior.impl.MemoryBehavior;
-import baritone.bot.behavior.impl.PathingBehavior;
-import baritone.bot.event.GameEventHandler;
-import baritone.bot.utils.InputOverrideHandler;
+import baritone.behavior.Behavior;
+import baritone.behavior.impl.LookBehavior;
+import baritone.behavior.impl.MemoryBehavior;
+import baritone.behavior.impl.PathingBehavior;
+import baritone.event.GameEventHandler;
+import baritone.utils.InputOverrideHandler;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/baritone/Settings.java

@@ -15,7 +15,24 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot;
+/*
+ * 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;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;

src/main/java/baritone/behavior/Behavior.java

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.behavior;
+package baritone.behavior;
 
-import baritone.bot.event.listener.AbstractGameEventListener;
-import baritone.bot.utils.Helper;
-import baritone.bot.utils.interfaces.Toggleable;
+import baritone.event.listener.AbstractGameEventListener;
+import baritone.utils.Helper;
+import baritone.utils.interfaces.Toggleable;
 
 /**
  * A generic bot behavior.

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

@@ -15,15 +15,15 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.behavior.impl;
+package baritone.behavior.impl;
 
-import baritone.bot.Baritone;
-import baritone.bot.Settings;
-import baritone.bot.behavior.Behavior;
-import baritone.bot.event.events.PlayerUpdateEvent;
-import baritone.bot.event.events.RelativeMoveEvent;
-import baritone.bot.event.events.type.EventState;
-import baritone.bot.utils.Rotation;
+import baritone.Baritone;
+import baritone.Settings;
+import baritone.behavior.Behavior;
+import baritone.event.events.PlayerUpdateEvent;
+import baritone.event.events.RelativeMoveEvent;
+import baritone.event.events.type.EventState;
+import baritone.utils.Rotation;
 
 public class LookBehavior extends Behavior {
 

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

@@ -15,19 +15,19 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.behavior.impl;
+package baritone.behavior.impl;
 
-import baritone.bot.utils.BlockStateInterface;
-import baritone.bot.utils.Helper;
-import baritone.bot.utils.Rotation;
-import baritone.bot.utils.Utils;
+import baritone.utils.BlockStateInterface;
+import baritone.utils.Helper;
+import baritone.utils.Rotation;
+import baritone.utils.Utils;
 import net.minecraft.block.BlockFire;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.math.*;
 
 import java.util.Optional;
 
-import static baritone.bot.utils.Utils.DEG_TO_RAD;
+import static baritone.utils.Utils.DEG_TO_RAD;
 
 public final class LookBehaviorUtils implements Helper {
 

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

@@ -1,9 +1,9 @@
-package baritone.bot.behavior.impl;
+package baritone.behavior.impl;
 
-import baritone.bot.behavior.Behavior;
-import baritone.bot.event.events.PacketEvent;
-import baritone.bot.event.events.PlayerUpdateEvent;
-import baritone.bot.event.events.type.EventState;
+import baritone.behavior.Behavior;
+import baritone.event.events.PacketEvent;
+import baritone.event.events.PlayerUpdateEvent;
+import baritone.event.events.type.EventState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.Packet;
 import net.minecraft.network.play.client.CPacketCloseWindow;

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

@@ -15,23 +15,23 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.behavior.impl;
+package baritone.behavior.impl;
 
-import baritone.bot.Baritone;
-import baritone.bot.behavior.Behavior;
-import baritone.bot.event.events.PlayerUpdateEvent;
-import baritone.bot.event.events.RenderEvent;
-import baritone.bot.event.events.TickEvent;
-import baritone.bot.pathing.calc.AStarPathFinder;
-import baritone.bot.pathing.calc.AbstractNodeCostSearch;
-import baritone.bot.pathing.calc.IPathFinder;
-import baritone.bot.pathing.goals.Goal;
-import baritone.bot.pathing.goals.GoalBlock;
-import baritone.bot.pathing.goals.GoalXZ;
-import baritone.bot.pathing.path.IPath;
-import baritone.bot.pathing.path.PathExecutor;
-import baritone.bot.utils.BlockStateInterface;
-import baritone.bot.utils.PathRenderer;
+import baritone.Baritone;
+import baritone.behavior.Behavior;
+import baritone.event.events.PlayerUpdateEvent;
+import baritone.event.events.RenderEvent;
+import baritone.event.events.TickEvent;
+import baritone.pathing.calc.AStarPathFinder;
+import baritone.pathing.calc.AbstractNodeCostSearch;
+import baritone.pathing.calc.IPathFinder;
+import baritone.pathing.goals.Goal;
+import baritone.pathing.goals.GoalBlock;
+import baritone.pathing.goals.GoalXZ;
+import baritone.pathing.path.IPath;
+import baritone.pathing.path.PathExecutor;
+import baritone.utils.BlockStateInterface;
+import baritone.utils.PathRenderer;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.chunk.EmptyChunk;

src/main/java/baritone/chunk/CachedChunk.java

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.chunk;
+package baritone.chunk;
 
-import baritone.bot.utils.pathing.IBlockTypeAccess;
-import baritone.bot.utils.pathing.PathingBlockType;
+import baritone.utils.pathing.IBlockTypeAccess;
+import baritone.utils.pathing.PathingBlockType;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 

src/main/java/baritone/chunk/CachedRegion.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.chunk;
+package baritone.chunk;
 
-import baritone.bot.utils.pathing.IBlockTypeAccess;
+import baritone.utils.pathing.IBlockTypeAccess;
 import net.minecraft.block.state.IBlockState;
 
 import java.io.*;

src/main/java/baritone/chunk/CachedWorld.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.chunk;
+package baritone.chunk;
 
-import baritone.bot.utils.pathing.IBlockTypeAccess;
+import baritone.utils.pathing.IBlockTypeAccess;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import net.minecraft.block.state.IBlockState;

src/main/java/baritone/chunk/CachedWorldProvider.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.chunk;
+package baritone.chunk;
 
-import baritone.bot.utils.Helper;
+import baritone.utils.Helper;
 import baritone.launch.mixins.accessor.IAnvilChunkLoader;
 import baritone.launch.mixins.accessor.IChunkProviderServer;
 import net.minecraft.client.multiplayer.WorldClient;

src/main/java/baritone/chunk/ChunkPacker.java

@@ -15,12 +15,12 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.chunk;
+package baritone.chunk;
 
-import baritone.bot.pathing.movement.MovementHelper;
-import baritone.bot.utils.BlockStateInterface;
-import baritone.bot.utils.Helper;
-import baritone.bot.utils.pathing.PathingBlockType;
+import baritone.pathing.movement.MovementHelper;
+import baritone.utils.BlockStateInterface;
+import baritone.utils.Helper;
+import baritone.utils.pathing.PathingBlockType;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockAir;
 import net.minecraft.block.BlockDoublePlant;

src/main/java/baritone/event/GameEventHandler.java

@@ -32,16 +32,16 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.event;
+package baritone.event;
 
-import baritone.bot.Baritone;
-import baritone.bot.chunk.CachedWorldProvider;
-import baritone.bot.event.events.*;
-import baritone.bot.event.events.type.EventState;
-import baritone.bot.event.listener.IGameEventListener;
-import baritone.bot.utils.Helper;
-import baritone.bot.utils.InputOverrideHandler;
-import baritone.bot.utils.interfaces.Toggleable;
+import baritone.Baritone;
+import baritone.chunk.CachedWorldProvider;
+import baritone.event.events.*;
+import baritone.event.events.type.EventState;
+import baritone.event.listener.IGameEventListener;
+import baritone.utils.Helper;
+import baritone.utils.InputOverrideHandler;
+import baritone.utils.interfaces.Toggleable;
 import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;

src/main/java/baritone/event/events/ChatEvent.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.event.events;
+package baritone.event.events;
 
-import baritone.bot.event.events.type.Cancellable;
+import baritone.event.events.type.Cancellable;
 
 /**
  * @author Brady

src/main/java/baritone/event/events/ChunkEvent.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.event.events;
+package baritone.event.events;
 
-import baritone.bot.event.events.type.EventState;
+import baritone.event.events.type.EventState;
 
 /**
  * @author Brady

src/main/java/baritone/event/events/ItemSlotEvent.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.event.events;
+package baritone.event.events;
 
-import baritone.bot.event.listener.IGameEventListener;
+import baritone.event.listener.IGameEventListener;
 
 /**
  * Called in some cases where a player's inventory has it's current slot queried.

src/main/java/baritone/event/events/PacketEvent.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.event.events;
+package baritone.event.events;
 
-import baritone.bot.event.events.type.EventState;
+import baritone.event.events.type.EventState;
 import net.minecraft.network.Packet;
 
 /**

src/main/java/baritone/event/events/PlayerUpdateEvent.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.event.events;
+package baritone.event.events;
 
-import baritone.bot.event.events.type.EventState;
+import baritone.event.events.type.EventState;
 
 /**
  * @author Brady

src/main/java/baritone/event/events/RelativeMoveEvent.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.event.events;
+package baritone.event.events;
 
-import baritone.bot.event.events.type.EventState;
+import baritone.event.events.type.EventState;
 
 /**
  * @author Brady

src/main/java/baritone/event/events/RenderEvent.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.event.events;
+package baritone.event.events;
 
 /**
  * @author Brady

src/main/java/baritone/event/events/TickEvent.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.event.events;
+package baritone.event.events;
 
-import baritone.bot.event.events.type.EventState;
+import baritone.event.events.type.EventState;
 
 public final class TickEvent {
 

src/main/java/baritone/event/events/WorldEvent.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.event.events;
+package baritone.event.events;
 
-import baritone.bot.event.events.type.EventState;
+import baritone.event.events.type.EventState;
 import net.minecraft.client.multiplayer.WorldClient;
 
 /**

src/main/java/baritone/event/events/type/Cancellable.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.event.events.type;
+package baritone.event.events.type;
 
 /**
  * @author Brady

src/main/java/baritone/event/events/type/EventState.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.event.events.type;
+package baritone.event.events.type;
 
 /**
  * @author Brady

src/main/java/baritone/event/listener/AbstractGameEventListener.java

@@ -32,9 +32,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.event.listener;
+package baritone.event.listener;
 
-import baritone.bot.event.events.*;
+import baritone.event.events.*;
 
 /**
  * An implementation of {@link IGameEventListener} that has all methods

src/main/java/baritone/event/listener/IGameEventListener.java

@@ -32,9 +32,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.event.listener;
+package baritone.event.listener;
 
-import baritone.bot.event.events.*;
+import baritone.event.events.*;
 import io.netty.util.concurrent.GenericFutureListener;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;

src/main/java/baritone/launch/mixins/MixinEntity.java

@@ -17,9 +17,9 @@
 
 package baritone.launch.mixins;
 
-import baritone.bot.Baritone;
-import baritone.bot.event.events.RelativeMoveEvent;
-import baritone.bot.event.events.type.EventState;
+import baritone.Baritone;
+import baritone.event.events.RelativeMoveEvent;
+import baritone.event.events.type.EventState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/baritone/launch/mixins/MixinEntityPlayerSP.java

@@ -17,10 +17,10 @@
 
 package baritone.launch.mixins;
 
-import baritone.bot.Baritone;
-import baritone.bot.event.events.ChatEvent;
-import baritone.bot.event.events.PlayerUpdateEvent;
-import baritone.bot.event.events.type.EventState;
+import baritone.Baritone;
+import baritone.event.events.ChatEvent;
+import baritone.event.events.PlayerUpdateEvent;
+import baritone.event.events.type.EventState;
 import net.minecraft.client.entity.EntityPlayerSP;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/baritone/launch/mixins/MixinEntityRenderer.java

@@ -17,8 +17,8 @@
 
 package baritone.launch.mixins;
 
-import baritone.bot.Baritone;
-import baritone.bot.event.events.RenderEvent;
+import baritone.Baritone;
+import baritone.event.events.RenderEvent;
 import net.minecraft.client.renderer.EntityRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/baritone/launch/mixins/MixinGameSettings.java

@@ -17,7 +17,7 @@
 
 package baritone.launch.mixins;
 
-import baritone.bot.Baritone;
+import baritone.Baritone;
 import net.minecraft.client.settings.GameSettings;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/baritone/launch/mixins/MixinGuiContainer.java

@@ -17,7 +17,7 @@
 
 package baritone.launch.mixins;
 
-import baritone.bot.Baritone;
+import baritone.Baritone;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/baritone/launch/mixins/MixinGuiScreen.java

@@ -17,7 +17,7 @@
 
 package baritone.launch.mixins;
 
-import baritone.bot.Baritone;
+import baritone.Baritone;
 import net.minecraft.client.gui.GuiScreen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/baritone/launch/mixins/MixinInventoryPlayer.java

@@ -17,8 +17,8 @@
 
 package baritone.launch.mixins;
 
-import baritone.bot.Baritone;
-import baritone.bot.event.events.ItemSlotEvent;
+import baritone.Baritone;
+import baritone.event.events.ItemSlotEvent;
 import net.minecraft.entity.player.InventoryPlayer;
 import org.spongepowered.asm.lib.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/baritone/launch/mixins/MixinKeyBinding.java

@@ -17,7 +17,7 @@
 
 package baritone.launch.mixins;
 
-import baritone.bot.Baritone;
+import baritone.Baritone;
 import net.minecraft.client.settings.KeyBinding;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

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

@@ -17,12 +17,12 @@
 
 package baritone.launch.mixins;
 
-import baritone.bot.Baritone;
-import baritone.bot.behavior.impl.PathingBehavior;
-import baritone.bot.event.events.TickEvent;
-import baritone.bot.event.events.WorldEvent;
-import baritone.bot.event.events.type.EventState;
-import baritone.bot.utils.ExampleBaritoneControl;
+import baritone.Baritone;
+import baritone.behavior.impl.PathingBehavior;
+import baritone.event.events.TickEvent;
+import baritone.event.events.WorldEvent;
+import baritone.event.events.type.EventState;
+import baritone.utils.ExampleBaritoneControl;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.multiplayer.WorldClient;
@@ -33,7 +33,6 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 /**
  * @author Brady

src/main/java/baritone/launch/mixins/MixinNetHandlerPlayClient.java

@@ -17,9 +17,9 @@
 
 package baritone.launch.mixins;
 
-import baritone.bot.Baritone;
-import baritone.bot.event.events.ChunkEvent;
-import baritone.bot.event.events.type.EventState;
+import baritone.Baritone;
+import baritone.event.events.ChunkEvent;
+import baritone.event.events.type.EventState;
 import net.minecraft.client.network.NetHandlerPlayClient;
 import net.minecraft.network.play.server.SPacketChunkData;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/baritone/launch/mixins/MixinNetworkManager.java

@@ -17,9 +17,9 @@
 
 package baritone.launch.mixins;
 
-import baritone.bot.Baritone;
-import baritone.bot.event.events.PacketEvent;
-import baritone.bot.event.events.type.EventState;
+import baritone.Baritone;
+import baritone.event.events.PacketEvent;
+import baritone.event.events.type.EventState;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.util.concurrent.Future;

src/main/java/baritone/launch/mixins/MixinWorldClient.java

@@ -17,9 +17,9 @@
 
 package baritone.launch.mixins;
 
-import baritone.bot.Baritone;
-import baritone.bot.event.events.ChunkEvent;
-import baritone.bot.event.events.type.EventState;
+import baritone.Baritone;
+import baritone.event.events.ChunkEvent;
+import baritone.event.events.type.EventState;
 import net.minecraft.client.multiplayer.WorldClient;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

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

@@ -32,21 +32,21 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.calc;
+package baritone.pathing.calc;
 
-import baritone.bot.Baritone;
-import baritone.bot.chunk.CachedWorldProvider;
-import baritone.bot.pathing.calc.openset.BinaryHeapOpenSet;
-import baritone.bot.pathing.calc.openset.IOpenSet;
-import baritone.bot.pathing.goals.Goal;
-import baritone.bot.pathing.movement.ActionCosts;
-import baritone.bot.pathing.movement.CalculationContext;
-import baritone.bot.pathing.movement.Movement;
-import baritone.bot.pathing.movement.MovementHelper;
-import baritone.bot.pathing.movement.movements.*;
-import baritone.bot.pathing.path.IPath;
-import baritone.bot.utils.Helper;
-import baritone.bot.utils.pathing.BetterBlockPos;
+import baritone.Baritone;
+import baritone.chunk.CachedWorldProvider;
+import baritone.pathing.calc.openset.BinaryHeapOpenSet;
+import baritone.pathing.calc.openset.IOpenSet;
+import baritone.pathing.goals.Goal;
+import baritone.pathing.movement.ActionCosts;
+import baritone.pathing.movement.CalculationContext;
+import baritone.pathing.movement.Movement;
+import baritone.pathing.movement.MovementHelper;
+import baritone.pathing.movement.movements.*;
+import baritone.pathing.path.IPath;
+import baritone.utils.Helper;
+import baritone.utils.pathing.BetterBlockPos;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;

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

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.calc;
+package baritone.pathing.calc;
 
-import baritone.bot.pathing.goals.Goal;
-import baritone.bot.pathing.path.IPath;
-import baritone.bot.utils.pathing.BetterBlockPos;
+import baritone.pathing.goals.Goal;
+import baritone.pathing.path.IPath;
+import baritone.utils.pathing.BetterBlockPos;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.HashMap;

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

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.calc;
+package baritone.pathing.calc;
 
-import baritone.bot.pathing.goals.Goal;
-import baritone.bot.pathing.path.IPath;
+import baritone.pathing.goals.Goal;
+import baritone.pathing.path.IPath;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.Optional;

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

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.calc;
+package baritone.pathing.calc;
 
-import baritone.bot.pathing.movement.Movement;
-import baritone.bot.pathing.path.IPath;
-import baritone.bot.utils.pathing.BetterBlockPos;
+import baritone.pathing.movement.Movement;
+import baritone.pathing.path.IPath;
+import baritone.utils.pathing.BetterBlockPos;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.ArrayList;

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

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.calc;
+package baritone.pathing.calc;
 
-import baritone.bot.pathing.goals.Goal;
-import baritone.bot.pathing.movement.Movement;
-import baritone.bot.utils.pathing.BetterBlockPos;
+import baritone.pathing.goals.Goal;
+import baritone.pathing.movement.Movement;
+import baritone.utils.pathing.BetterBlockPos;
 
 /**
  * A node in the path, containing the cost and steps to get to it.

src/main/java/baritone/pathing/calc/openset/BinaryHeapOpenSet.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.calc.openset;
+package baritone.pathing.calc.openset;
 
-import baritone.bot.pathing.calc.PathNode;
+import baritone.pathing.calc.PathNode;
 
 import java.util.Arrays;
 

src/main/java/baritone/pathing/calc/openset/IOpenSet.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.calc.openset;
+package baritone.pathing.calc.openset;
 
-import baritone.bot.pathing.calc.PathNode;
+import baritone.pathing.calc.PathNode;
 
 /**
  * An open set for A* or similar graph search algorithm

src/main/java/baritone/pathing/calc/openset/LinkedListOpenSet.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.calc.openset;
+package baritone.pathing.calc.openset;
 
-import baritone.bot.pathing.calc.PathNode;
+import baritone.pathing.calc.PathNode;
 
 /**
  * A linked list implementation of an open set. This is the original implementation from MineBot.

src/main/java/baritone/pathing/goals/Goal.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.goals;
+package baritone.pathing.goals;
 
-import baritone.bot.pathing.movement.ActionCosts;
+import baritone.pathing.movement.ActionCosts;
 import net.minecraft.util.math.BlockPos;
 
 /**

src/main/java/baritone/pathing/goals/GoalBlock.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.goals;
+package baritone.pathing.goals;
 
 import net.minecraft.util.math.BlockPos;
 

src/main/java/baritone/pathing/goals/GoalComposite.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.goals;
+package baritone.pathing.goals;
 
 import java.util.Arrays;
 import java.util.Collection;

src/main/java/baritone/pathing/goals/GoalGetToBlock.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.goals;
+package baritone.pathing.goals;
 
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;

src/main/java/baritone/pathing/goals/GoalRunAway.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.goals;
+package baritone.pathing.goals;
 
 import java.util.Arrays;
 import net.minecraft.util.math.BlockPos;

src/main/java/baritone/pathing/goals/GoalTwoBlocks.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.goals;
+package baritone.pathing.goals;
 
 import net.minecraft.util.math.BlockPos;
 

src/main/java/baritone/pathing/goals/GoalXZ.java

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.goals;
+package baritone.pathing.goals;
 
-import baritone.bot.Baritone;
-import baritone.bot.utils.Utils;
+import baritone.Baritone;
+import baritone.utils.Utils;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 

src/main/java/baritone/pathing/goals/GoalYLevel.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.goals;
+package baritone.pathing.goals;
 
 import net.minecraft.util.math.BlockPos;
 

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

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.movement;
+package baritone.pathing.movement;
 
 public interface ActionCosts extends ActionCostsButOnlyTheOnesThatMakeMickeyDieInside {
 

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

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.movement;
+package baritone.pathing.movement;
 
 public interface ActionCostsButOnlyTheOnesThatMakeMickeyDieInside {
     double[] FALL_N_BLOCKS_COST = generateFallNBlocksCost();

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

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.movement;
+package baritone.pathing.movement;
 
-import baritone.bot.Baritone;
-import baritone.bot.utils.Helper;
-import baritone.bot.utils.ToolSet;
+import baritone.Baritone;
+import baritone.utils.Helper;
+import baritone.utils.ToolSet;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;

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

@@ -15,16 +15,16 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.movement;
+package baritone.pathing.movement;
 
-import baritone.bot.Baritone;
-import baritone.bot.behavior.impl.LookBehavior;
-import baritone.bot.behavior.impl.LookBehaviorUtils;
-import baritone.bot.pathing.movement.MovementState.MovementStatus;
-import baritone.bot.pathing.movement.movements.MovementDownward;
-import baritone.bot.pathing.movement.movements.MovementPillar;
-import baritone.bot.pathing.movement.movements.MovementTraverse;
-import baritone.bot.utils.*;
+import baritone.Baritone;
+import baritone.behavior.impl.LookBehavior;
+import baritone.behavior.impl.LookBehaviorUtils;
+import baritone.pathing.movement.MovementState.MovementStatus;
+import baritone.pathing.movement.movements.MovementDownward;
+import baritone.pathing.movement.movements.MovementPillar;
+import baritone.pathing.movement.movements.MovementTraverse;
+import baritone.utils.*;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLadder;
 import net.minecraft.block.BlockVine;
@@ -34,7 +34,7 @@ import net.minecraft.util.math.Vec3d;
 import java.util.ArrayList;
 import java.util.Optional;
 
-import static baritone.bot.utils.InputOverrideHandler.Input;
+import static baritone.utils.InputOverrideHandler.Input;
 
 public abstract class Movement implements Helper, MovementHelper {
 

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

@@ -15,14 +15,14 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.movement;
+package baritone.pathing.movement;
 
-import baritone.bot.Baritone;
-import baritone.bot.behavior.impl.LookBehaviorUtils;
-import baritone.bot.pathing.movement.MovementState.MovementTarget;
-import baritone.bot.pathing.movement.movements.MovementDescend;
-import baritone.bot.pathing.movement.movements.MovementFall;
-import baritone.bot.utils.*;
+import baritone.Baritone;
+import baritone.behavior.impl.LookBehaviorUtils;
+import baritone.pathing.movement.MovementState.MovementTarget;
+import baritone.pathing.movement.movements.MovementDescend;
+import baritone.pathing.movement.movements.MovementFall;
+import baritone.utils.*;
 import net.minecraft.block.*;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;

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

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.movement;
+package baritone.pathing.movement;
 
-import baritone.bot.utils.InputOverrideHandler.Input;
-import baritone.bot.utils.Rotation;
+import baritone.utils.InputOverrideHandler.Input;
+import baritone.utils.Rotation;
 import net.minecraft.util.math.Vec3d;
 
 import java.util.HashMap;

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

@@ -15,17 +15,17 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.movement.movements;
+package baritone.pathing.movement.movements;
 
-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.pathing.movement.MovementState.MovementStatus;
-import baritone.bot.utils.BlockStateInterface;
-import baritone.bot.utils.InputOverrideHandler;
-import baritone.bot.utils.Utils;
+import baritone.behavior.impl.LookBehaviorUtils;
+import baritone.pathing.movement.CalculationContext;
+import baritone.pathing.movement.Movement;
+import baritone.pathing.movement.MovementHelper;
+import baritone.pathing.movement.MovementState;
+import baritone.pathing.movement.MovementState.MovementStatus;
+import baritone.utils.BlockStateInterface;
+import baritone.utils.InputOverrideHandler;
+import baritone.utils.Utils;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFalling;
 import net.minecraft.block.state.IBlockState;

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

@@ -15,15 +15,15 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.movement.movements;
+package baritone.pathing.movement.movements;
 
-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 baritone.pathing.movement.CalculationContext;
+import baritone.pathing.movement.Movement;
+import baritone.pathing.movement.MovementHelper;
+import baritone.pathing.movement.MovementState;
+import baritone.pathing.movement.MovementState.MovementStatus;
+import baritone.utils.BlockStateInterface;
+import baritone.utils.InputOverrideHandler;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLadder;
 import net.minecraft.block.BlockVine;

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

@@ -15,13 +15,13 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.movement.movements;
+package baritone.pathing.movement.movements;
 
-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.pathing.movement.CalculationContext;
+import baritone.pathing.movement.Movement;
+import baritone.pathing.movement.MovementHelper;
+import baritone.pathing.movement.MovementState;
+import baritone.utils.BlockStateInterface;
 import net.minecraft.block.BlockMagma;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;

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

@@ -15,13 +15,13 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.movement.movements;
+package baritone.pathing.movement.movements;
 
-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.pathing.movement.CalculationContext;
+import baritone.pathing.movement.Movement;
+import baritone.pathing.movement.MovementHelper;
+import baritone.pathing.movement.MovementState;
+import baritone.utils.BlockStateInterface;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLadder;
 import net.minecraft.block.BlockVine;

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

@@ -15,20 +15,20 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.movement.movements;
+package baritone.pathing.movement.movements;
 
-import baritone.bot.Baritone;
-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.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 baritone.Baritone;
+import baritone.behavior.impl.LookBehaviorUtils;
+import baritone.pathing.movement.CalculationContext;
+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.MovementState.MovementTarget;
+import baritone.utils.BlockStateInterface;
+import baritone.utils.InputOverrideHandler;
+import baritone.utils.Rotation;
+import baritone.utils.Utils;
 import net.minecraft.block.Block;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;

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

@@ -15,16 +15,16 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.movement.movements;
+package baritone.pathing.movement.movements;
 
-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 baritone.pathing.movement.CalculationContext;
+import baritone.pathing.movement.Movement;
+import baritone.pathing.movement.MovementHelper;
+import baritone.pathing.movement.MovementState;
+import baritone.utils.BlockStateInterface;
+import baritone.utils.InputOverrideHandler;
+import baritone.utils.Rotation;
+import baritone.utils.Utils;
 import net.minecraft.block.*;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;

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

@@ -15,16 +15,16 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.movement.movements;
+package baritone.pathing.movement.movements;
 
-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 baritone.behavior.impl.LookBehaviorUtils;
+import baritone.pathing.movement.CalculationContext;
+import baritone.pathing.movement.Movement;
+import baritone.pathing.movement.MovementHelper;
+import baritone.pathing.movement.MovementState;
+import baritone.utils.BlockStateInterface;
+import baritone.utils.InputOverrideHandler;
+import baritone.utils.Utils;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockDoor;
 import net.minecraft.block.BlockLadder;

src/main/java/baritone/pathing/path/CutoffPath.java

@@ -15,10 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.path;
+package baritone.pathing.path;
 
-import baritone.bot.pathing.movement.Movement;
-import baritone.bot.utils.pathing.BetterBlockPos;
+import baritone.pathing.movement.Movement;
+import baritone.utils.pathing.BetterBlockPos;
 
 import java.util.Collections;
 import java.util.List;

src/main/java/baritone/pathing/path/IPath.java

@@ -15,14 +15,14 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.path;
+package baritone.pathing.path;
 
-import baritone.bot.Baritone;
-import baritone.bot.pathing.goals.Goal;
-import baritone.bot.pathing.movement.Movement;
-import baritone.bot.utils.Helper;
-import baritone.bot.utils.Utils;
-import baritone.bot.utils.pathing.BetterBlockPos;
+import baritone.Baritone;
+import baritone.pathing.goals.Goal;
+import baritone.pathing.movement.Movement;
+import baritone.utils.Helper;
+import baritone.utils.Utils;
+import baritone.utils.pathing.BetterBlockPos;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.Tuple;
 import net.minecraft.util.math.BlockPos;

src/main/java/baritone/pathing/path/PathExecutor.java

@@ -15,15 +15,15 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.path;
+package baritone.pathing.path;
 
-import baritone.bot.Baritone;
-import baritone.bot.event.events.TickEvent;
-import baritone.bot.pathing.movement.ActionCosts;
-import baritone.bot.pathing.movement.Movement;
-import baritone.bot.pathing.movement.MovementState;
-import baritone.bot.utils.BlockStateInterface;
-import baritone.bot.utils.Helper;
+import baritone.Baritone;
+import baritone.event.events.TickEvent;
+import baritone.pathing.movement.ActionCosts;
+import baritone.pathing.movement.Movement;
+import baritone.pathing.movement.MovementState;
+import baritone.utils.BlockStateInterface;
+import baritone.utils.Helper;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.Tuple;
@@ -33,7 +33,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import static baritone.bot.pathing.movement.MovementState.MovementStatus.*;
+import static baritone.pathing.movement.MovementState.MovementStatus.*;
 
 /**
  * Behavior to execute a precomputed path. Does not (yet) deal with path segmentation or stitching

src/main/java/baritone/utils/BlockStateInterface.java

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.utils;
+package baritone.utils;
 
-import baritone.bot.Baritone;
-import baritone.bot.chunk.CachedWorld;
-import baritone.bot.chunk.CachedWorldProvider;
+import baritone.Baritone;
+import baritone.chunk.CachedWorld;
+import baritone.chunk.CachedWorldProvider;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFalling;
 import net.minecraft.block.BlockLiquid;

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

@@ -15,22 +15,22 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.utils;
+package baritone.utils;
 
-import baritone.bot.Baritone;
-import baritone.bot.Settings;
-import baritone.bot.behavior.Behavior;
-import baritone.bot.behavior.impl.PathingBehavior;
-import baritone.bot.event.events.ChatEvent;
-import baritone.bot.pathing.calc.AStarPathFinder;
-import baritone.bot.pathing.goals.Goal;
-import baritone.bot.pathing.goals.GoalBlock;
-import baritone.bot.pathing.goals.GoalXZ;
-import baritone.bot.pathing.goals.GoalYLevel;
-import baritone.bot.pathing.movement.ActionCosts;
-import baritone.bot.pathing.movement.CalculationContext;
-import baritone.bot.pathing.movement.Movement;
-import baritone.bot.utils.pathing.BetterBlockPos;
+import baritone.Baritone;
+import baritone.Settings;
+import baritone.behavior.Behavior;
+import baritone.behavior.impl.PathingBehavior;
+import baritone.event.events.ChatEvent;
+import baritone.pathing.calc.AStarPathFinder;
+import baritone.pathing.goals.Goal;
+import baritone.pathing.goals.GoalBlock;
+import baritone.pathing.goals.GoalXZ;
+import baritone.pathing.goals.GoalYLevel;
+import baritone.pathing.movement.ActionCosts;
+import baritone.pathing.movement.CalculationContext;
+import baritone.pathing.movement.Movement;
+import baritone.utils.pathing.BetterBlockPos;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.ArrayList;

src/main/java/baritone/utils/Helper.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.utils;
+package baritone.utils;
 
-import baritone.bot.Baritone;
+import baritone.Baritone;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.GuiNewChat;

src/main/java/baritone/utils/InputOverrideHandler.java

@@ -32,7 +32,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.utils;
+package baritone.utils;
 
 import net.minecraft.client.settings.KeyBinding;
 import org.lwjgl.input.Keyboard;

src/main/java/baritone/utils/PathRenderer.java

@@ -15,14 +15,14 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.utils;
+package baritone.utils;
 
-import baritone.bot.Baritone;
-import baritone.bot.pathing.goals.Goal;
-import baritone.bot.pathing.goals.GoalBlock;
-import baritone.bot.pathing.goals.GoalXZ;
-import baritone.bot.pathing.path.IPath;
-import baritone.bot.utils.pathing.BetterBlockPos;
+import baritone.Baritone;
+import baritone.pathing.goals.Goal;
+import baritone.pathing.goals.GoalBlock;
+import baritone.pathing.goals.GoalXZ;
+import baritone.pathing.path.IPath;
+import baritone.utils.pathing.BetterBlockPos;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;

src/main/java/baritone/utils/Rotation.java

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

src/main/java/baritone/utils/ToolSet.java

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.utils;
+package baritone.utils;
 
-import baritone.bot.Baritone;
-import baritone.bot.event.events.ItemSlotEvent;
-import baritone.bot.event.listener.AbstractGameEventListener;
+import baritone.Baritone;
+import baritone.event.events.ItemSlotEvent;
+import baritone.event.listener.AbstractGameEventListener;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;

src/main/java/baritone/utils/Utils.java

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

src/main/java/baritone/utils/interfaces/Toggleable.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.utils.interfaces;
+package baritone.utils.interfaces;
 
 /**
  * @author Brady

src/main/java/baritone/utils/pathing/BetterBlockPos.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.utils.pathing;
+package baritone.utils.pathing;
 
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;

src/main/java/baritone/utils/pathing/IBlockTypeAccess.java

@@ -15,9 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.utils.pathing;
+package baritone.utils.pathing;
 
-import baritone.bot.utils.Helper;
+import baritone.utils.Helper;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.math.BlockPos;
 

src/main/java/baritone/utils/pathing/PathingBlockType.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.utils.pathing;
+package baritone.utils.pathing;
 
 /**
  * @author Brady

src/test/java/baritone/pathing/calc/openset/OpenSetsTest.java

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.calc.openset;
+package baritone.pathing.calc.openset;
 
-import baritone.bot.pathing.calc.PathNode;
-import baritone.bot.pathing.goals.Goal;
-import baritone.bot.utils.pathing.BetterBlockPos;
+import baritone.pathing.calc.PathNode;
+import baritone.pathing.goals.Goal;
+import baritone.utils.pathing.BetterBlockPos;
 import net.minecraft.util.math.BlockPos;
 import org.junit.Test;
 

src/test/java/baritone/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInsideTest.java

@@ -15,11 +15,11 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.pathing.movement;
+package baritone.pathing.movement;
 
 import org.junit.Test;
 
-import static baritone.bot.pathing.movement.ActionCostsButOnlyTheOnesThatMakeMickeyDieInside.*;
+import static baritone.pathing.movement.ActionCostsButOnlyTheOnesThatMakeMickeyDieInside.*;
 import static org.junit.Assert.assertEquals;
 
 public class ActionCostsButOnlyTheOnesThatMakeMickeyDieInsideTest {

src/test/java/baritone/utils/pathing/BetterBlockPosTest.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.bot.utils.pathing;
+package baritone.utils.pathing;
 
 import net.minecraft.util.math.BlockPos;
 import org.junit.Test;