diff --git a/src/main/java/baritone/bot/Baritone.java b/src/main/java/baritone/Baritone.java similarity index 86% rename from src/main/java/baritone/bot/Baritone.java rename to src/main/java/baritone/Baritone.java index 96b4e44d..31f37235 100755 --- a/src/main/java/baritone/bot/Baritone.java +++ b/src/main/java/baritone/Baritone.java @@ -15,14 +15,14 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/Settings.java b/src/main/java/baritone/Settings.java similarity index 93% rename from src/main/java/baritone/bot/Settings.java rename to src/main/java/baritone/Settings.java index 5e888636..7f4e47c7 100644 --- a/src/main/java/baritone/bot/Settings.java +++ b/src/main/java/baritone/Settings.java @@ -15,7 +15,24 @@ * along with Baritone. If not, see . */ -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 . + */ + +package baritone; import net.minecraft.init.Blocks; import net.minecraft.item.Item; diff --git a/src/main/java/baritone/bot/behavior/Behavior.java b/src/main/java/baritone/behavior/Behavior.java similarity index 93% rename from src/main/java/baritone/bot/behavior/Behavior.java rename to src/main/java/baritone/behavior/Behavior.java index 87104246..d9e0e357 100644 --- a/src/main/java/baritone/bot/behavior/Behavior.java +++ b/src/main/java/baritone/behavior/Behavior.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -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. diff --git a/src/main/java/baritone/bot/behavior/impl/LookBehavior.java b/src/main/java/baritone/behavior/impl/LookBehavior.java similarity index 89% rename from src/main/java/baritone/bot/behavior/impl/LookBehavior.java rename to src/main/java/baritone/behavior/impl/LookBehavior.java index 2b470362..a531cd88 100644 --- a/src/main/java/baritone/bot/behavior/impl/LookBehavior.java +++ b/src/main/java/baritone/behavior/impl/LookBehavior.java @@ -15,15 +15,15 @@ * along with Baritone. If not, see . */ -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 { diff --git a/src/main/java/baritone/bot/behavior/impl/LookBehaviorUtils.java b/src/main/java/baritone/behavior/impl/LookBehaviorUtils.java similarity index 96% rename from src/main/java/baritone/bot/behavior/impl/LookBehaviorUtils.java rename to src/main/java/baritone/behavior/impl/LookBehaviorUtils.java index f4ba2c52..fd75c478 100644 --- a/src/main/java/baritone/bot/behavior/impl/LookBehaviorUtils.java +++ b/src/main/java/baritone/behavior/impl/LookBehaviorUtils.java @@ -15,19 +15,19 @@ * along with Baritone. If not, see . */ -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 { diff --git a/src/main/java/baritone/bot/behavior/impl/MemoryBehavior.java b/src/main/java/baritone/behavior/impl/MemoryBehavior.java similarity index 96% rename from src/main/java/baritone/bot/behavior/impl/MemoryBehavior.java rename to src/main/java/baritone/behavior/impl/MemoryBehavior.java index 33ca56f1..ed5bd686 100644 --- a/src/main/java/baritone/bot/behavior/impl/MemoryBehavior.java +++ b/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; diff --git a/src/main/java/baritone/bot/behavior/impl/PathingBehavior.java b/src/main/java/baritone/behavior/impl/PathingBehavior.java similarity index 94% rename from src/main/java/baritone/bot/behavior/impl/PathingBehavior.java rename to src/main/java/baritone/behavior/impl/PathingBehavior.java index 54101a16..b35baca1 100644 --- a/src/main/java/baritone/bot/behavior/impl/PathingBehavior.java +++ b/src/main/java/baritone/behavior/impl/PathingBehavior.java @@ -15,23 +15,23 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/chunk/CachedChunk.java b/src/main/java/baritone/chunk/CachedChunk.java similarity index 97% rename from src/main/java/baritone/bot/chunk/CachedChunk.java rename to src/main/java/baritone/chunk/CachedChunk.java index ecc7ef48..f4d56fd2 100644 --- a/src/main/java/baritone/bot/chunk/CachedChunk.java +++ b/src/main/java/baritone/chunk/CachedChunk.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/chunk/CachedRegion.java b/src/main/java/baritone/chunk/CachedRegion.java similarity index 99% rename from src/main/java/baritone/bot/chunk/CachedRegion.java rename to src/main/java/baritone/chunk/CachedRegion.java index 3db019eb..d8996fa3 100644 --- a/src/main/java/baritone/bot/chunk/CachedRegion.java +++ b/src/main/java/baritone/chunk/CachedRegion.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -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.*; diff --git a/src/main/java/baritone/bot/chunk/CachedWorld.java b/src/main/java/baritone/chunk/CachedWorld.java similarity index 98% rename from src/main/java/baritone/bot/chunk/CachedWorld.java rename to src/main/java/baritone/chunk/CachedWorld.java index 4b1457fa..134d9468 100644 --- a/src/main/java/baritone/bot/chunk/CachedWorld.java +++ b/src/main/java/baritone/chunk/CachedWorld.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/chunk/CachedWorldProvider.java b/src/main/java/baritone/chunk/CachedWorldProvider.java similarity index 97% rename from src/main/java/baritone/bot/chunk/CachedWorldProvider.java rename to src/main/java/baritone/chunk/CachedWorldProvider.java index b59c3a52..2ba95d4b 100644 --- a/src/main/java/baritone/bot/chunk/CachedWorldProvider.java +++ b/src/main/java/baritone/chunk/CachedWorldProvider.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/chunk/ChunkPacker.java b/src/main/java/baritone/chunk/ChunkPacker.java similarity index 95% rename from src/main/java/baritone/bot/chunk/ChunkPacker.java rename to src/main/java/baritone/chunk/ChunkPacker.java index b9494aa5..c0688786 100644 --- a/src/main/java/baritone/bot/chunk/ChunkPacker.java +++ b/src/main/java/baritone/chunk/ChunkPacker.java @@ -15,12 +15,12 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/event/GameEventHandler.java b/src/main/java/baritone/event/GameEventHandler.java similarity index 95% rename from src/main/java/baritone/bot/event/GameEventHandler.java rename to src/main/java/baritone/event/GameEventHandler.java index 72917145..8a63859e 100644 --- a/src/main/java/baritone/bot/event/GameEventHandler.java +++ b/src/main/java/baritone/event/GameEventHandler.java @@ -32,16 +32,16 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/event/events/ChatEvent.java b/src/main/java/baritone/event/events/ChatEvent.java similarity index 92% rename from src/main/java/baritone/bot/event/events/ChatEvent.java rename to src/main/java/baritone/event/events/ChatEvent.java index 414f8539..5fdf269c 100644 --- a/src/main/java/baritone/bot/event/events/ChatEvent.java +++ b/src/main/java/baritone/event/events/ChatEvent.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.bot.event.events; +package baritone.event.events; -import baritone.bot.event.events.type.Cancellable; +import baritone.event.events.type.Cancellable; /** * @author Brady diff --git a/src/main/java/baritone/bot/event/events/ChunkEvent.java b/src/main/java/baritone/event/events/ChunkEvent.java similarity index 96% rename from src/main/java/baritone/bot/event/events/ChunkEvent.java rename to src/main/java/baritone/event/events/ChunkEvent.java index 54841c30..e5fe8a7f 100644 --- a/src/main/java/baritone/bot/event/events/ChunkEvent.java +++ b/src/main/java/baritone/event/events/ChunkEvent.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.bot.event.events; +package baritone.event.events; -import baritone.bot.event.events.type.EventState; +import baritone.event.events.type.EventState; /** * @author Brady diff --git a/src/main/java/baritone/bot/event/events/ItemSlotEvent.java b/src/main/java/baritone/event/events/ItemSlotEvent.java similarity index 93% rename from src/main/java/baritone/bot/event/events/ItemSlotEvent.java rename to src/main/java/baritone/event/events/ItemSlotEvent.java index 3362e780..b660cbea 100644 --- a/src/main/java/baritone/bot/event/events/ItemSlotEvent.java +++ b/src/main/java/baritone/event/events/ItemSlotEvent.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -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. diff --git a/src/main/java/baritone/bot/event/events/PacketEvent.java b/src/main/java/baritone/event/events/PacketEvent.java similarity index 93% rename from src/main/java/baritone/bot/event/events/PacketEvent.java rename to src/main/java/baritone/event/events/PacketEvent.java index c2bf15c0..54401f6a 100644 --- a/src/main/java/baritone/bot/event/events/PacketEvent.java +++ b/src/main/java/baritone/event/events/PacketEvent.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -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; /** diff --git a/src/main/java/baritone/bot/event/events/PlayerUpdateEvent.java b/src/main/java/baritone/event/events/PlayerUpdateEvent.java similarity index 92% rename from src/main/java/baritone/bot/event/events/PlayerUpdateEvent.java rename to src/main/java/baritone/event/events/PlayerUpdateEvent.java index b1b703fb..1f52bd80 100644 --- a/src/main/java/baritone/bot/event/events/PlayerUpdateEvent.java +++ b/src/main/java/baritone/event/events/PlayerUpdateEvent.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.bot.event.events; +package baritone.event.events; -import baritone.bot.event.events.type.EventState; +import baritone.event.events.type.EventState; /** * @author Brady diff --git a/src/main/java/baritone/bot/event/events/RelativeMoveEvent.java b/src/main/java/baritone/event/events/RelativeMoveEvent.java similarity index 92% rename from src/main/java/baritone/bot/event/events/RelativeMoveEvent.java rename to src/main/java/baritone/event/events/RelativeMoveEvent.java index cf7f03ad..1b639df5 100644 --- a/src/main/java/baritone/bot/event/events/RelativeMoveEvent.java +++ b/src/main/java/baritone/event/events/RelativeMoveEvent.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.bot.event.events; +package baritone.event.events; -import baritone.bot.event.events.type.EventState; +import baritone.event.events.type.EventState; /** * @author Brady diff --git a/src/main/java/baritone/bot/event/events/RenderEvent.java b/src/main/java/baritone/event/events/RenderEvent.java similarity index 96% rename from src/main/java/baritone/bot/event/events/RenderEvent.java rename to src/main/java/baritone/event/events/RenderEvent.java index abe2bc73..73db95a7 100644 --- a/src/main/java/baritone/bot/event/events/RenderEvent.java +++ b/src/main/java/baritone/event/events/RenderEvent.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.event.events; +package baritone.event.events; /** * @author Brady diff --git a/src/main/java/baritone/bot/event/events/TickEvent.java b/src/main/java/baritone/event/events/TickEvent.java similarity index 93% rename from src/main/java/baritone/bot/event/events/TickEvent.java rename to src/main/java/baritone/event/events/TickEvent.java index 4fda101d..d45f7d4d 100644 --- a/src/main/java/baritone/bot/event/events/TickEvent.java +++ b/src/main/java/baritone/event/events/TickEvent.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -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 { diff --git a/src/main/java/baritone/bot/event/events/WorldEvent.java b/src/main/java/baritone/event/events/WorldEvent.java similarity index 94% rename from src/main/java/baritone/bot/event/events/WorldEvent.java rename to src/main/java/baritone/event/events/WorldEvent.java index bc79abd7..60bc660e 100644 --- a/src/main/java/baritone/bot/event/events/WorldEvent.java +++ b/src/main/java/baritone/event/events/WorldEvent.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -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; /** diff --git a/src/main/java/baritone/bot/event/events/type/Cancellable.java b/src/main/java/baritone/event/events/type/Cancellable.java similarity index 96% rename from src/main/java/baritone/bot/event/events/type/Cancellable.java rename to src/main/java/baritone/event/events/type/Cancellable.java index 3218384b..3d8f7536 100644 --- a/src/main/java/baritone/bot/event/events/type/Cancellable.java +++ b/src/main/java/baritone/event/events/type/Cancellable.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.event.events.type; +package baritone.event.events.type; /** * @author Brady diff --git a/src/main/java/baritone/bot/event/events/type/EventState.java b/src/main/java/baritone/event/events/type/EventState.java similarity index 96% rename from src/main/java/baritone/bot/event/events/type/EventState.java rename to src/main/java/baritone/event/events/type/EventState.java index 3a23019e..c0a6a863 100644 --- a/src/main/java/baritone/bot/event/events/type/EventState.java +++ b/src/main/java/baritone/event/events/type/EventState.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.event.events.type; +package baritone.event.events.type; /** * @author Brady diff --git a/src/main/java/baritone/bot/event/listener/AbstractGameEventListener.java b/src/main/java/baritone/event/listener/AbstractGameEventListener.java similarity index 97% rename from src/main/java/baritone/bot/event/listener/AbstractGameEventListener.java rename to src/main/java/baritone/event/listener/AbstractGameEventListener.java index 91bb183e..46cbeb65 100644 --- a/src/main/java/baritone/bot/event/listener/AbstractGameEventListener.java +++ b/src/main/java/baritone/event/listener/AbstractGameEventListener.java @@ -32,9 +32,9 @@ * along with Baritone. If not, see . */ -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 diff --git a/src/main/java/baritone/bot/event/listener/IGameEventListener.java b/src/main/java/baritone/event/listener/IGameEventListener.java similarity index 98% rename from src/main/java/baritone/bot/event/listener/IGameEventListener.java rename to src/main/java/baritone/event/listener/IGameEventListener.java index 260e6e9e..7d239133 100644 --- a/src/main/java/baritone/bot/event/listener/IGameEventListener.java +++ b/src/main/java/baritone/event/listener/IGameEventListener.java @@ -32,9 +32,9 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/launch/mixins/MixinEntity.java b/src/main/java/baritone/launch/mixins/MixinEntity.java index 3f98c70b..31b1e41b 100644 --- a/src/main/java/baritone/launch/mixins/MixinEntity.java +++ b/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; diff --git a/src/main/java/baritone/launch/mixins/MixinEntityPlayerSP.java b/src/main/java/baritone/launch/mixins/MixinEntityPlayerSP.java index 16849798..ea0896c5 100644 --- a/src/main/java/baritone/launch/mixins/MixinEntityPlayerSP.java +++ b/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; diff --git a/src/main/java/baritone/launch/mixins/MixinEntityRenderer.java b/src/main/java/baritone/launch/mixins/MixinEntityRenderer.java index 680ff1b8..a2cfe664 100644 --- a/src/main/java/baritone/launch/mixins/MixinEntityRenderer.java +++ b/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; diff --git a/src/main/java/baritone/launch/mixins/MixinGameSettings.java b/src/main/java/baritone/launch/mixins/MixinGameSettings.java index a1fdba43..2179affb 100755 --- a/src/main/java/baritone/launch/mixins/MixinGameSettings.java +++ b/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; diff --git a/src/main/java/baritone/launch/mixins/MixinGuiContainer.java b/src/main/java/baritone/launch/mixins/MixinGuiContainer.java index c2f3fd1d..6d37ab97 100755 --- a/src/main/java/baritone/launch/mixins/MixinGuiContainer.java +++ b/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; diff --git a/src/main/java/baritone/launch/mixins/MixinGuiScreen.java b/src/main/java/baritone/launch/mixins/MixinGuiScreen.java index d573924e..81bf1bf5 100755 --- a/src/main/java/baritone/launch/mixins/MixinGuiScreen.java +++ b/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; diff --git a/src/main/java/baritone/launch/mixins/MixinInventoryPlayer.java b/src/main/java/baritone/launch/mixins/MixinInventoryPlayer.java index 8e1b908b..24aff3cf 100644 --- a/src/main/java/baritone/launch/mixins/MixinInventoryPlayer.java +++ b/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; diff --git a/src/main/java/baritone/launch/mixins/MixinKeyBinding.java b/src/main/java/baritone/launch/mixins/MixinKeyBinding.java index 7b7cfcbf..085ddc74 100755 --- a/src/main/java/baritone/launch/mixins/MixinKeyBinding.java +++ b/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; diff --git a/src/main/java/baritone/launch/mixins/MixinMinecraft.java b/src/main/java/baritone/launch/mixins/MixinMinecraft.java index a69a18f4..1c14d179 100755 --- a/src/main/java/baritone/launch/mixins/MixinMinecraft.java +++ b/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 diff --git a/src/main/java/baritone/launch/mixins/MixinNetHandlerPlayClient.java b/src/main/java/baritone/launch/mixins/MixinNetHandlerPlayClient.java index cfad74aa..17d10240 100644 --- a/src/main/java/baritone/launch/mixins/MixinNetHandlerPlayClient.java +++ b/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; diff --git a/src/main/java/baritone/launch/mixins/MixinNetworkManager.java b/src/main/java/baritone/launch/mixins/MixinNetworkManager.java index 793748e2..63e302d7 100644 --- a/src/main/java/baritone/launch/mixins/MixinNetworkManager.java +++ b/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; diff --git a/src/main/java/baritone/launch/mixins/MixinWorldClient.java b/src/main/java/baritone/launch/mixins/MixinWorldClient.java index 5141fef0..da4b019f 100644 --- a/src/main/java/baritone/launch/mixins/MixinWorldClient.java +++ b/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; diff --git a/src/main/java/baritone/bot/pathing/calc/AStarPathFinder.java b/src/main/java/baritone/pathing/calc/AStarPathFinder.java similarity index 95% rename from src/main/java/baritone/bot/pathing/calc/AStarPathFinder.java rename to src/main/java/baritone/pathing/calc/AStarPathFinder.java index 6ed10270..d0577e16 100644 --- a/src/main/java/baritone/bot/pathing/calc/AStarPathFinder.java +++ b/src/main/java/baritone/pathing/calc/AStarPathFinder.java @@ -32,21 +32,21 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/calc/AbstractNodeCostSearch.java b/src/main/java/baritone/pathing/calc/AbstractNodeCostSearch.java similarity index 96% rename from src/main/java/baritone/bot/pathing/calc/AbstractNodeCostSearch.java rename to src/main/java/baritone/pathing/calc/AbstractNodeCostSearch.java index 5089dfc4..5414f89c 100644 --- a/src/main/java/baritone/bot/pathing/calc/AbstractNodeCostSearch.java +++ b/src/main/java/baritone/pathing/calc/AbstractNodeCostSearch.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/calc/IPathFinder.java b/src/main/java/baritone/pathing/calc/IPathFinder.java similarity index 94% rename from src/main/java/baritone/bot/pathing/calc/IPathFinder.java rename to src/main/java/baritone/pathing/calc/IPathFinder.java index 13aa3641..bbcc7bda 100644 --- a/src/main/java/baritone/bot/pathing/calc/IPathFinder.java +++ b/src/main/java/baritone/pathing/calc/IPathFinder.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/calc/Path.java b/src/main/java/baritone/pathing/calc/Path.java similarity index 96% rename from src/main/java/baritone/bot/pathing/calc/Path.java rename to src/main/java/baritone/pathing/calc/Path.java index 3df9e387..96c8950e 100644 --- a/src/main/java/baritone/bot/pathing/calc/Path.java +++ b/src/main/java/baritone/pathing/calc/Path.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/calc/PathNode.java b/src/main/java/baritone/pathing/calc/PathNode.java similarity index 94% rename from src/main/java/baritone/bot/pathing/calc/PathNode.java rename to src/main/java/baritone/pathing/calc/PathNode.java index 275d1361..314c996b 100644 --- a/src/main/java/baritone/bot/pathing/calc/PathNode.java +++ b/src/main/java/baritone/pathing/calc/PathNode.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -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. diff --git a/src/main/java/baritone/bot/pathing/calc/openset/BinaryHeapOpenSet.java b/src/main/java/baritone/pathing/calc/openset/BinaryHeapOpenSet.java similarity index 97% rename from src/main/java/baritone/bot/pathing/calc/openset/BinaryHeapOpenSet.java rename to src/main/java/baritone/pathing/calc/openset/BinaryHeapOpenSet.java index f172cdd8..80c3965a 100644 --- a/src/main/java/baritone/bot/pathing/calc/openset/BinaryHeapOpenSet.java +++ b/src/main/java/baritone/pathing/calc/openset/BinaryHeapOpenSet.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/calc/openset/IOpenSet.java b/src/main/java/baritone/pathing/calc/openset/IOpenSet.java similarity index 94% rename from src/main/java/baritone/bot/pathing/calc/openset/IOpenSet.java rename to src/main/java/baritone/pathing/calc/openset/IOpenSet.java index e3160493..e43664c8 100644 --- a/src/main/java/baritone/bot/pathing/calc/openset/IOpenSet.java +++ b/src/main/java/baritone/pathing/calc/openset/IOpenSet.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -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 diff --git a/src/main/java/baritone/bot/pathing/calc/openset/LinkedListOpenSet.java b/src/main/java/baritone/pathing/calc/openset/LinkedListOpenSet.java similarity index 96% rename from src/main/java/baritone/bot/pathing/calc/openset/LinkedListOpenSet.java rename to src/main/java/baritone/pathing/calc/openset/LinkedListOpenSet.java index 4d6be973..49ee23d7 100644 --- a/src/main/java/baritone/bot/pathing/calc/openset/LinkedListOpenSet.java +++ b/src/main/java/baritone/pathing/calc/openset/LinkedListOpenSet.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -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. diff --git a/src/main/java/baritone/bot/pathing/goals/Goal.java b/src/main/java/baritone/pathing/goals/Goal.java similarity index 94% rename from src/main/java/baritone/bot/pathing/goals/Goal.java rename to src/main/java/baritone/pathing/goals/Goal.java index 63aa9118..4057a733 100644 --- a/src/main/java/baritone/bot/pathing/goals/Goal.java +++ b/src/main/java/baritone/pathing/goals/Goal.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -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; /** diff --git a/src/main/java/baritone/bot/pathing/goals/GoalBlock.java b/src/main/java/baritone/pathing/goals/GoalBlock.java similarity index 98% rename from src/main/java/baritone/bot/pathing/goals/GoalBlock.java rename to src/main/java/baritone/pathing/goals/GoalBlock.java index 1efb7aab..78d7b87d 100644 --- a/src/main/java/baritone/bot/pathing/goals/GoalBlock.java +++ b/src/main/java/baritone/pathing/goals/GoalBlock.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.pathing.goals; +package baritone.pathing.goals; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/baritone/bot/pathing/goals/GoalComposite.java b/src/main/java/baritone/pathing/goals/GoalComposite.java similarity index 98% rename from src/main/java/baritone/bot/pathing/goals/GoalComposite.java rename to src/main/java/baritone/pathing/goals/GoalComposite.java index ad0036ce..558e124e 100644 --- a/src/main/java/baritone/bot/pathing/goals/GoalComposite.java +++ b/src/main/java/baritone/pathing/goals/GoalComposite.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.pathing.goals; +package baritone.pathing.goals; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/baritone/bot/pathing/goals/GoalGetToBlock.java b/src/main/java/baritone/pathing/goals/GoalGetToBlock.java similarity index 97% rename from src/main/java/baritone/bot/pathing/goals/GoalGetToBlock.java rename to src/main/java/baritone/pathing/goals/GoalGetToBlock.java index e06e2674..daf7fc9d 100644 --- a/src/main/java/baritone/bot/pathing/goals/GoalGetToBlock.java +++ b/src/main/java/baritone/pathing/goals/GoalGetToBlock.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.pathing.goals; +package baritone.pathing.goals; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/baritone/bot/pathing/goals/GoalRunAway.java b/src/main/java/baritone/pathing/goals/GoalRunAway.java similarity index 98% rename from src/main/java/baritone/bot/pathing/goals/GoalRunAway.java rename to src/main/java/baritone/pathing/goals/GoalRunAway.java index 7580925c..620794d2 100644 --- a/src/main/java/baritone/bot/pathing/goals/GoalRunAway.java +++ b/src/main/java/baritone/pathing/goals/GoalRunAway.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.pathing.goals; +package baritone.pathing.goals; import java.util.Arrays; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/baritone/bot/pathing/goals/GoalTwoBlocks.java b/src/main/java/baritone/pathing/goals/GoalTwoBlocks.java similarity index 98% rename from src/main/java/baritone/bot/pathing/goals/GoalTwoBlocks.java rename to src/main/java/baritone/pathing/goals/GoalTwoBlocks.java index 6a30eafd..70690fa3 100644 --- a/src/main/java/baritone/bot/pathing/goals/GoalTwoBlocks.java +++ b/src/main/java/baritone/pathing/goals/GoalTwoBlocks.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.pathing.goals; +package baritone.pathing.goals; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/baritone/bot/pathing/goals/GoalXZ.java b/src/main/java/baritone/pathing/goals/GoalXZ.java similarity index 96% rename from src/main/java/baritone/bot/pathing/goals/GoalXZ.java rename to src/main/java/baritone/pathing/goals/GoalXZ.java index b78a0de8..d8153b00 100644 --- a/src/main/java/baritone/bot/pathing/goals/GoalXZ.java +++ b/src/main/java/baritone/pathing/goals/GoalXZ.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/goals/GoalYLevel.java b/src/main/java/baritone/pathing/goals/GoalYLevel.java similarity index 97% rename from src/main/java/baritone/bot/pathing/goals/GoalYLevel.java rename to src/main/java/baritone/pathing/goals/GoalYLevel.java index 3fdb5fee..7a437f9d 100644 --- a/src/main/java/baritone/bot/pathing/goals/GoalYLevel.java +++ b/src/main/java/baritone/pathing/goals/GoalYLevel.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.pathing.goals; +package baritone.pathing.goals; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/baritone/bot/pathing/movement/ActionCosts.java b/src/main/java/baritone/pathing/movement/ActionCosts.java similarity index 97% rename from src/main/java/baritone/bot/pathing/movement/ActionCosts.java rename to src/main/java/baritone/pathing/movement/ActionCosts.java index 3d9667f3..c9bbd361 100644 --- a/src/main/java/baritone/bot/pathing/movement/ActionCosts.java +++ b/src/main/java/baritone/pathing/movement/ActionCosts.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.pathing.movement; +package baritone.pathing.movement; public interface ActionCosts extends ActionCostsButOnlyTheOnesThatMakeMickeyDieInside { diff --git a/src/main/java/baritone/bot/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInside.java b/src/main/java/baritone/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInside.java similarity index 98% rename from src/main/java/baritone/bot/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInside.java rename to src/main/java/baritone/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInside.java index e69dce85..c2481cda 100644 --- a/src/main/java/baritone/bot/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInside.java +++ b/src/main/java/baritone/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInside.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.pathing.movement; +package baritone.pathing.movement; public interface ActionCostsButOnlyTheOnesThatMakeMickeyDieInside { double[] FALL_N_BLOCKS_COST = generateFallNBlocksCost(); diff --git a/src/main/java/baritone/bot/pathing/movement/CalculationContext.java b/src/main/java/baritone/pathing/movement/CalculationContext.java similarity index 95% rename from src/main/java/baritone/bot/pathing/movement/CalculationContext.java rename to src/main/java/baritone/pathing/movement/CalculationContext.java index 6bd09012..2aca1f82 100644 --- a/src/main/java/baritone/bot/pathing/movement/CalculationContext.java +++ b/src/main/java/baritone/pathing/movement/CalculationContext.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/movement/Movement.java b/src/main/java/baritone/pathing/movement/Movement.java similarity index 95% rename from src/main/java/baritone/bot/pathing/movement/Movement.java rename to src/main/java/baritone/pathing/movement/Movement.java index b2c77a8f..e461d701 100644 --- a/src/main/java/baritone/bot/pathing/movement/Movement.java +++ b/src/main/java/baritone/pathing/movement/Movement.java @@ -15,16 +15,16 @@ * along with Baritone. If not, see . */ -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 { diff --git a/src/main/java/baritone/bot/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java similarity index 97% rename from src/main/java/baritone/bot/pathing/movement/MovementHelper.java rename to src/main/java/baritone/pathing/movement/MovementHelper.java index 0d239b15..26a026d0 100644 --- a/src/main/java/baritone/bot/pathing/movement/MovementHelper.java +++ b/src/main/java/baritone/pathing/movement/MovementHelper.java @@ -15,14 +15,14 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/movement/MovementState.java b/src/main/java/baritone/pathing/movement/MovementState.java similarity index 96% rename from src/main/java/baritone/bot/pathing/movement/MovementState.java rename to src/main/java/baritone/pathing/movement/MovementState.java index 2d2d3497..057d22bb 100644 --- a/src/main/java/baritone/bot/pathing/movement/MovementState.java +++ b/src/main/java/baritone/pathing/movement/MovementState.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/movement/movements/MovementAscend.java b/src/main/java/baritone/pathing/movement/movements/MovementAscend.java similarity index 94% rename from src/main/java/baritone/bot/pathing/movement/movements/MovementAscend.java rename to src/main/java/baritone/pathing/movement/movements/MovementAscend.java index 5f180fdf..e7ecce25 100644 --- a/src/main/java/baritone/bot/pathing/movement/movements/MovementAscend.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementAscend.java @@ -15,17 +15,17 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/movement/movements/MovementDescend.java b/src/main/java/baritone/pathing/movement/movements/MovementDescend.java similarity index 90% rename from src/main/java/baritone/bot/pathing/movement/movements/MovementDescend.java rename to src/main/java/baritone/pathing/movement/movements/MovementDescend.java index b852318d..97c55f63 100644 --- a/src/main/java/baritone/bot/pathing/movement/movements/MovementDescend.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementDescend.java @@ -15,15 +15,15 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/movement/movements/MovementDiagonal.java b/src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java similarity index 95% rename from src/main/java/baritone/bot/pathing/movement/movements/MovementDiagonal.java rename to src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java index 84d18da5..274f23c6 100644 --- a/src/main/java/baritone/bot/pathing/movement/movements/MovementDiagonal.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java @@ -15,13 +15,13 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/movement/movements/MovementDownward.java b/src/main/java/baritone/pathing/movement/movements/MovementDownward.java similarity index 89% rename from src/main/java/baritone/bot/pathing/movement/movements/MovementDownward.java rename to src/main/java/baritone/pathing/movement/movements/MovementDownward.java index dcf33028..2490fdd1 100644 --- a/src/main/java/baritone/bot/pathing/movement/movements/MovementDownward.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementDownward.java @@ -15,13 +15,13 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/movement/movements/MovementFall.java b/src/main/java/baritone/pathing/movement/movements/MovementFall.java similarity index 90% rename from src/main/java/baritone/bot/pathing/movement/movements/MovementFall.java rename to src/main/java/baritone/pathing/movement/movements/MovementFall.java index f98aca7d..6d96b365 100644 --- a/src/main/java/baritone/bot/pathing/movement/movements/MovementFall.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementFall.java @@ -15,20 +15,20 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/movement/movements/MovementPillar.java b/src/main/java/baritone/pathing/movement/movements/MovementPillar.java similarity index 94% rename from src/main/java/baritone/bot/pathing/movement/movements/MovementPillar.java rename to src/main/java/baritone/pathing/movement/movements/MovementPillar.java index 9c1cd885..890637b0 100644 --- a/src/main/java/baritone/bot/pathing/movement/movements/MovementPillar.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementPillar.java @@ -15,16 +15,16 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/movement/movements/MovementTraverse.java b/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java similarity index 96% rename from src/main/java/baritone/bot/pathing/movement/movements/MovementTraverse.java rename to src/main/java/baritone/pathing/movement/movements/MovementTraverse.java index f01eb771..105c1997 100644 --- a/src/main/java/baritone/bot/pathing/movement/movements/MovementTraverse.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java @@ -15,16 +15,16 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/path/CutoffPath.java b/src/main/java/baritone/pathing/path/CutoffPath.java similarity index 91% rename from src/main/java/baritone/bot/pathing/path/CutoffPath.java rename to src/main/java/baritone/pathing/path/CutoffPath.java index 2b9516b1..51618918 100644 --- a/src/main/java/baritone/bot/pathing/path/CutoffPath.java +++ b/src/main/java/baritone/pathing/path/CutoffPath.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/path/IPath.java b/src/main/java/baritone/pathing/path/IPath.java similarity index 94% rename from src/main/java/baritone/bot/pathing/path/IPath.java rename to src/main/java/baritone/pathing/path/IPath.java index ae8b7e4b..c01c7f53 100644 --- a/src/main/java/baritone/bot/pathing/path/IPath.java +++ b/src/main/java/baritone/pathing/path/IPath.java @@ -15,14 +15,14 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/pathing/path/PathExecutor.java b/src/main/java/baritone/pathing/path/PathExecutor.java similarity index 96% rename from src/main/java/baritone/bot/pathing/path/PathExecutor.java rename to src/main/java/baritone/pathing/path/PathExecutor.java index 3c3fd929..dee3458a 100644 --- a/src/main/java/baritone/bot/pathing/path/PathExecutor.java +++ b/src/main/java/baritone/pathing/path/PathExecutor.java @@ -15,15 +15,15 @@ * along with Baritone. If not, see . */ -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 diff --git a/src/main/java/baritone/bot/utils/BlockStateInterface.java b/src/main/java/baritone/utils/BlockStateInterface.java similarity index 96% rename from src/main/java/baritone/bot/utils/BlockStateInterface.java rename to src/main/java/baritone/utils/BlockStateInterface.java index 15639c33..1d084cc1 100644 --- a/src/main/java/baritone/bot/utils/BlockStateInterface.java +++ b/src/main/java/baritone/utils/BlockStateInterface.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/utils/ExampleBaritoneControl.java b/src/main/java/baritone/utils/ExampleBaritoneControl.java similarity index 91% rename from src/main/java/baritone/bot/utils/ExampleBaritoneControl.java rename to src/main/java/baritone/utils/ExampleBaritoneControl.java index 0fc62b71..63a3110c 100644 --- a/src/main/java/baritone/bot/utils/ExampleBaritoneControl.java +++ b/src/main/java/baritone/utils/ExampleBaritoneControl.java @@ -15,22 +15,22 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/utils/Helper.java b/src/main/java/baritone/utils/Helper.java similarity index 95% rename from src/main/java/baritone/bot/utils/Helper.java rename to src/main/java/baritone/utils/Helper.java index 8571f23e..c637e48f 100755 --- a/src/main/java/baritone/bot/utils/Helper.java +++ b/src/main/java/baritone/utils/Helper.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/utils/InputOverrideHandler.java b/src/main/java/baritone/utils/InputOverrideHandler.java similarity index 96% rename from src/main/java/baritone/bot/utils/InputOverrideHandler.java rename to src/main/java/baritone/utils/InputOverrideHandler.java index 2e1f15a9..18426548 100755 --- a/src/main/java/baritone/bot/utils/InputOverrideHandler.java +++ b/src/main/java/baritone/utils/InputOverrideHandler.java @@ -32,7 +32,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.utils; +package baritone.utils; import net.minecraft.client.settings.KeyBinding; import org.lwjgl.input.Keyboard; diff --git a/src/main/java/baritone/bot/utils/PathRenderer.java b/src/main/java/baritone/utils/PathRenderer.java similarity index 97% rename from src/main/java/baritone/bot/utils/PathRenderer.java rename to src/main/java/baritone/utils/PathRenderer.java index bd17e33b..04a95f1e 100644 --- a/src/main/java/baritone/bot/utils/PathRenderer.java +++ b/src/main/java/baritone/utils/PathRenderer.java @@ -15,14 +15,14 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/utils/Rotation.java b/src/main/java/baritone/utils/Rotation.java similarity index 96% rename from src/main/java/baritone/bot/utils/Rotation.java rename to src/main/java/baritone/utils/Rotation.java index 76f2095d..762d9cab 100644 --- a/src/main/java/baritone/bot/utils/Rotation.java +++ b/src/main/java/baritone/utils/Rotation.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.utils; +package baritone.utils; import net.minecraft.util.Tuple; diff --git a/src/main/java/baritone/bot/utils/ToolSet.java b/src/main/java/baritone/utils/ToolSet.java similarity index 97% rename from src/main/java/baritone/bot/utils/ToolSet.java rename to src/main/java/baritone/utils/ToolSet.java index d75c3c03..f5f14c8f 100644 --- a/src/main/java/baritone/bot/utils/ToolSet.java +++ b/src/main/java/baritone/utils/ToolSet.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/utils/Utils.java b/src/main/java/baritone/utils/Utils.java similarity index 96% rename from src/main/java/baritone/bot/utils/Utils.java rename to src/main/java/baritone/utils/Utils.java index e3fff2f8..eea18643 100755 --- a/src/main/java/baritone/bot/utils/Utils.java +++ b/src/main/java/baritone/utils/Utils.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.utils; +package baritone.utils; import net.minecraft.block.BlockFire; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/baritone/bot/utils/interfaces/Toggleable.java b/src/main/java/baritone/utils/interfaces/Toggleable.java similarity index 96% rename from src/main/java/baritone/bot/utils/interfaces/Toggleable.java rename to src/main/java/baritone/utils/interfaces/Toggleable.java index e0d42958..ba23bd34 100644 --- a/src/main/java/baritone/bot/utils/interfaces/Toggleable.java +++ b/src/main/java/baritone/utils/interfaces/Toggleable.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.utils.interfaces; +package baritone.utils.interfaces; /** * @author Brady diff --git a/src/main/java/baritone/bot/utils/pathing/BetterBlockPos.java b/src/main/java/baritone/utils/pathing/BetterBlockPos.java similarity index 99% rename from src/main/java/baritone/bot/utils/pathing/BetterBlockPos.java rename to src/main/java/baritone/utils/pathing/BetterBlockPos.java index 5d09750c..93512984 100644 --- a/src/main/java/baritone/bot/utils/pathing/BetterBlockPos.java +++ b/src/main/java/baritone/utils/pathing/BetterBlockPos.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.utils.pathing; +package baritone.utils.pathing; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/baritone/bot/utils/pathing/IBlockTypeAccess.java b/src/main/java/baritone/utils/pathing/IBlockTypeAccess.java similarity index 93% rename from src/main/java/baritone/bot/utils/pathing/IBlockTypeAccess.java rename to src/main/java/baritone/utils/pathing/IBlockTypeAccess.java index 69b46a41..2bd29cfd 100644 --- a/src/main/java/baritone/bot/utils/pathing/IBlockTypeAccess.java +++ b/src/main/java/baritone/utils/pathing/IBlockTypeAccess.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/main/java/baritone/bot/utils/pathing/PathingBlockType.java b/src/main/java/baritone/utils/pathing/PathingBlockType.java similarity index 97% rename from src/main/java/baritone/bot/utils/pathing/PathingBlockType.java rename to src/main/java/baritone/utils/pathing/PathingBlockType.java index 4096b6e0..a05b0b2b 100644 --- a/src/main/java/baritone/bot/utils/pathing/PathingBlockType.java +++ b/src/main/java/baritone/utils/pathing/PathingBlockType.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.utils.pathing; +package baritone.utils.pathing; /** * @author Brady diff --git a/src/test/java/baritone/bot/pathing/calc/openset/OpenSetsTest.java b/src/test/java/baritone/pathing/calc/openset/OpenSetsTest.java similarity index 97% rename from src/test/java/baritone/bot/pathing/calc/openset/OpenSetsTest.java rename to src/test/java/baritone/pathing/calc/openset/OpenSetsTest.java index 50277bd4..afdebfdb 100644 --- a/src/test/java/baritone/bot/pathing/calc/openset/OpenSetsTest.java +++ b/src/test/java/baritone/pathing/calc/openset/OpenSetsTest.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -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; diff --git a/src/test/java/baritone/bot/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInsideTest.java b/src/test/java/baritone/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInsideTest.java similarity index 93% rename from src/test/java/baritone/bot/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInsideTest.java rename to src/test/java/baritone/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInsideTest.java index 817e5a58..50ba6245 100644 --- a/src/test/java/baritone/bot/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInsideTest.java +++ b/src/test/java/baritone/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInsideTest.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -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 { diff --git a/src/test/java/baritone/bot/utils/pathing/BetterBlockPosTest.java b/src/test/java/baritone/utils/pathing/BetterBlockPosTest.java similarity index 98% rename from src/test/java/baritone/bot/utils/pathing/BetterBlockPosTest.java rename to src/test/java/baritone/utils/pathing/BetterBlockPosTest.java index b70339a9..381060f4 100644 --- a/src/test/java/baritone/bot/utils/pathing/BetterBlockPosTest.java +++ b/src/test/java/baritone/utils/pathing/BetterBlockPosTest.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.bot.utils.pathing; +package baritone.utils.pathing; import net.minecraft.util.math.BlockPos; import org.junit.Test;