From 43b7aece742180ed268303dd1b4978f7218cfb96 Mon Sep 17 00:00:00 2001 From: Brady Date: Mon, 27 Aug 2018 19:37:21 -0500 Subject: [PATCH] Move events to api package --- src/main/java/baritone/Baritone.java | 2 +- .../java/baritone/{ => api}/event/GameEventHandler.java | 8 ++++---- .../{ => api}/event/events/BlockInteractEvent.java | 2 +- .../java/baritone/{ => api}/event/events/ChatEvent.java | 4 ++-- .../java/baritone/{ => api}/event/events/ChunkEvent.java | 4 ++-- .../baritone/{ => api}/event/events/ItemSlotEvent.java | 4 ++-- .../java/baritone/{ => api}/event/events/PacketEvent.java | 4 ++-- .../java/baritone/{ => api}/event/events/PathEvent.java | 2 +- .../{ => api}/event/events/PlayerUpdateEvent.java | 4 ++-- .../{ => api}/event/events/RelativeMoveEvent.java | 4 ++-- .../java/baritone/{ => api}/event/events/RenderEvent.java | 2 +- .../java/baritone/{ => api}/event/events/TickEvent.java | 4 ++-- .../java/baritone/{ => api}/event/events/WorldEvent.java | 4 ++-- .../baritone/{ => api}/event/events/type/Cancellable.java | 2 +- .../baritone/{ => api}/event/events/type/EventState.java | 2 +- .../event/listener/AbstractGameEventListener.java | 4 ++-- .../{ => api}/event/listener/IGameEventListener.java | 4 ++-- src/main/java/baritone/behavior/Behavior.java | 2 +- .../baritone/behavior/impl/LocationTrackingBehavior.java | 2 +- src/main/java/baritone/behavior/impl/LookBehavior.java | 5 ++--- src/main/java/baritone/behavior/impl/MemoryBehavior.java | 6 +++--- src/main/java/baritone/behavior/impl/PathingBehavior.java | 8 ++++---- src/main/java/baritone/launch/mixins/MixinEntity.java | 4 ++-- .../java/baritone/launch/mixins/MixinEntityPlayerSP.java | 6 +++--- .../java/baritone/launch/mixins/MixinEntityRenderer.java | 2 +- .../java/baritone/launch/mixins/MixinInventoryPlayer.java | 2 +- src/main/java/baritone/launch/mixins/MixinMinecraft.java | 8 ++++---- .../baritone/launch/mixins/MixinNetHandlerPlayClient.java | 4 ++-- .../java/baritone/launch/mixins/MixinNetworkManager.java | 4 ++-- .../java/baritone/launch/mixins/MixinWorldClient.java | 4 ++-- src/main/java/baritone/pathing/path/PathExecutor.java | 2 +- src/main/java/baritone/utils/ExampleBaritoneControl.java | 2 +- src/main/java/baritone/utils/ToolSet.java | 4 ++-- 33 files changed, 62 insertions(+), 63 deletions(-) rename src/main/java/baritone/{ => api}/event/GameEventHandler.java (97%) rename src/main/java/baritone/{ => api}/event/events/BlockInteractEvent.java (97%) rename src/main/java/baritone/{ => api}/event/events/ChatEvent.java (92%) rename src/main/java/baritone/{ => api}/event/events/ChunkEvent.java (96%) rename src/main/java/baritone/{ => api}/event/events/ItemSlotEvent.java (93%) rename src/main/java/baritone/{ => api}/event/events/PacketEvent.java (93%) rename src/main/java/baritone/{ => api}/event/events/PathEvent.java (96%) rename src/main/java/baritone/{ => api}/event/events/PlayerUpdateEvent.java (92%) rename src/main/java/baritone/{ => api}/event/events/RelativeMoveEvent.java (92%) rename src/main/java/baritone/{ => api}/event/events/RenderEvent.java (96%) rename src/main/java/baritone/{ => api}/event/events/TickEvent.java (93%) rename src/main/java/baritone/{ => api}/event/events/WorldEvent.java (94%) rename src/main/java/baritone/{ => api}/event/events/type/Cancellable.java (96%) rename src/main/java/baritone/{ => api}/event/events/type/EventState.java (96%) rename src/main/java/baritone/{ => api}/event/listener/AbstractGameEventListener.java (97%) rename src/main/java/baritone/{ => api}/event/listener/IGameEventListener.java (98%) diff --git a/src/main/java/baritone/Baritone.java b/src/main/java/baritone/Baritone.java index 333a9fdb..0ef6da9d 100755 --- a/src/main/java/baritone/Baritone.java +++ b/src/main/java/baritone/Baritone.java @@ -22,7 +22,7 @@ import baritone.behavior.impl.LookBehavior; import baritone.behavior.impl.MemoryBehavior; import baritone.behavior.impl.PathingBehavior; import baritone.behavior.impl.LocationTrackingBehavior; -import baritone.event.GameEventHandler; +import baritone.api.event.GameEventHandler; import baritone.utils.InputOverrideHandler; import net.minecraft.client.Minecraft; diff --git a/src/main/java/baritone/event/GameEventHandler.java b/src/main/java/baritone/api/event/GameEventHandler.java similarity index 97% rename from src/main/java/baritone/event/GameEventHandler.java rename to src/main/java/baritone/api/event/GameEventHandler.java index 02c7f393..22da9430 100644 --- a/src/main/java/baritone/event/GameEventHandler.java +++ b/src/main/java/baritone/api/event/GameEventHandler.java @@ -32,13 +32,13 @@ * along with Baritone. If not, see . */ -package baritone.event; +package baritone.api.event; import baritone.Baritone; import baritone.chunk.WorldProvider; -import baritone.event.events.*; -import baritone.event.events.type.EventState; -import baritone.event.listener.IGameEventListener; +import baritone.api.event.events.*; +import baritone.api.event.events.type.EventState; +import baritone.api.event.listener.IGameEventListener; import baritone.utils.Helper; import baritone.utils.InputOverrideHandler; import baritone.utils.interfaces.Toggleable; diff --git a/src/main/java/baritone/event/events/BlockInteractEvent.java b/src/main/java/baritone/api/event/events/BlockInteractEvent.java similarity index 97% rename from src/main/java/baritone/event/events/BlockInteractEvent.java rename to src/main/java/baritone/api/event/events/BlockInteractEvent.java index c458f6b6..2c57952c 100644 --- a/src/main/java/baritone/event/events/BlockInteractEvent.java +++ b/src/main/java/baritone/api/event/events/BlockInteractEvent.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.event.events; +package baritone.api.event.events; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/baritone/event/events/ChatEvent.java b/src/main/java/baritone/api/event/events/ChatEvent.java similarity index 92% rename from src/main/java/baritone/event/events/ChatEvent.java rename to src/main/java/baritone/api/event/events/ChatEvent.java index 5fdf269c..87a81e70 100644 --- a/src/main/java/baritone/event/events/ChatEvent.java +++ b/src/main/java/baritone/api/event/events/ChatEvent.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.event.events; +package baritone.api.event.events; -import baritone.event.events.type.Cancellable; +import baritone.api.event.events.type.Cancellable; /** * @author Brady diff --git a/src/main/java/baritone/event/events/ChunkEvent.java b/src/main/java/baritone/api/event/events/ChunkEvent.java similarity index 96% rename from src/main/java/baritone/event/events/ChunkEvent.java rename to src/main/java/baritone/api/event/events/ChunkEvent.java index e5fe8a7f..1f8c6c39 100644 --- a/src/main/java/baritone/event/events/ChunkEvent.java +++ b/src/main/java/baritone/api/event/events/ChunkEvent.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.event.events; +package baritone.api.event.events; -import baritone.event.events.type.EventState; +import baritone.api.event.events.type.EventState; /** * @author Brady diff --git a/src/main/java/baritone/event/events/ItemSlotEvent.java b/src/main/java/baritone/api/event/events/ItemSlotEvent.java similarity index 93% rename from src/main/java/baritone/event/events/ItemSlotEvent.java rename to src/main/java/baritone/api/event/events/ItemSlotEvent.java index b660cbea..82e69177 100644 --- a/src/main/java/baritone/event/events/ItemSlotEvent.java +++ b/src/main/java/baritone/api/event/events/ItemSlotEvent.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.event.events; +package baritone.api.event.events; -import baritone.event.listener.IGameEventListener; +import baritone.api.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/event/events/PacketEvent.java b/src/main/java/baritone/api/event/events/PacketEvent.java similarity index 93% rename from src/main/java/baritone/event/events/PacketEvent.java rename to src/main/java/baritone/api/event/events/PacketEvent.java index 54401f6a..77310994 100644 --- a/src/main/java/baritone/event/events/PacketEvent.java +++ b/src/main/java/baritone/api/event/events/PacketEvent.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.event.events; +package baritone.api.event.events; -import baritone.event.events.type.EventState; +import baritone.api.event.events.type.EventState; import net.minecraft.network.Packet; /** diff --git a/src/main/java/baritone/event/events/PathEvent.java b/src/main/java/baritone/api/event/events/PathEvent.java similarity index 96% rename from src/main/java/baritone/event/events/PathEvent.java rename to src/main/java/baritone/api/event/events/PathEvent.java index 53892058..a3fee3f8 100644 --- a/src/main/java/baritone/event/events/PathEvent.java +++ b/src/main/java/baritone/api/event/events/PathEvent.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.event.events; +package baritone.api.event.events; public enum PathEvent { CALC_STARTED, diff --git a/src/main/java/baritone/event/events/PlayerUpdateEvent.java b/src/main/java/baritone/api/event/events/PlayerUpdateEvent.java similarity index 92% rename from src/main/java/baritone/event/events/PlayerUpdateEvent.java rename to src/main/java/baritone/api/event/events/PlayerUpdateEvent.java index 1f52bd80..59bdf702 100644 --- a/src/main/java/baritone/event/events/PlayerUpdateEvent.java +++ b/src/main/java/baritone/api/event/events/PlayerUpdateEvent.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.event.events; +package baritone.api.event.events; -import baritone.event.events.type.EventState; +import baritone.api.event.events.type.EventState; /** * @author Brady diff --git a/src/main/java/baritone/event/events/RelativeMoveEvent.java b/src/main/java/baritone/api/event/events/RelativeMoveEvent.java similarity index 92% rename from src/main/java/baritone/event/events/RelativeMoveEvent.java rename to src/main/java/baritone/api/event/events/RelativeMoveEvent.java index 1b639df5..14798fd5 100644 --- a/src/main/java/baritone/event/events/RelativeMoveEvent.java +++ b/src/main/java/baritone/api/event/events/RelativeMoveEvent.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.event.events; +package baritone.api.event.events; -import baritone.event.events.type.EventState; +import baritone.api.event.events.type.EventState; /** * @author Brady diff --git a/src/main/java/baritone/event/events/RenderEvent.java b/src/main/java/baritone/api/event/events/RenderEvent.java similarity index 96% rename from src/main/java/baritone/event/events/RenderEvent.java rename to src/main/java/baritone/api/event/events/RenderEvent.java index 73db95a7..ef693e2a 100644 --- a/src/main/java/baritone/event/events/RenderEvent.java +++ b/src/main/java/baritone/api/event/events/RenderEvent.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.event.events; +package baritone.api.event.events; /** * @author Brady diff --git a/src/main/java/baritone/event/events/TickEvent.java b/src/main/java/baritone/api/event/events/TickEvent.java similarity index 93% rename from src/main/java/baritone/event/events/TickEvent.java rename to src/main/java/baritone/api/event/events/TickEvent.java index d45f7d4d..e82c31ad 100644 --- a/src/main/java/baritone/event/events/TickEvent.java +++ b/src/main/java/baritone/api/event/events/TickEvent.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.event.events; +package baritone.api.event.events; -import baritone.event.events.type.EventState; +import baritone.api.event.events.type.EventState; public final class TickEvent { diff --git a/src/main/java/baritone/event/events/WorldEvent.java b/src/main/java/baritone/api/event/events/WorldEvent.java similarity index 94% rename from src/main/java/baritone/event/events/WorldEvent.java rename to src/main/java/baritone/api/event/events/WorldEvent.java index 60bc660e..454755fe 100644 --- a/src/main/java/baritone/event/events/WorldEvent.java +++ b/src/main/java/baritone/api/event/events/WorldEvent.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.event.events; +package baritone.api.event.events; -import baritone.event.events.type.EventState; +import baritone.api.event.events.type.EventState; import net.minecraft.client.multiplayer.WorldClient; /** diff --git a/src/main/java/baritone/event/events/type/Cancellable.java b/src/main/java/baritone/api/event/events/type/Cancellable.java similarity index 96% rename from src/main/java/baritone/event/events/type/Cancellable.java rename to src/main/java/baritone/api/event/events/type/Cancellable.java index 3d8f7536..4c26f8f8 100644 --- a/src/main/java/baritone/event/events/type/Cancellable.java +++ b/src/main/java/baritone/api/event/events/type/Cancellable.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.event.events.type; +package baritone.api.event.events.type; /** * @author Brady diff --git a/src/main/java/baritone/event/events/type/EventState.java b/src/main/java/baritone/api/event/events/type/EventState.java similarity index 96% rename from src/main/java/baritone/event/events/type/EventState.java rename to src/main/java/baritone/api/event/events/type/EventState.java index c0a6a863..a7fccff1 100644 --- a/src/main/java/baritone/event/events/type/EventState.java +++ b/src/main/java/baritone/api/event/events/type/EventState.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.event.events.type; +package baritone.api.event.events.type; /** * @author Brady diff --git a/src/main/java/baritone/event/listener/AbstractGameEventListener.java b/src/main/java/baritone/api/event/listener/AbstractGameEventListener.java similarity index 97% rename from src/main/java/baritone/event/listener/AbstractGameEventListener.java rename to src/main/java/baritone/api/event/listener/AbstractGameEventListener.java index 4b8de23a..b47468bd 100644 --- a/src/main/java/baritone/event/listener/AbstractGameEventListener.java +++ b/src/main/java/baritone/api/event/listener/AbstractGameEventListener.java @@ -32,9 +32,9 @@ * along with Baritone. If not, see . */ -package baritone.event.listener; +package baritone.api.event.listener; -import baritone.event.events.*; +import baritone.api.event.events.*; /** * An implementation of {@link IGameEventListener} that has all methods diff --git a/src/main/java/baritone/event/listener/IGameEventListener.java b/src/main/java/baritone/api/event/listener/IGameEventListener.java similarity index 98% rename from src/main/java/baritone/event/listener/IGameEventListener.java rename to src/main/java/baritone/api/event/listener/IGameEventListener.java index 4900f1eb..9be19aab 100644 --- a/src/main/java/baritone/event/listener/IGameEventListener.java +++ b/src/main/java/baritone/api/event/listener/IGameEventListener.java @@ -32,9 +32,9 @@ * along with Baritone. If not, see . */ -package baritone.event.listener; +package baritone.api.event.listener; -import baritone.event.events.*; +import baritone.api.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/behavior/Behavior.java b/src/main/java/baritone/behavior/Behavior.java index d9e0e357..ad5e3a88 100644 --- a/src/main/java/baritone/behavior/Behavior.java +++ b/src/main/java/baritone/behavior/Behavior.java @@ -17,7 +17,7 @@ package baritone.behavior; -import baritone.event.listener.AbstractGameEventListener; +import baritone.api.event.listener.AbstractGameEventListener; import baritone.utils.Helper; import baritone.utils.interfaces.Toggleable; diff --git a/src/main/java/baritone/behavior/impl/LocationTrackingBehavior.java b/src/main/java/baritone/behavior/impl/LocationTrackingBehavior.java index b4caa766..ba075dd3 100644 --- a/src/main/java/baritone/behavior/impl/LocationTrackingBehavior.java +++ b/src/main/java/baritone/behavior/impl/LocationTrackingBehavior.java @@ -20,7 +20,7 @@ package baritone.behavior.impl; import baritone.behavior.Behavior; import baritone.chunk.Waypoint; import baritone.chunk.WorldProvider; -import baritone.event.events.BlockInteractEvent; +import baritone.api.event.events.BlockInteractEvent; import baritone.utils.BlockStateInterface; import net.minecraft.block.BlockBed; diff --git a/src/main/java/baritone/behavior/impl/LookBehavior.java b/src/main/java/baritone/behavior/impl/LookBehavior.java index 00ffce54..080d75d5 100644 --- a/src/main/java/baritone/behavior/impl/LookBehavior.java +++ b/src/main/java/baritone/behavior/impl/LookBehavior.java @@ -20,9 +20,8 @@ package baritone.behavior.impl; 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.api.event.events.PlayerUpdateEvent; +import baritone.api.event.events.RelativeMoveEvent; import baritone.utils.Rotation; public class LookBehavior extends Behavior { diff --git a/src/main/java/baritone/behavior/impl/MemoryBehavior.java b/src/main/java/baritone/behavior/impl/MemoryBehavior.java index ed5bd686..2edb9ec3 100644 --- a/src/main/java/baritone/behavior/impl/MemoryBehavior.java +++ b/src/main/java/baritone/behavior/impl/MemoryBehavior.java @@ -1,9 +1,9 @@ package baritone.behavior.impl; import baritone.behavior.Behavior; -import baritone.event.events.PacketEvent; -import baritone.event.events.PlayerUpdateEvent; -import baritone.event.events.type.EventState; +import baritone.api.event.events.PacketEvent; +import baritone.api.event.events.PlayerUpdateEvent; +import baritone.api.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/behavior/impl/PathingBehavior.java b/src/main/java/baritone/behavior/impl/PathingBehavior.java index 83a479a4..37690f21 100644 --- a/src/main/java/baritone/behavior/impl/PathingBehavior.java +++ b/src/main/java/baritone/behavior/impl/PathingBehavior.java @@ -19,10 +19,10 @@ package baritone.behavior.impl; import baritone.Baritone; import baritone.behavior.Behavior; -import baritone.event.events.PathEvent; -import baritone.event.events.PlayerUpdateEvent; -import baritone.event.events.RenderEvent; -import baritone.event.events.TickEvent; +import baritone.api.event.events.PathEvent; +import baritone.api.event.events.PlayerUpdateEvent; +import baritone.api.event.events.RenderEvent; +import baritone.api.event.events.TickEvent; import baritone.pathing.calc.AStarPathFinder; import baritone.pathing.calc.AbstractNodeCostSearch; import baritone.pathing.calc.IPathFinder; diff --git a/src/main/java/baritone/launch/mixins/MixinEntity.java b/src/main/java/baritone/launch/mixins/MixinEntity.java index 31b1e41b..2a0134d3 100644 --- a/src/main/java/baritone/launch/mixins/MixinEntity.java +++ b/src/main/java/baritone/launch/mixins/MixinEntity.java @@ -18,8 +18,8 @@ package baritone.launch.mixins; import baritone.Baritone; -import baritone.event.events.RelativeMoveEvent; -import baritone.event.events.type.EventState; +import baritone.api.event.events.RelativeMoveEvent; +import baritone.api.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 ea0896c5..9da39df3 100644 --- a/src/main/java/baritone/launch/mixins/MixinEntityPlayerSP.java +++ b/src/main/java/baritone/launch/mixins/MixinEntityPlayerSP.java @@ -18,9 +18,9 @@ package baritone.launch.mixins; import baritone.Baritone; -import baritone.event.events.ChatEvent; -import baritone.event.events.PlayerUpdateEvent; -import baritone.event.events.type.EventState; +import baritone.api.event.events.ChatEvent; +import baritone.api.event.events.PlayerUpdateEvent; +import baritone.api.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 a2cfe664..55adfc83 100644 --- a/src/main/java/baritone/launch/mixins/MixinEntityRenderer.java +++ b/src/main/java/baritone/launch/mixins/MixinEntityRenderer.java @@ -18,7 +18,7 @@ package baritone.launch.mixins; import baritone.Baritone; -import baritone.event.events.RenderEvent; +import baritone.api.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/MixinInventoryPlayer.java b/src/main/java/baritone/launch/mixins/MixinInventoryPlayer.java index 24aff3cf..dfaa4b19 100644 --- a/src/main/java/baritone/launch/mixins/MixinInventoryPlayer.java +++ b/src/main/java/baritone/launch/mixins/MixinInventoryPlayer.java @@ -18,7 +18,7 @@ package baritone.launch.mixins; import baritone.Baritone; -import baritone.event.events.ItemSlotEvent; +import baritone.api.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/MixinMinecraft.java b/src/main/java/baritone/launch/mixins/MixinMinecraft.java index 3d0b6619..0f0052bb 100755 --- a/src/main/java/baritone/launch/mixins/MixinMinecraft.java +++ b/src/main/java/baritone/launch/mixins/MixinMinecraft.java @@ -19,10 +19,10 @@ package baritone.launch.mixins; import baritone.Baritone; import baritone.behavior.impl.PathingBehavior; -import baritone.event.events.BlockInteractEvent; -import baritone.event.events.TickEvent; -import baritone.event.events.WorldEvent; -import baritone.event.events.type.EventState; +import baritone.api.event.events.BlockInteractEvent; +import baritone.api.event.events.TickEvent; +import baritone.api.event.events.WorldEvent; +import baritone.api.event.events.type.EventState; import baritone.utils.ExampleBaritoneControl; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; diff --git a/src/main/java/baritone/launch/mixins/MixinNetHandlerPlayClient.java b/src/main/java/baritone/launch/mixins/MixinNetHandlerPlayClient.java index 1af4ca6c..bd4cbb97 100644 --- a/src/main/java/baritone/launch/mixins/MixinNetHandlerPlayClient.java +++ b/src/main/java/baritone/launch/mixins/MixinNetHandlerPlayClient.java @@ -18,8 +18,8 @@ package baritone.launch.mixins; import baritone.Baritone; -import baritone.event.events.ChunkEvent; -import baritone.event.events.type.EventState; +import baritone.api.event.events.ChunkEvent; +import baritone.api.event.events.type.EventState; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.network.play.server.SPacketChunkData; import net.minecraft.network.play.server.SPacketCombatEvent; diff --git a/src/main/java/baritone/launch/mixins/MixinNetworkManager.java b/src/main/java/baritone/launch/mixins/MixinNetworkManager.java index 48da859f..472d4f04 100644 --- a/src/main/java/baritone/launch/mixins/MixinNetworkManager.java +++ b/src/main/java/baritone/launch/mixins/MixinNetworkManager.java @@ -18,8 +18,8 @@ package baritone.launch.mixins; import baritone.Baritone; -import baritone.event.events.PacketEvent; -import baritone.event.events.type.EventState; +import baritone.api.event.events.PacketEvent; +import baritone.api.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 da4b019f..005dbe16 100644 --- a/src/main/java/baritone/launch/mixins/MixinWorldClient.java +++ b/src/main/java/baritone/launch/mixins/MixinWorldClient.java @@ -18,8 +18,8 @@ package baritone.launch.mixins; import baritone.Baritone; -import baritone.event.events.ChunkEvent; -import baritone.event.events.type.EventState; +import baritone.api.event.events.ChunkEvent; +import baritone.api.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/pathing/path/PathExecutor.java b/src/main/java/baritone/pathing/path/PathExecutor.java index 0e7ebec6..e9f094a5 100644 --- a/src/main/java/baritone/pathing/path/PathExecutor.java +++ b/src/main/java/baritone/pathing/path/PathExecutor.java @@ -18,7 +18,7 @@ package baritone.pathing.path; import baritone.Baritone; -import baritone.event.events.TickEvent; +import baritone.api.event.events.TickEvent; import baritone.pathing.movement.ActionCosts; import baritone.pathing.movement.Movement; import baritone.pathing.movement.MovementState; diff --git a/src/main/java/baritone/utils/ExampleBaritoneControl.java b/src/main/java/baritone/utils/ExampleBaritoneControl.java index 59cafd6b..3b9cc18e 100644 --- a/src/main/java/baritone/utils/ExampleBaritoneControl.java +++ b/src/main/java/baritone/utils/ExampleBaritoneControl.java @@ -24,7 +24,7 @@ import baritone.behavior.impl.PathingBehavior; import baritone.chunk.ChunkPacker; import baritone.chunk.Waypoint; import baritone.chunk.WorldProvider; -import baritone.event.events.ChatEvent; +import baritone.api.event.events.ChatEvent; import baritone.pathing.calc.AStarPathFinder; import baritone.pathing.goals.*; import baritone.pathing.movement.ActionCosts; diff --git a/src/main/java/baritone/utils/ToolSet.java b/src/main/java/baritone/utils/ToolSet.java index bb445226..415d8ebd 100644 --- a/src/main/java/baritone/utils/ToolSet.java +++ b/src/main/java/baritone/utils/ToolSet.java @@ -18,8 +18,8 @@ package baritone.utils; import baritone.Baritone; -import baritone.event.events.ItemSlotEvent; -import baritone.event.listener.AbstractGameEventListener; +import baritone.api.event.events.ItemSlotEvent; +import baritone.api.event.listener.AbstractGameEventListener; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft;