From 3ed45044752b1e55153d8916d911756ec237fa85 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 6 May 2018 14:40:23 +0300 Subject: [PATCH] refactory --- core/src/main/java/mc/core/GameLoop.java | 3 +-- core/src/main/java/mc/core/chat/ChatProcessor.java | 2 +- core/src/main/java/mc/core/chat/SimpleChatProcessor.java | 4 ++-- core/src/main/java/mc/core/events/PlayerLookEvent.java | 4 ++-- core/src/main/java/mc/core/events/PlayerPositionEvent.java | 2 +- core/src/main/java/mc/core/network/BroadcastNetChannel.java | 2 +- .../mc/core/{embedded => player}/InMemoryPlayerManager.java | 4 +--- core/src/main/java/mc/core/{ => player}/Look.java | 2 +- core/src/main/java/mc/core/{ => player}/Player.java | 3 ++- core/src/main/java/mc/core/{ => player}/PlayerManager.java | 2 +- .../main/java/mc/core/{embedded => player}/SimplePlayer.java | 4 +--- core/src/main/resources/spring.xml | 2 +- .../core/network/proto_125/packets/PositionAndLookPacket.java | 2 +- .../network/proto_125/packets/SpawnNamedEntityPacket.java | 2 +- .../java/mc/core/network/proto_125/netty/EventListener.java | 4 ++-- .../java/mc/core/network/proto_125/netty/NettyServer.java | 2 +- .../java/mc/core/network/proto_125/netty/PacketHandler.java | 3 +++ 17 files changed, 23 insertions(+), 24 deletions(-) rename core/src/main/java/mc/core/{embedded => player}/InMemoryPlayerManager.java (97%) rename core/src/main/java/mc/core/{ => player}/Look.java (88%) rename core/src/main/java/mc/core/{ => player}/Player.java (89%) rename core/src/main/java/mc/core/{ => player}/PlayerManager.java (94%) rename core/src/main/java/mc/core/{embedded => player}/SimplePlayer.java (86%) diff --git a/core/src/main/java/mc/core/GameLoop.java b/core/src/main/java/mc/core/GameLoop.java index e63fdfb..9a2a23f 100644 --- a/core/src/main/java/mc/core/GameLoop.java +++ b/core/src/main/java/mc/core/GameLoop.java @@ -6,11 +6,10 @@ package mc.core; import lombok.Setter; import lombok.extern.slf4j.Slf4j; +import mc.core.player.PlayerManager; import mc.core.time.TimeProcessor; import org.springframework.beans.factory.annotation.Autowired; -import java.util.Calendar; - @Slf4j public class GameLoop extends Thread { @Autowired diff --git a/core/src/main/java/mc/core/chat/ChatProcessor.java b/core/src/main/java/mc/core/chat/ChatProcessor.java index 5219781..b4d6a36 100644 --- a/core/src/main/java/mc/core/chat/ChatProcessor.java +++ b/core/src/main/java/mc/core/chat/ChatProcessor.java @@ -4,7 +4,7 @@ */ package mc.core.chat; -import mc.core.Player; +import mc.core.player.Player; import org.slf4j.Marker; import org.slf4j.helpers.BasicMarkerFactory; diff --git a/core/src/main/java/mc/core/chat/SimpleChatProcessor.java b/core/src/main/java/mc/core/chat/SimpleChatProcessor.java index 40f3edc..54d4b85 100644 --- a/core/src/main/java/mc/core/chat/SimpleChatProcessor.java +++ b/core/src/main/java/mc/core/chat/SimpleChatProcessor.java @@ -5,8 +5,8 @@ package mc.core.chat; import lombok.extern.slf4j.Slf4j; -import mc.core.Player; -import mc.core.PlayerManager; +import mc.core.player.Player; +import mc.core.player.PlayerManager; import org.springframework.beans.factory.annotation.Autowired; @Slf4j diff --git a/core/src/main/java/mc/core/events/PlayerLookEvent.java b/core/src/main/java/mc/core/events/PlayerLookEvent.java index c478e95..2d03b0b 100644 --- a/core/src/main/java/mc/core/events/PlayerLookEvent.java +++ b/core/src/main/java/mc/core/events/PlayerLookEvent.java @@ -7,8 +7,8 @@ package mc.core.events; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; -import mc.core.Look; -import mc.core.Player; +import mc.core.player.Look; +import mc.core.player.Player; @RequiredArgsConstructor @Getter diff --git a/core/src/main/java/mc/core/events/PlayerPositionEvent.java b/core/src/main/java/mc/core/events/PlayerPositionEvent.java index fc36919..2b296f6 100644 --- a/core/src/main/java/mc/core/events/PlayerPositionEvent.java +++ b/core/src/main/java/mc/core/events/PlayerPositionEvent.java @@ -8,7 +8,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; import mc.core.Location; -import mc.core.Player; +import mc.core.player.Player; @RequiredArgsConstructor @Getter diff --git a/core/src/main/java/mc/core/network/BroadcastNetChannel.java b/core/src/main/java/mc/core/network/BroadcastNetChannel.java index d261a2b..56628fb 100644 --- a/core/src/main/java/mc/core/network/BroadcastNetChannel.java +++ b/core/src/main/java/mc/core/network/BroadcastNetChannel.java @@ -5,7 +5,7 @@ package mc.core.network; import lombok.RequiredArgsConstructor; -import mc.core.Player; +import mc.core.player.Player; import java.util.stream.Stream; diff --git a/core/src/main/java/mc/core/embedded/InMemoryPlayerManager.java b/core/src/main/java/mc/core/player/InMemoryPlayerManager.java similarity index 97% rename from core/src/main/java/mc/core/embedded/InMemoryPlayerManager.java rename to core/src/main/java/mc/core/player/InMemoryPlayerManager.java index 915a1ae..5994775 100644 --- a/core/src/main/java/mc/core/embedded/InMemoryPlayerManager.java +++ b/core/src/main/java/mc/core/player/InMemoryPlayerManager.java @@ -2,13 +2,11 @@ * DmitriyMX * 2018-04-15 */ -package mc.core.embedded; +package mc.core.player; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import mc.core.Config; -import mc.core.Player; -import mc.core.PlayerManager; import mc.core.network.BroadcastNetChannel; import mc.core.network.NetChannel; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/src/main/java/mc/core/Look.java b/core/src/main/java/mc/core/player/Look.java similarity index 88% rename from core/src/main/java/mc/core/Look.java rename to core/src/main/java/mc/core/player/Look.java index 594b214..175bcde 100644 --- a/core/src/main/java/mc/core/Look.java +++ b/core/src/main/java/mc/core/player/Look.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-04-22 */ -package mc.core; +package mc.core.player; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/mc/core/Player.java b/core/src/main/java/mc/core/player/Player.java similarity index 89% rename from core/src/main/java/mc/core/Player.java rename to core/src/main/java/mc/core/player/Player.java index b4c74b7..5272578 100644 --- a/core/src/main/java/mc/core/Player.java +++ b/core/src/main/java/mc/core/player/Player.java @@ -2,8 +2,9 @@ * DmitriyMX * 2018-04-13 */ -package mc.core; +package mc.core.player; +import mc.core.Location; import mc.core.network.NetChannel; public interface Player { diff --git a/core/src/main/java/mc/core/PlayerManager.java b/core/src/main/java/mc/core/player/PlayerManager.java similarity index 94% rename from core/src/main/java/mc/core/PlayerManager.java rename to core/src/main/java/mc/core/player/PlayerManager.java index 34d360f..a3458a7 100644 --- a/core/src/main/java/mc/core/PlayerManager.java +++ b/core/src/main/java/mc/core/player/PlayerManager.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-04-15 */ -package mc.core; +package mc.core.player; import mc.core.network.NetChannel; diff --git a/core/src/main/java/mc/core/embedded/SimplePlayer.java b/core/src/main/java/mc/core/player/SimplePlayer.java similarity index 86% rename from core/src/main/java/mc/core/embedded/SimplePlayer.java rename to core/src/main/java/mc/core/player/SimplePlayer.java index 26c7655..848980f 100644 --- a/core/src/main/java/mc/core/embedded/SimplePlayer.java +++ b/core/src/main/java/mc/core/player/SimplePlayer.java @@ -2,12 +2,10 @@ * DmitriyMX * 2018-04-23 */ -package mc.core.embedded; +package mc.core.player; import lombok.Data; import mc.core.Location; -import mc.core.Look; -import mc.core.Player; import mc.core.network.NetChannel; @Data diff --git a/core/src/main/resources/spring.xml b/core/src/main/resources/spring.xml index 0424169..f4c2344 100644 --- a/core/src/main/resources/spring.xml +++ b/core/src/main/resources/spring.xml @@ -16,7 +16,7 @@ - + \ No newline at end of file diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/PositionAndLookPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/PositionAndLookPacket.java index 460bab7..8761e76 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/PositionAndLookPacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/PositionAndLookPacket.java @@ -8,7 +8,7 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; import mc.core.Location; -import mc.core.Look; +import mc.core.player.Look; import mc.core.network.CSPacket; import mc.core.network.NetStream; import mc.core.network.SCPacket; diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/SpawnNamedEntityPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/SpawnNamedEntityPacket.java index b4875cf..1dfff2f 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/SpawnNamedEntityPacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/SpawnNamedEntityPacket.java @@ -8,7 +8,7 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; import mc.core.Location; -import mc.core.Look; +import mc.core.player.Look; import mc.core.network.SCPacket; import mc.core.network.proto_125.ByteArrayOutputNetStream; diff --git a/proto125_netty/src/main/java/mc/core/network/proto_125/netty/EventListener.java b/proto125_netty/src/main/java/mc/core/network/proto_125/netty/EventListener.java index bf0f615..4c64088 100644 --- a/proto125_netty/src/main/java/mc/core/network/proto_125/netty/EventListener.java +++ b/proto125_netty/src/main/java/mc/core/network/proto_125/netty/EventListener.java @@ -7,8 +7,8 @@ package mc.core.network.proto_125.netty; import com.google.common.eventbus.Subscribe; import lombok.RequiredArgsConstructor; import mc.core.Config; -import mc.core.Player; -import mc.core.PlayerManager; +import mc.core.player.Player; +import mc.core.player.PlayerManager; import mc.core.events.LoginEvent; import mc.core.events.ServerPingEvent; diff --git a/proto125_netty/src/main/java/mc/core/network/proto_125/netty/NettyServer.java b/proto125_netty/src/main/java/mc/core/network/proto_125/netty/NettyServer.java index 9add56e..06635f3 100644 --- a/proto125_netty/src/main/java/mc/core/network/proto_125/netty/NettyServer.java +++ b/proto125_netty/src/main/java/mc/core/network/proto_125/netty/NettyServer.java @@ -14,7 +14,7 @@ import io.netty.channel.socket.nio.NioServerSocketChannel; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import mc.core.Config; -import mc.core.PlayerManager; +import mc.core.player.PlayerManager; import mc.core.events.EventBusGetter; import mc.core.network.Server; import mc.core.network.StartServerException; diff --git a/proto125_netty/src/main/java/mc/core/network/proto_125/netty/PacketHandler.java b/proto125_netty/src/main/java/mc/core/network/proto_125/netty/PacketHandler.java index fa241fe..122fb2b 100644 --- a/proto125_netty/src/main/java/mc/core/network/proto_125/netty/PacketHandler.java +++ b/proto125_netty/src/main/java/mc/core/network/proto_125/netty/PacketHandler.java @@ -18,6 +18,9 @@ import mc.core.events.*; import mc.core.network.CSPacket; import mc.core.network.proto_125.netty.wrappers.WrapperNetChannel; import mc.core.network.proto_125.packets.*; +import mc.core.player.Look; +import mc.core.player.Player; +import mc.core.player.PlayerManager; import mc.core.world.World; import org.springframework.beans.factory.annotation.Autowired;