From f222980a1a609d34b93bd989bd1f6793f5543a5c Mon Sep 17 00:00:00 2001 From: Leijurv Date: Fri, 23 Nov 2018 13:32:18 -0800 Subject: [PATCH] move comms to cabaletta.comms --- .../{ => cabaletta}/comms/BufferedConnection.java | 2 +- .../comms/ConstructingDeserializer.java | 2 +- .../java/{ => cabaletta}/comms/IConnection.java | 2 +- .../java/{ => cabaletta}/comms/IMessageListener.java | 6 +++--- .../{ => cabaletta}/comms/MessageDeserializer.java | 2 +- src/comms/java/{ => cabaletta}/comms/Pipe.java | 2 +- .../{ => cabaletta}/comms/SerializedConnection.java | 2 +- .../java/{ => cabaletta}/comms/SocketConnection.java | 2 +- .../{ => cabaletta}/comms/downward/MessageChat.java | 6 +++--- src/comms/java/{ => cabaletta}/comms/iMessage.java | 2 +- .../{ => cabaletta}/comms/upward/MessageStatus.java | 6 +++--- .../java/baritone/behavior/ControllerBehavior.java | 12 ++++++------ .../java/baritone/utils/ExampleBaritoneControl.java | 2 +- 13 files changed, 24 insertions(+), 24 deletions(-) rename src/comms/java/{ => cabaletta}/comms/BufferedConnection.java (99%) rename src/comms/java/{ => cabaletta}/comms/ConstructingDeserializer.java (98%) rename src/comms/java/{ => cabaletta}/comms/IConnection.java (97%) rename src/comms/java/{ => cabaletta}/comms/IMessageListener.java (90%) rename src/comms/java/{ => cabaletta}/comms/MessageDeserializer.java (97%) rename src/comms/java/{ => cabaletta}/comms/Pipe.java (99%) rename src/comms/java/{ => cabaletta}/comms/SerializedConnection.java (98%) rename src/comms/java/{ => cabaletta}/comms/SocketConnection.java (97%) rename src/comms/java/{ => cabaletta}/comms/downward/MessageChat.java (92%) rename src/comms/java/{ => cabaletta}/comms/iMessage.java (98%) rename src/comms/java/{ => cabaletta}/comms/upward/MessageStatus.java (97%) diff --git a/src/comms/java/comms/BufferedConnection.java b/src/comms/java/cabaletta/comms/BufferedConnection.java similarity index 99% rename from src/comms/java/comms/BufferedConnection.java rename to src/comms/java/cabaletta/comms/BufferedConnection.java index 450010e70..b5ff35c9b 100644 --- a/src/comms/java/comms/BufferedConnection.java +++ b/src/comms/java/cabaletta/comms/BufferedConnection.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package comms; +package cabaletta.comms; import java.io.EOFException; import java.io.IOException; diff --git a/src/comms/java/comms/ConstructingDeserializer.java b/src/comms/java/cabaletta/comms/ConstructingDeserializer.java similarity index 98% rename from src/comms/java/comms/ConstructingDeserializer.java rename to src/comms/java/cabaletta/comms/ConstructingDeserializer.java index 5b49ecdb1..eb15bdf09 100644 --- a/src/comms/java/comms/ConstructingDeserializer.java +++ b/src/comms/java/cabaletta/comms/ConstructingDeserializer.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package comms; +package cabaletta.comms; import java.io.DataInputStream; import java.io.IOException; diff --git a/src/comms/java/comms/IConnection.java b/src/comms/java/cabaletta/comms/IConnection.java similarity index 97% rename from src/comms/java/comms/IConnection.java rename to src/comms/java/cabaletta/comms/IConnection.java index dc54beb08..02046fe37 100644 --- a/src/comms/java/comms/IConnection.java +++ b/src/comms/java/cabaletta/comms/IConnection.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package comms; +package cabaletta.comms; import java.io.IOException; diff --git a/src/comms/java/comms/IMessageListener.java b/src/comms/java/cabaletta/comms/IMessageListener.java similarity index 90% rename from src/comms/java/comms/IMessageListener.java rename to src/comms/java/cabaletta/comms/IMessageListener.java index afed4cfee..d1c910385 100644 --- a/src/comms/java/comms/IMessageListener.java +++ b/src/comms/java/cabaletta/comms/IMessageListener.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -package comms; +package cabaletta.comms; -import comms.downward.MessageChat; -import comms.upward.MessageStatus; +import cabaletta.comms.downward.MessageChat; +import cabaletta.comms.upward.MessageStatus; public interface IMessageListener { default void handle(MessageStatus message) { diff --git a/src/comms/java/comms/MessageDeserializer.java b/src/comms/java/cabaletta/comms/MessageDeserializer.java similarity index 97% rename from src/comms/java/comms/MessageDeserializer.java rename to src/comms/java/cabaletta/comms/MessageDeserializer.java index aece828d4..264a753d0 100644 --- a/src/comms/java/comms/MessageDeserializer.java +++ b/src/comms/java/cabaletta/comms/MessageDeserializer.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package comms; +package cabaletta.comms; import java.io.DataInputStream; import java.io.IOException; diff --git a/src/comms/java/comms/Pipe.java b/src/comms/java/cabaletta/comms/Pipe.java similarity index 99% rename from src/comms/java/comms/Pipe.java rename to src/comms/java/cabaletta/comms/Pipe.java index c189af600..42e288996 100644 --- a/src/comms/java/comms/Pipe.java +++ b/src/comms/java/cabaletta/comms/Pipe.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package comms; +package cabaletta.comms; import java.io.EOFException; import java.io.IOException; diff --git a/src/comms/java/comms/SerializedConnection.java b/src/comms/java/cabaletta/comms/SerializedConnection.java similarity index 98% rename from src/comms/java/comms/SerializedConnection.java rename to src/comms/java/cabaletta/comms/SerializedConnection.java index c4191194c..5ac482a99 100644 --- a/src/comms/java/comms/SerializedConnection.java +++ b/src/comms/java/cabaletta/comms/SerializedConnection.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package comms; +package cabaletta.comms; import java.io.*; diff --git a/src/comms/java/comms/SocketConnection.java b/src/comms/java/cabaletta/comms/SocketConnection.java similarity index 97% rename from src/comms/java/comms/SocketConnection.java rename to src/comms/java/cabaletta/comms/SocketConnection.java index e40d5a1aa..95bb83d59 100644 --- a/src/comms/java/comms/SocketConnection.java +++ b/src/comms/java/cabaletta/comms/SocketConnection.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package comms; +package cabaletta.comms; import java.io.IOException; import java.net.Socket; diff --git a/src/comms/java/comms/downward/MessageChat.java b/src/comms/java/cabaletta/comms/downward/MessageChat.java similarity index 92% rename from src/comms/java/comms/downward/MessageChat.java rename to src/comms/java/cabaletta/comms/downward/MessageChat.java index b04d2a315..be6b0f3b3 100644 --- a/src/comms/java/comms/downward/MessageChat.java +++ b/src/comms/java/cabaletta/comms/downward/MessageChat.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -package comms.downward; +package cabaletta.comms.downward; -import comms.IMessageListener; -import comms.iMessage; +import cabaletta.comms.IMessageListener; +import cabaletta.comms.iMessage; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/comms/java/comms/iMessage.java b/src/comms/java/cabaletta/comms/iMessage.java similarity index 98% rename from src/comms/java/comms/iMessage.java rename to src/comms/java/cabaletta/comms/iMessage.java index 67ec29651..7d00ab4c7 100644 --- a/src/comms/java/comms/iMessage.java +++ b/src/comms/java/cabaletta/comms/iMessage.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package comms; +package cabaletta.comms; import java.io.DataOutputStream; import java.io.IOException; diff --git a/src/comms/java/comms/upward/MessageStatus.java b/src/comms/java/cabaletta/comms/upward/MessageStatus.java similarity index 97% rename from src/comms/java/comms/upward/MessageStatus.java rename to src/comms/java/cabaletta/comms/upward/MessageStatus.java index 53786a016..f7727fc1f 100644 --- a/src/comms/java/comms/upward/MessageStatus.java +++ b/src/comms/java/cabaletta/comms/upward/MessageStatus.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -package comms.upward; +package cabaletta.comms.upward; -import comms.IMessageListener; -import comms.iMessage; +import cabaletta.comms.IMessageListener; +import cabaletta.comms.iMessage; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/baritone/behavior/ControllerBehavior.java b/src/main/java/baritone/behavior/ControllerBehavior.java index 736d6ac63..bc697f8b6 100644 --- a/src/main/java/baritone/behavior/ControllerBehavior.java +++ b/src/main/java/baritone/behavior/ControllerBehavior.java @@ -22,12 +22,12 @@ import baritone.api.event.events.ChatEvent; import baritone.api.event.events.TickEvent; import baritone.api.process.IBaritoneProcess; import baritone.utils.Helper; -import comms.BufferedConnection; -import comms.IConnection; -import comms.IMessageListener; -import comms.downward.MessageChat; -import comms.iMessage; -import comms.upward.MessageStatus; +import cabaletta.comms.BufferedConnection; +import cabaletta.comms.IConnection; +import cabaletta.comms.IMessageListener; +import cabaletta.comms.downward.MessageChat; +import cabaletta.comms.iMessage; +import cabaletta.comms.upward.MessageStatus; import net.minecraft.util.math.BlockPos; import java.io.IOException; diff --git a/src/main/java/baritone/utils/ExampleBaritoneControl.java b/src/main/java/baritone/utils/ExampleBaritoneControl.java index 36d031c23..1291f8e16 100644 --- a/src/main/java/baritone/utils/ExampleBaritoneControl.java +++ b/src/main/java/baritone/utils/ExampleBaritoneControl.java @@ -32,7 +32,7 @@ import baritone.pathing.movement.CalculationContext; import baritone.pathing.movement.Movement; import baritone.pathing.movement.Moves; import baritone.process.CustomGoalProcess; -import comms.SocketConnection; +import cabaletta.comms.SocketConnection; import net.minecraft.block.Block; import net.minecraft.client.multiplayer.ChunkProviderClient; import net.minecraft.entity.Entity;