diff --git a/core/src/main/java/mc/core/GameLoop.java b/core/src/main/java/mc/core/GameLoop.java index 4dff4fc..d04f929 100644 --- a/core/src/main/java/mc/core/GameLoop.java +++ b/core/src/main/java/mc/core/GameLoop.java @@ -7,9 +7,9 @@ package mc.core; import com.google.common.eventbus.Subscribe; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import mc.core.eventbus.CS_PlayerMoveEvent; +import mc.core.eventbus.events.CS_PlayerMoveEvent; import mc.core.eventbus.EventBusGetter; -import mc.core.eventbus.SC_ChunkLoadEvent; +import mc.core.eventbus.events.SC_ChunkLoadEvent; import mc.core.player.PlayerManager; import mc.core.time.TimeProcessor; import mc.core.utils.CompactedCoords; diff --git a/core/src/main/java/mc/core/eventbus/CS_PlayerMoveEvent.java b/core/src/main/java/mc/core/eventbus/events/CS_PlayerMoveEvent.java similarity index 90% rename from core/src/main/java/mc/core/eventbus/CS_PlayerMoveEvent.java rename to core/src/main/java/mc/core/eventbus/events/CS_PlayerMoveEvent.java index 3e20d87..ae60200 100644 --- a/core/src/main/java/mc/core/eventbus/CS_PlayerMoveEvent.java +++ b/core/src/main/java/mc/core/eventbus/events/CS_PlayerMoveEvent.java @@ -2,12 +2,13 @@ * DmitriyMX * 2018-05-02 */ -package mc.core.eventbus; +package mc.core.eventbus.events; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; import mc.core.EntityLocation; +import mc.core.eventbus.EventBase; import mc.core.player.Player; @RequiredArgsConstructor diff --git a/core/src/main/java/mc/core/eventbus/LoginEvent.java b/core/src/main/java/mc/core/eventbus/events/LoginEvent.java similarity index 85% rename from core/src/main/java/mc/core/eventbus/LoginEvent.java rename to core/src/main/java/mc/core/eventbus/events/LoginEvent.java index e264521..dc51dc3 100644 --- a/core/src/main/java/mc/core/eventbus/LoginEvent.java +++ b/core/src/main/java/mc/core/eventbus/events/LoginEvent.java @@ -2,11 +2,12 @@ * DmitriyMX * 2018-05-02 */ -package mc.core.eventbus; +package mc.core.eventbus.events; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; +import mc.core.eventbus.EventBase; import java.net.SocketAddress; diff --git a/core/src/main/java/mc/core/eventbus/PlayerLookEvent.java b/core/src/main/java/mc/core/eventbus/events/PlayerLookEvent.java similarity index 84% rename from core/src/main/java/mc/core/eventbus/PlayerLookEvent.java rename to core/src/main/java/mc/core/eventbus/events/PlayerLookEvent.java index 80f03e4..b20287b 100644 --- a/core/src/main/java/mc/core/eventbus/PlayerLookEvent.java +++ b/core/src/main/java/mc/core/eventbus/events/PlayerLookEvent.java @@ -2,12 +2,13 @@ * DmitriyMX * 2018-05-02 */ -package mc.core.eventbus; +package mc.core.eventbus.events; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; import mc.core.EntityLocation; +import mc.core.eventbus.EventBase; import mc.core.player.Player; @RequiredArgsConstructor diff --git a/core/src/main/java/mc/core/eventbus/SC_ChunkLoadEvent.java b/core/src/main/java/mc/core/eventbus/events/SC_ChunkLoadEvent.java similarity index 83% rename from core/src/main/java/mc/core/eventbus/SC_ChunkLoadEvent.java rename to core/src/main/java/mc/core/eventbus/events/SC_ChunkLoadEvent.java index 85ee1f5..ea55a7a 100644 --- a/core/src/main/java/mc/core/eventbus/SC_ChunkLoadEvent.java +++ b/core/src/main/java/mc/core/eventbus/events/SC_ChunkLoadEvent.java @@ -1,7 +1,8 @@ -package mc.core.eventbus; +package mc.core.eventbus.events; import lombok.Getter; import lombok.RequiredArgsConstructor; +import mc.core.eventbus.EventBase; import mc.core.player.Player; import java.util.ArrayList; diff --git a/core/src/main/java/mc/core/eventbus/SC_PlayerMoveEvent.java b/core/src/main/java/mc/core/eventbus/events/SC_PlayerMoveEvent.java similarity index 82% rename from core/src/main/java/mc/core/eventbus/SC_PlayerMoveEvent.java rename to core/src/main/java/mc/core/eventbus/events/SC_PlayerMoveEvent.java index c0fce73..d0634a7 100644 --- a/core/src/main/java/mc/core/eventbus/SC_PlayerMoveEvent.java +++ b/core/src/main/java/mc/core/eventbus/events/SC_PlayerMoveEvent.java @@ -1,9 +1,10 @@ -package mc.core.eventbus; +package mc.core.eventbus.events; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; import mc.core.EntityLocation; +import mc.core.eventbus.EventBase; import mc.core.player.Player; @RequiredArgsConstructor diff --git a/core/src/main/java/mc/core/eventbus/ServerPingEvent.java b/core/src/main/java/mc/core/eventbus/events/ServerPingEvent.java similarity index 85% rename from core/src/main/java/mc/core/eventbus/ServerPingEvent.java rename to core/src/main/java/mc/core/eventbus/events/ServerPingEvent.java index 58159ef..7f55f67 100644 --- a/core/src/main/java/mc/core/eventbus/ServerPingEvent.java +++ b/core/src/main/java/mc/core/eventbus/events/ServerPingEvent.java @@ -2,11 +2,12 @@ * DmitriyMX * 2018-05-02 */ -package mc.core.eventbus; +package mc.core.eventbus.events; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; +import mc.core.eventbus.EventBase; import java.net.SocketAddress; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java index 43e08c2..13975ba 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java @@ -2,8 +2,8 @@ package mc.core.network.proto_1_12_2.netty; import com.google.common.eventbus.Subscribe; import lombok.extern.slf4j.Slf4j; -import mc.core.eventbus.SC_ChunkLoadEvent; -import mc.core.eventbus.SC_PlayerMoveEvent; +import mc.core.eventbus.events.SC_ChunkLoadEvent; +import mc.core.eventbus.events.SC_PlayerMoveEvent; import mc.core.network.proto_1_12_2.TeleportManager; import mc.core.network.proto_1_12_2.packets.ChunkDataPacket; import mc.core.network.proto_1_12_2.packets.PlayerPositionAndLookPacket; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java index d5502a8..9fea76a 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java @@ -6,7 +6,7 @@ package mc.core.network.proto_1_12_2.netty.handlers; import io.netty.channel.Channel; import io.netty.channel.ChannelFutureListener; -import mc.core.eventbus.CS_PlayerMoveEvent; +import mc.core.eventbus.events.CS_PlayerMoveEvent; import mc.core.eventbus.EventBusGetter; import mc.core.network.proto_1_12_2.State; import mc.core.network.proto_1_12_2.TeleportManager; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java index 2c448b4..a0cf347 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java @@ -8,7 +8,7 @@ import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import mc.core.EntityLocation; import mc.core.chat.ChatProcessor; -import mc.core.eventbus.CS_PlayerMoveEvent; +import mc.core.eventbus.events.CS_PlayerMoveEvent; import mc.core.eventbus.EventBusGetter; import mc.core.network.proto_1_12_2.TeleportManager; import mc.core.network.proto_1_12_2.packets.*;