0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cherry pick refactor

Browse Source
This commit is contained in:
Leijurv 2018-08-22 13:15:56 -07:00
parent c7387662f5
commit a2f539353b
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
85 changed files with 339 additions and 323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/baritone/bot/Baritone.java → src/main/java/baritone/Baritone.java
View File

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

19
src/main/java/baritone/bot/Settings.java → src/main/java/baritone/Settings.java
View File

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

8
src/main/java/baritone/bot/behavior/Behavior.java → src/main/java/baritone/behavior/Behavior.java
View File

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

16
src/main/java/baritone/bot/behavior/impl/LookBehavior.java → src/main/java/baritone/behavior/impl/LookBehavior.java
View File

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

12
src/main/java/baritone/bot/behavior/impl/LookBehaviorUtils.java → src/main/java/baritone/behavior/impl/LookBehaviorUtils.java
View File

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

10
src/main/java/baritone/bot/behavior/impl/MemoryBehavior.java → src/main/java/baritone/behavior/impl/MemoryBehavior.java
View File

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

32
src/main/java/baritone/bot/behavior/impl/PathingBehavior.java → src/main/java/baritone/behavior/impl/PathingBehavior.java
View File

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

6
src/main/java/baritone/bot/chunk/CachedChunk.java → src/main/java/baritone/chunk/CachedChunk.java
View File

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

4
src/main/java/baritone/bot/chunk/CachedRegion.java → src/main/java/baritone/chunk/CachedRegion.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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 net.minecraft.block.state.IBlockState;
import java.io.*; import java.io.*;

4
src/main/java/baritone/bot/chunk/CachedWorld.java → src/main/java/baritone/chunk/CachedWorld.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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.Long2ObjectMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;

4
src/main/java/baritone/bot/chunk/CachedWorldProvider.java → src/main/java/baritone/chunk/CachedWorldProvider.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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.IAnvilChunkLoader;
import baritone.launch.mixins.accessor.IChunkProviderServer; import baritone.launch.mixins.accessor.IChunkProviderServer;
import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.multiplayer.WorldClient;

10
src/main/java/baritone/bot/chunk/ChunkPacker.java → src/main/java/baritone/chunk/ChunkPacker.java
View File

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

18
src/main/java/baritone/bot/event/GameEventHandler.java → src/main/java/baritone/event/GameEventHandler.java
View File

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

4
src/main/java/baritone/bot/event/events/ChatEvent.java → src/main/java/baritone/event/events/ChatEvent.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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 * @author Brady

4
src/main/java/baritone/bot/event/events/ChunkEvent.java → src/main/java/baritone/event/events/ChunkEvent.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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 * @author Brady

4
src/main/java/baritone/bot/event/events/ItemSlotEvent.java → src/main/java/baritone/event/events/ItemSlotEvent.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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. * Called in some cases where a player's inventory has it's current slot queried.

