From 21450a64d2048ccb6d200bf1827edb15792c820b Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Thu, 16 Aug 2018 11:46:06 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D0=BA?= =?UTF-8?q?=D0=B5=D1=82=D0=B0:=20mc.core.events=20->=20mc.core.eventbus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/java/mc/core/GameLoop.java | 7 +++---- .../mc/core/{events => eventbus}/CS_PlayerMoveEvent.java | 2 +- core/src/main/java/mc/core/{events => eventbus}/Event.java | 2 +- .../main/java/mc/core/{events => eventbus}/EventBase.java | 2 +- .../java/mc/core/{events => eventbus}/EventBusGetter.java | 2 +- .../main/java/mc/core/{events => eventbus}/LoginEvent.java | 2 +- .../java/mc/core/{events => eventbus}/PlayerLookEvent.java | 2 +- .../mc/core/{events => eventbus}/SC_ChunkLoadEvent.java | 2 +- .../mc/core/{events => eventbus}/SC_PlayerMoveEvent.java | 2 +- .../java/mc/core/{events => eventbus}/ServerPingEvent.java | 2 +- .../mc/core/network/proto_1_12_2/netty/NettyServer.java | 2 +- .../network/proto_1_12_2/netty/PlayerEventListener.java | 5 ++--- .../network/proto_1_12_2/netty/handlers/LoginHandler.java | 4 ++-- .../network/proto_1_12_2/netty/handlers/PlayHandler.java | 4 ++-- 14 files changed, 19 insertions(+), 21 deletions(-) rename core/src/main/java/mc/core/{events => eventbus}/CS_PlayerMoveEvent.java (96%) rename core/src/main/java/mc/core/{events => eventbus}/Event.java (89%) rename core/src/main/java/mc/core/{events => eventbus}/EventBase.java (89%) rename core/src/main/java/mc/core/{events => eventbus}/EventBusGetter.java (90%) rename core/src/main/java/mc/core/{events => eventbus}/LoginEvent.java (93%) rename core/src/main/java/mc/core/{events => eventbus}/PlayerLookEvent.java (93%) rename core/src/main/java/mc/core/{events => eventbus}/SC_ChunkLoadEvent.java (92%) rename core/src/main/java/mc/core/{events => eventbus}/SC_PlayerMoveEvent.java (92%) rename core/src/main/java/mc/core/{events => eventbus}/ServerPingEvent.java (93%) diff --git a/core/src/main/java/mc/core/GameLoop.java b/core/src/main/java/mc/core/GameLoop.java index da9cc1c..4dff4fc 100644 --- a/core/src/main/java/mc/core/GameLoop.java +++ b/core/src/main/java/mc/core/GameLoop.java @@ -7,13 +7,12 @@ package mc.core; import com.google.common.eventbus.Subscribe; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import mc.core.events.CS_PlayerMoveEvent; -import mc.core.events.EventBusGetter; -import mc.core.events.SC_ChunkLoadEvent; +import mc.core.eventbus.CS_PlayerMoveEvent; +import mc.core.eventbus.EventBusGetter; +import mc.core.eventbus.SC_ChunkLoadEvent; import mc.core.player.PlayerManager; import mc.core.time.TimeProcessor; import mc.core.utils.CompactedCoords; -import mc.core.world.World; import mc.core.world.chunk.Chunk; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/src/main/java/mc/core/events/CS_PlayerMoveEvent.java b/core/src/main/java/mc/core/eventbus/CS_PlayerMoveEvent.java similarity index 96% rename from core/src/main/java/mc/core/events/CS_PlayerMoveEvent.java rename to core/src/main/java/mc/core/eventbus/CS_PlayerMoveEvent.java index d44f7b1..3e20d87 100644 --- a/core/src/main/java/mc/core/events/CS_PlayerMoveEvent.java +++ b/core/src/main/java/mc/core/eventbus/CS_PlayerMoveEvent.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-05-02 */ -package mc.core.events; +package mc.core.eventbus; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/core/src/main/java/mc/core/events/Event.java b/core/src/main/java/mc/core/eventbus/Event.java similarity index 89% rename from core/src/main/java/mc/core/events/Event.java rename to core/src/main/java/mc/core/eventbus/Event.java index 066e7c8..08aa0ec 100644 --- a/core/src/main/java/mc/core/events/Event.java +++ b/core/src/main/java/mc/core/eventbus/Event.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-05-02 */ -package mc.core.events; +package mc.core.eventbus; public interface Event { void setCanceled(boolean value); diff --git a/core/src/main/java/mc/core/events/EventBase.java b/core/src/main/java/mc/core/eventbus/EventBase.java similarity index 89% rename from core/src/main/java/mc/core/events/EventBase.java rename to core/src/main/java/mc/core/eventbus/EventBase.java index 8c4f030..7756cce 100644 --- a/core/src/main/java/mc/core/events/EventBase.java +++ b/core/src/main/java/mc/core/eventbus/EventBase.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-05-02 */ -package mc.core.events; +package mc.core.eventbus; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/mc/core/events/EventBusGetter.java b/core/src/main/java/mc/core/eventbus/EventBusGetter.java similarity index 90% rename from core/src/main/java/mc/core/events/EventBusGetter.java rename to core/src/main/java/mc/core/eventbus/EventBusGetter.java index d2e5aa3..82d3d42 100644 --- a/core/src/main/java/mc/core/events/EventBusGetter.java +++ b/core/src/main/java/mc/core/eventbus/EventBusGetter.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-05-02 */ -package mc.core.events; +package mc.core.eventbus; import com.google.common.eventbus.EventBus; diff --git a/core/src/main/java/mc/core/events/LoginEvent.java b/core/src/main/java/mc/core/eventbus/LoginEvent.java similarity index 93% rename from core/src/main/java/mc/core/events/LoginEvent.java rename to core/src/main/java/mc/core/eventbus/LoginEvent.java index 63e123f..e264521 100644 --- a/core/src/main/java/mc/core/events/LoginEvent.java +++ b/core/src/main/java/mc/core/eventbus/LoginEvent.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-05-02 */ -package mc.core.events; +package mc.core.eventbus; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/core/src/main/java/mc/core/events/PlayerLookEvent.java b/core/src/main/java/mc/core/eventbus/PlayerLookEvent.java similarity index 93% rename from core/src/main/java/mc/core/events/PlayerLookEvent.java rename to core/src/main/java/mc/core/eventbus/PlayerLookEvent.java index 7506530..80f03e4 100644 --- a/core/src/main/java/mc/core/events/PlayerLookEvent.java +++ b/core/src/main/java/mc/core/eventbus/PlayerLookEvent.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-05-02 */ -package mc.core.events; +package mc.core.eventbus; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/core/src/main/java/mc/core/events/SC_ChunkLoadEvent.java b/core/src/main/java/mc/core/eventbus/SC_ChunkLoadEvent.java similarity index 92% rename from core/src/main/java/mc/core/events/SC_ChunkLoadEvent.java rename to core/src/main/java/mc/core/eventbus/SC_ChunkLoadEvent.java index 62d35c6..85ee1f5 100644 --- a/core/src/main/java/mc/core/events/SC_ChunkLoadEvent.java +++ b/core/src/main/java/mc/core/eventbus/SC_ChunkLoadEvent.java @@ -1,4 +1,4 @@ -package mc.core.events; +package mc.core.eventbus; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/core/src/main/java/mc/core/events/SC_PlayerMoveEvent.java b/core/src/main/java/mc/core/eventbus/SC_PlayerMoveEvent.java similarity index 92% rename from core/src/main/java/mc/core/events/SC_PlayerMoveEvent.java rename to core/src/main/java/mc/core/eventbus/SC_PlayerMoveEvent.java index d64350b..c0fce73 100644 --- a/core/src/main/java/mc/core/events/SC_PlayerMoveEvent.java +++ b/core/src/main/java/mc/core/eventbus/SC_PlayerMoveEvent.java @@ -1,4 +1,4 @@ -package mc.core.events; +package mc.core.eventbus; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/core/src/main/java/mc/core/events/ServerPingEvent.java b/core/src/main/java/mc/core/eventbus/ServerPingEvent.java similarity index 93% rename from core/src/main/java/mc/core/events/ServerPingEvent.java rename to core/src/main/java/mc/core/eventbus/ServerPingEvent.java index 3bbafce..58159ef 100644 --- a/core/src/main/java/mc/core/events/ServerPingEvent.java +++ b/core/src/main/java/mc/core/eventbus/ServerPingEvent.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-05-02 */ -package mc.core.events; +package mc.core.eventbus; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java index 79be3f9..51318cb 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java @@ -14,7 +14,7 @@ import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.util.AttributeKey; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import mc.core.events.EventBusGetter; +import mc.core.eventbus.EventBusGetter; import mc.core.network.Server; import mc.core.network.StartServerException; import mc.core.network.proto_1_12_2.State; 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 63415cd..43e08c2 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,14 +2,13 @@ package mc.core.network.proto_1_12_2.netty; import com.google.common.eventbus.Subscribe; import lombok.extern.slf4j.Slf4j; -import mc.core.events.SC_ChunkLoadEvent; -import mc.core.events.SC_PlayerMoveEvent; +import mc.core.eventbus.SC_ChunkLoadEvent; +import mc.core.eventbus.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; import mc.core.utils.CompactedCoords; import mc.core.world.chunk.Chunk; -import mc.core.world.chunk.ChunkSection; @Slf4j class PlayerEventListener { 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 15cf04b..d5502a8 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,8 +6,8 @@ package mc.core.network.proto_1_12_2.netty.handlers; import io.netty.channel.Channel; import io.netty.channel.ChannelFutureListener; -import mc.core.events.CS_PlayerMoveEvent; -import mc.core.events.EventBusGetter; +import mc.core.eventbus.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; import mc.core.network.proto_1_12_2.netty.wrappers.WrapperNetChannel; 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 e4162c5..2c448b4 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,8 +8,8 @@ import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import mc.core.EntityLocation; import mc.core.chat.ChatProcessor; -import mc.core.events.CS_PlayerMoveEvent; -import mc.core.events.EventBusGetter; +import mc.core.eventbus.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.*; import mc.core.player.Player; From 480a117269504ab4ccd99ecf5ddcfb80aca54051 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Thu, 16 Aug 2018 11:47:17 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=20=D1=8D=D0=B2=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20=D0=B2=20=D0=BE?= =?UTF-8?q?=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BF=D0=B0?= =?UTF-8?q?=D0=BA=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/java/mc/core/GameLoop.java | 4 ++-- .../mc/core/eventbus/{ => events}/CS_PlayerMoveEvent.java | 3 ++- .../main/java/mc/core/eventbus/{ => events}/LoginEvent.java | 3 ++- .../java/mc/core/eventbus/{ => events}/PlayerLookEvent.java | 3 ++- .../java/mc/core/eventbus/{ => events}/SC_ChunkLoadEvent.java | 3 ++- .../mc/core/eventbus/{ => events}/SC_PlayerMoveEvent.java | 3 ++- .../java/mc/core/eventbus/{ => events}/ServerPingEvent.java | 3 ++- .../core/network/proto_1_12_2/netty/PlayerEventListener.java | 4 ++-- .../network/proto_1_12_2/netty/handlers/LoginHandler.java | 2 +- .../core/network/proto_1_12_2/netty/handlers/PlayHandler.java | 2 +- 10 files changed, 18 insertions(+), 12 deletions(-) rename core/src/main/java/mc/core/eventbus/{ => events}/CS_PlayerMoveEvent.java (90%) rename core/src/main/java/mc/core/eventbus/{ => events}/LoginEvent.java (85%) rename core/src/main/java/mc/core/eventbus/{ => events}/PlayerLookEvent.java (84%) rename core/src/main/java/mc/core/eventbus/{ => events}/SC_ChunkLoadEvent.java (83%) rename core/src/main/java/mc/core/eventbus/{ => events}/SC_PlayerMoveEvent.java (82%) rename core/src/main/java/mc/core/eventbus/{ => events}/ServerPingEvent.java (85%) 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.*; From aafe91a896a44609111e75b187989c320f50eeb5 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Fri, 17 Aug 2018 11:05:25 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81=D0=B5=D1=80?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BD=D1=8B=D1=85=20=D1=81=D0=BE=D0=B1=D1=8B?= =?UTF-8?q?=D1=82=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eventbus/events/{LoginEvent.java => SC_LoginEvent.java} | 2 +- .../events/{PlayerLookEvent.java => SC_PlayerLookEvent.java} | 2 +- .../events/{ServerPingEvent.java => SC_ServerPingEvent.java} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename core/src/main/java/mc/core/eventbus/events/{LoginEvent.java => SC_LoginEvent.java} (89%) rename core/src/main/java/mc/core/eventbus/events/{PlayerLookEvent.java => SC_PlayerLookEvent.java} (87%) rename core/src/main/java/mc/core/eventbus/events/{ServerPingEvent.java => SC_ServerPingEvent.java} (88%) diff --git a/core/src/main/java/mc/core/eventbus/events/LoginEvent.java b/core/src/main/java/mc/core/eventbus/events/SC_LoginEvent.java similarity index 89% rename from core/src/main/java/mc/core/eventbus/events/LoginEvent.java rename to core/src/main/java/mc/core/eventbus/events/SC_LoginEvent.java index dc51dc3..95765f3 100644 --- a/core/src/main/java/mc/core/eventbus/events/LoginEvent.java +++ b/core/src/main/java/mc/core/eventbus/events/SC_LoginEvent.java @@ -14,7 +14,7 @@ import java.net.SocketAddress; @RequiredArgsConstructor @Getter @Setter -public class LoginEvent extends EventBase { +public class SC_LoginEvent extends EventBase { private String playerName; private final SocketAddress remoteAddress; private boolean deny; diff --git a/core/src/main/java/mc/core/eventbus/events/PlayerLookEvent.java b/core/src/main/java/mc/core/eventbus/events/SC_PlayerLookEvent.java similarity index 87% rename from core/src/main/java/mc/core/eventbus/events/PlayerLookEvent.java rename to core/src/main/java/mc/core/eventbus/events/SC_PlayerLookEvent.java index b20287b..90e5379 100644 --- a/core/src/main/java/mc/core/eventbus/events/PlayerLookEvent.java +++ b/core/src/main/java/mc/core/eventbus/events/SC_PlayerLookEvent.java @@ -14,7 +14,7 @@ import mc.core.player.Player; @RequiredArgsConstructor @Getter @Setter -public class PlayerLookEvent extends EventBase { +public class SC_PlayerLookEvent extends EventBase { private final Player player; private EntityLocation newLook; } diff --git a/core/src/main/java/mc/core/eventbus/events/ServerPingEvent.java b/core/src/main/java/mc/core/eventbus/events/SC_ServerPingEvent.java similarity index 88% rename from core/src/main/java/mc/core/eventbus/events/ServerPingEvent.java rename to core/src/main/java/mc/core/eventbus/events/SC_ServerPingEvent.java index 7f55f67..877df70 100644 --- a/core/src/main/java/mc/core/eventbus/events/ServerPingEvent.java +++ b/core/src/main/java/mc/core/eventbus/events/SC_ServerPingEvent.java @@ -14,7 +14,7 @@ import java.net.SocketAddress; @RequiredArgsConstructor @Getter @Setter -public class ServerPingEvent extends EventBase { +public class SC_ServerPingEvent extends EventBase { private final SocketAddress remoteAddress; private String description; private int online; From a3b40b750aab6278eeb1491f71b871f5378ac82c Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Fri, 17 Aug 2018 11:08:13 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9=20?= =?UTF-8?q?INSTANCE=20=D0=BD=D0=B0=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20getI?= =?UTF-8?q?nstance()=20=D0=B2=20EventBusGetter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/java/mc/core/GameLoop.java | 4 ++-- core/src/main/java/mc/core/eventbus/EventBusGetter.java | 4 +++- .../java/mc/core/network/proto_1_12_2/netty/NettyServer.java | 2 +- .../network/proto_1_12_2/netty/handlers/LoginHandler.java | 2 +- .../core/network/proto_1_12_2/netty/handlers/PlayHandler.java | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/mc/core/GameLoop.java b/core/src/main/java/mc/core/GameLoop.java index d04f929..93a0a6a 100644 --- a/core/src/main/java/mc/core/GameLoop.java +++ b/core/src/main/java/mc/core/GameLoop.java @@ -76,7 +76,7 @@ public class GameLoop extends Thread { } if (!eventChunkLoad.getNeedLoadChunks().isEmpty()) { - EventBusGetter.INSTANCE.post(eventChunkLoad); + EventBusGetter.getInstance().post(eventChunkLoad); } } @@ -90,7 +90,7 @@ public class GameLoop extends Thread { public void run() { TPS_WATCHER.startWatch(); - EventBusGetter.INSTANCE.register(this); + EventBusGetter.getInstance().register(this); while (!isInterrupted()) { TPS_WATCHER.check(); diff --git a/core/src/main/java/mc/core/eventbus/EventBusGetter.java b/core/src/main/java/mc/core/eventbus/EventBusGetter.java index 82d3d42..37e952b 100644 --- a/core/src/main/java/mc/core/eventbus/EventBusGetter.java +++ b/core/src/main/java/mc/core/eventbus/EventBusGetter.java @@ -5,9 +5,11 @@ package mc.core.eventbus; import com.google.common.eventbus.EventBus; +import lombok.Getter; public final class EventBusGetter { - public static final EventBus INSTANCE = new EventBus(); + @Getter + private static final EventBus instance = new EventBus(); private EventBusGetter() { } diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java index 51318cb..057a425 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java @@ -64,7 +64,7 @@ public class NettyServer implements Server { public void start() throws StartServerException { log.info("Use protocol {}", StatusResponsePacket.NAME); - EventBusGetter.INSTANCE.register(new PlayerEventListener()); + EventBusGetter.getInstance().register(new PlayerEventListener()); bossGroup = new NioEventLoopGroup(1); workerGroup = new NioEventLoopGroup(workerGroupCount); 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 9fea76a..771b1c3 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 @@ -140,7 +140,7 @@ public class LoginHandler extends AbstractStateHandler implements LoginStateHand CS_PlayerMoveEvent event = new CS_PlayerMoveEvent(player, player.getLocation()); event.setNewLocation(player.getLocation()); event.setRecalcChunk(true); - EventBusGetter.INSTANCE.post(event); + EventBusGetter.getInstance().post(event); } } } 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 a0cf347..d7636e3 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 @@ -85,7 +85,7 @@ public class PlayHandler extends AbstractStateHandler implements PlayStateHandle player.getLocation().getPitch(), player.getLocation().getWorld() )); - EventBusGetter.INSTANCE.post(event); + EventBusGetter.getInstance().post(event); } @Handler From ab08a723171053a86010c47d74da71377b7cf815 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Fri, 17 Aug 2018 11:44:22 +0300 Subject: [PATCH 5/5] =?UTF-8?q?core:=20=D0=B2=D1=8B=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D1=87=D0=B8=D0=BA=D0=BE=D0=B2=20=D1=81=D0=BE=D0=B1=D1=8B?= =?UTF-8?q?=D1=82=D0=B8=D0=B9=20=D0=B2=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/mc/core/CoreEventListener.java | 60 +++++++++++++++++++ core/src/main/java/mc/core/GameLoop.java | 50 +--------------- 2 files changed, 61 insertions(+), 49 deletions(-) create mode 100644 core/src/main/java/mc/core/CoreEventListener.java diff --git a/core/src/main/java/mc/core/CoreEventListener.java b/core/src/main/java/mc/core/CoreEventListener.java new file mode 100644 index 0000000..46c8f49 --- /dev/null +++ b/core/src/main/java/mc/core/CoreEventListener.java @@ -0,0 +1,60 @@ +package mc.core; + +import com.google.common.eventbus.Subscribe; +import lombok.extern.slf4j.Slf4j; +import mc.core.eventbus.EventBusGetter; +import mc.core.eventbus.events.CS_PlayerMoveEvent; +import mc.core.eventbus.events.SC_ChunkLoadEvent; +import mc.core.utils.CompactedCoords; +import mc.core.world.chunk.Chunk; + +import javax.annotation.PostConstruct; + +@Slf4j +public class CoreEventListener { + @PostConstruct + public void registerEventHandlers() { + EventBusGetter.getInstance().register(this); + } + + @Subscribe + public void handlerPlayerMoveEvent(CS_PlayerMoveEvent event) { + event.getPlayer().getLocation().setXYZ(event.getNewLocation()); + + Chunk chunk = event.getNewLocation().getChunk(); // Next chunk + int ncX = chunk.getX(); + int ncZ = chunk.getZ(); + chunk = event.getPlayer().getLocation().getChunk(); // Current chunk + int ccX = chunk.getX(); + int ccZ = chunk.getZ(); + + if (event.isRecalcChunk() || (ncX != ccX && ncZ != ccZ)) { + final int viewDistance = event.getPlayer().getSettings().getViewDistance(); + int cMinX = chunk.getX() - viewDistance; + int cMaxX = chunk.getX() + viewDistance; + int cMinZ = chunk.getZ() - viewDistance; + int cMaxZ = chunk.getZ() + viewDistance; + + SC_ChunkLoadEvent eventChunkLoad = new SC_ChunkLoadEvent(event.getPlayer()); + for (int cZ = cMinZ; cZ <= cMaxZ; cZ++) { + for (int cX = cMinX; cX <= cMaxX; cX++) { + int compressXZ = CompactedCoords.compressXZ(cX, cZ); + if (!event.getPlayer().getLoadedChunks().contains(compressXZ)) { + if (!event.getPlayer().getLoadedChunks().contains(compressXZ)) { + eventChunkLoad.getNeedLoadChunks().add(compressXZ); + } + } + } + } + + if (!eventChunkLoad.getNeedLoadChunks().isEmpty()) { + EventBusGetter.getInstance().post(eventChunkLoad); + } + } + + // TODO отсылать клиенту только(!) для корректировки позиции + // SC_PlayerMoveEvent nextEvent = new SC_PlayerMoveEvent(event.getPlayer()); + // nextEvent.setNewLocation(event.getNewLocation()); + // EventBusGetter.INSTANCE.post(nextEvent); + } +} diff --git a/core/src/main/java/mc/core/GameLoop.java b/core/src/main/java/mc/core/GameLoop.java index 93a0a6a..a51e42a 100644 --- a/core/src/main/java/mc/core/GameLoop.java +++ b/core/src/main/java/mc/core/GameLoop.java @@ -4,16 +4,11 @@ */ package mc.core; -import com.google.common.eventbus.Subscribe; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import mc.core.eventbus.events.CS_PlayerMoveEvent; import mc.core.eventbus.EventBusGetter; -import mc.core.eventbus.events.SC_ChunkLoadEvent; import mc.core.player.PlayerManager; import mc.core.time.TimeProcessor; -import mc.core.utils.CompactedCoords; -import mc.core.world.chunk.Chunk; import org.springframework.beans.factory.annotation.Autowired; @Slf4j @@ -44,59 +39,16 @@ public class GameLoop extends Thread { TPS_WATCHER.setTraceTPS(value); } - @Subscribe - public void playerMoveEventHandler(CS_PlayerMoveEvent event) { - log.trace("(GameLoop) playerMoveEventHandler()"); - event.getPlayer().getLocation().setXYZ(event.getNewLocation()); - - Chunk chunk = event.getNewLocation().getChunk(); // Next chunk - int ncX = chunk.getX(); - int ncZ = chunk.getZ(); - chunk = event.getPlayer().getLocation().getChunk(); // Current chunk - int ccX = chunk.getX(); - int ccZ = chunk.getZ(); - - if (event.isRecalcChunk() || (ncX != ccX && ncZ != ccZ)) { - final int viewDistance = event.getPlayer().getSettings().getViewDistance(); - int cMinX = chunk.getX() - viewDistance; - int cMaxX = chunk.getX() + viewDistance; - int cMinZ = chunk.getZ() - viewDistance; - int cMaxZ = chunk.getZ() + viewDistance; - - SC_ChunkLoadEvent eventChunkLoad = new SC_ChunkLoadEvent(event.getPlayer()); - for (int cZ = cMinZ; cZ <= cMaxZ; cZ++) { - for (int cX = cMinX; cX <= cMaxX; cX++) { - int compressXZ = CompactedCoords.compressXZ(cX, cZ); - if (!event.getPlayer().getLoadedChunks().contains(compressXZ)) { - if (!event.getPlayer().getLoadedChunks().contains(compressXZ)) { - eventChunkLoad.getNeedLoadChunks().add(compressXZ); - } - } - } - } - - if (!eventChunkLoad.getNeedLoadChunks().isEmpty()) { - EventBusGetter.getInstance().post(eventChunkLoad); - } - } - - // TODO отсылать клиенту только(!) для корректировки позиции -// SC_PlayerMoveEvent nextEvent = new SC_PlayerMoveEvent(event.getPlayer()); -// nextEvent.setNewLocation(event.getNewLocation()); -// EventBusGetter.INSTANCE.post(nextEvent); - } - @Override public void run() { TPS_WATCHER.startWatch(); - EventBusGetter.getInstance().register(this); - while (!isInterrupted()) { TPS_WATCHER.check(); /* --- --- --- */ + /* TODO нужно перенести этот функционал на Network */ playerManager.getBroadcastChannel().sendTimeUpdate( gameTimer.getGameTime(), gameTimer.getWorldAge()