4
src/main/java/baritone/bot/event/events/PacketEvent.java → src/main/java/baritone/event/events/PacketEvent.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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; import net.minecraft.network.Packet;
/** /**

4
src/main/java/baritone/bot/event/events/PlayerUpdateEvent.java → src/main/java/baritone/event/events/PlayerUpdateEvent.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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 * @author Brady

4
src/main/java/baritone/bot/event/events/RelativeMoveEvent.java → src/main/java/baritone/event/events/RelativeMoveEvent.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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 * @author Brady

2
src/main/java/baritone/bot/event/events/RenderEvent.java → src/main/java/baritone/event/events/RenderEvent.java
View File

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

4
src/main/java/baritone/bot/event/events/TickEvent.java → src/main/java/baritone/event/events/TickEvent.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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 { public final class TickEvent {

4
src/main/java/baritone/bot/event/events/WorldEvent.java → src/main/java/baritone/event/events/WorldEvent.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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; import net.minecraft.client.multiplayer.WorldClient;
/** /**

2
src/main/java/baritone/bot/event/events/type/Cancellable.java → src/main/java/baritone/event/events/type/Cancellable.java
View File

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

2
src/main/java/baritone/bot/event/events/type/EventState.java → src/main/java/baritone/event/events/type/EventState.java
View File

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

4
src/main/java/baritone/bot/event/listener/AbstractGameEventListener.java → src/main/java/baritone/event/listener/AbstractGameEventListener.java
View File

@ -32,9 +32,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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 * An implementation of {@link IGameEventListener} that has all methods

4
src/main/java/baritone/bot/event/listener/IGameEventListener.java → src/main/java/baritone/event/listener/IGameEventListener.java
View File

@ -32,9 +32,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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 io.netty.util.concurrent.GenericFutureListener;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;

6
src/main/java/baritone/launch/mixins/MixinEntity.java
View File

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

8
src/main/java/baritone/launch/mixins/MixinEntityPlayerSP.java
View File

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

4
src/main/java/baritone/launch/mixins/MixinEntityRenderer.java
View File

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

2
src/main/java/baritone/launch/mixins/MixinGameSettings.java
View File

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

2
src/main/java/baritone/launch/mixins/MixinGuiContainer.java
View File

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

2
src/main/java/baritone/launch/mixins/MixinGuiScreen.java
View File

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

4
src/main/java/baritone/launch/mixins/MixinInventoryPlayer.java
View File

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

2
src/main/java/baritone/launch/mixins/MixinKeyBinding.java
View File

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

13
src/main/java/baritone/launch/mixins/MixinMinecraft.java
View File

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

6
src/main/java/baritone/launch/mixins/MixinNetHandlerPlayClient.java
View File

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

6
src/main/java/baritone/launch/mixins/MixinNetworkManager.java
View File

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

6
src/main/java/baritone/launch/mixins/MixinWorldClient.java
View File

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

28
src/main/java/baritone/bot/pathing/calc/AStarPathFinder.java → src/main/java/baritone/pathing/calc/AStarPathFinder.java
View File

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

8
src/main/java/baritone/bot/pathing/calc/AbstractNodeCostSearch.java → src/main/java/baritone/pathing/calc/AbstractNodeCostSearch.java
View File

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

6
src/main/java/baritone/bot/pathing/calc/IPathFinder.java → src/main/java/baritone/pathing/calc/IPathFinder.java
View File

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

8
src/main/java/baritone/bot/pathing/calc/Path.java → src/main/java/baritone/pathing/calc/Path.java
View File

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

8
src/main/java/baritone/bot/pathing/calc/PathNode.java → src/main/java/baritone/pathing/calc/PathNode.java
View File

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

4
src/main/java/baritone/bot/pathing/calc/openset/BinaryHeapOpenSet.java → src/main/java/baritone/pathing/calc/openset/BinaryHeapOpenSet.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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; import java.util.Arrays;

4
src/main/java/baritone/bot/pathing/calc/openset/IOpenSet.java → src/main/java/baritone/pathing/calc/openset/IOpenSet.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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 * An open set for A* or similar graph search algorithm

4
src/main/java/baritone/bot/pathing/calc/openset/LinkedListOpenSet.java → src/main/java/baritone/pathing/calc/openset/LinkedListOpenSet.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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. * A linked list implementation of an open set. This is the original implementation from MineBot.

4
src/main/java/baritone/bot/pathing/goals/Goal.java → src/main/java/baritone/pathing/goals/Goal.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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; import net.minecraft.util.math.BlockPos;
/** /**

2
src/main/java/baritone/bot/pathing/goals/GoalBlock.java → src/main/java/baritone/pathing/goals/GoalBlock.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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; import net.minecraft.util.math.BlockPos;

2
src/main/java/baritone/bot/pathing/goals/GoalComposite.java → src/main/java/baritone/pathing/goals/GoalComposite.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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.Arrays;
import java.util.Collection; import java.util.Collection;

2
src/main/java/baritone/bot/pathing/goals/GoalGetToBlock.java → src/main/java/baritone/pathing/goals/GoalGetToBlock.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;

2
src/main/java/baritone/bot/pathing/goals/GoalRunAway.java → src/main/java/baritone/pathing/goals/GoalRunAway.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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.Arrays;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;

2
src/main/java/baritone/bot/pathing/goals/GoalTwoBlocks.java → src/main/java/baritone/pathing/goals/GoalTwoBlocks.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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; import net.minecraft.util.math.BlockPos;

6
src/main/java/baritone/bot/pathing/goals/GoalXZ.java → src/main/java/baritone/pathing/goals/GoalXZ.java
View File

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

2
src/main/java/baritone/bot/pathing/goals/GoalYLevel.java → src/main/java/baritone/pathing/goals/GoalYLevel.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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; import net.minecraft.util.math.BlockPos;

2
src/main/java/baritone/bot/pathing/movement/ActionCosts.java → src/main/java/baritone/pathing/movement/ActionCosts.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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 { public interface ActionCosts extends ActionCostsButOnlyTheOnesThatMakeMickeyDieInside {

2
src/main/java/baritone/bot/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInside.java → src/main/java/baritone/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInside.java
View File

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

8
src/main/java/baritone/bot/pathing/movement/CalculationContext.java → src/main/java/baritone/pathing/movement/CalculationContext.java
View File

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

20
src/main/java/baritone/bot/pathing/movement/Movement.java → src/main/java/baritone/pathing/movement/Movement.java
View File

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

14
src/main/java/baritone/bot/pathing/movement/MovementHelper.java → src/main/java/baritone/pathing/movement/MovementHelper.java
View File

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

6
src/main/java/baritone/bot/pathing/movement/MovementState.java → src/main/java/baritone/pathing/movement/MovementState.java
View File

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

20
src/main/java/baritone/bot/pathing/movement/movements/MovementAscend.java → src/main/java/baritone/pathing/movement/movements/MovementAscend.java
View File

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

16
src/main/java/baritone/bot/pathing/movement/movements/MovementDescend.java → src/main/java/baritone/pathing/movement/movements/MovementDescend.java
View File

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

12
src/main/java/baritone/bot/pathing/movement/movements/MovementDiagonal.java → src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java
View File

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

12
src/main/java/baritone/bot/pathing/movement/movements/MovementDownward.java → src/main/java/baritone/pathing/movement/movements/MovementDownward.java
View File

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

26
src/main/java/baritone/bot/pathing/movement/movements/MovementFall.java → src/main/java/baritone/pathing/movement/movements/MovementFall.java
View File

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

18
src/main/java/baritone/bot/pathing/movement/movements/MovementPillar.java → src/main/java/baritone/pathing/movement/movements/MovementPillar.java
View File

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

18
src/main/java/baritone/bot/pathing/movement/movements/MovementTraverse.java → src/main/java/baritone/pathing/movement/movements/MovementTraverse.java
View File

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

6
src/main/java/baritone/bot/pathing/path/CutoffPath.java → src/main/java/baritone/pathing/path/CutoffPath.java
View File

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

14
src/main/java/baritone/bot/pathing/path/IPath.java → src/main/java/baritone/pathing/path/IPath.java
View File

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

18
src/main/java/baritone/bot/pathing/path/PathExecutor.java → src/main/java/baritone/pathing/path/PathExecutor.java
View File

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

8
src/main/java/baritone/bot/utils/BlockStateInterface.java → src/main/java/baritone/utils/BlockStateInterface.java
View File

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

30
src/main/java/baritone/bot/utils/ExampleBaritoneControl.java → src/main/java/baritone/utils/ExampleBaritoneControl.java
View File

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

4
src/main/java/baritone/bot/utils/Helper.java → src/main/java/baritone/utils/Helper.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.client.gui.GuiNewChat; import net.minecraft.client.gui.GuiNewChat;

2
src/main/java/baritone/bot/utils/InputOverrideHandler.java → src/main/java/baritone/utils/InputOverrideHandler.java
View File

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

14
src/main/java/baritone/bot/utils/PathRenderer.java → src/main/java/baritone/utils/PathRenderer.java
View File

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

2
src/main/java/baritone/bot/utils/Rotation.java → src/main/java/baritone/utils/Rotation.java
View File

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

8
src/main/java/baritone/bot/utils/ToolSet.java → src/main/java/baritone/utils/ToolSet.java
View File

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

2
src/main/java/baritone/bot/utils/Utils.java → src/main/java/baritone/utils/Utils.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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.BlockFire;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;

2
src/main/java/baritone/bot/utils/interfaces/Toggleable.java → src/main/java/baritone/utils/interfaces/Toggleable.java
View File

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

2
src/main/java/baritone/bot/utils/pathing/BetterBlockPos.java → src/main/java/baritone/utils/pathing/BetterBlockPos.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;

4
src/main/java/baritone/bot/utils/pathing/IBlockTypeAccess.java → src/main/java/baritone/utils/pathing/IBlockTypeAccess.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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.block.state.IBlockState;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;

2
src/main/java/baritone/bot/utils/pathing/PathingBlockType.java → src/main/java/baritone/utils/pathing/PathingBlockType.java
View File

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

8
src/test/java/baritone/bot/pathing/calc/openset/OpenSetsTest.java → src/test/java/baritone/pathing/calc/openset/OpenSetsTest.java
View File

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

4
src/test/java/baritone/bot/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInsideTest.java → src/test/java/baritone/pathing/movement/ActionCostsButOnlyTheOnesThatMakeMickeyDieInsideTest.java
View File

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

2
src/test/java/baritone/bot/utils/pathing/BetterBlockPosTest.java → src/test/java/baritone/utils/pathing/BetterBlockPosTest.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>. * 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 net.minecraft.util.math.BlockPos;
import org.junit.Test; import org.junit.Test;