From a0efe44e8d04e4ef25778abfe2efd537d9002a36 Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Wed, 26 Jun 2024 23:57:37 +0500 Subject: [PATCH] Clean up package structure --- .../core/api/internal/ClientApi.java | 4 +-- .../api/internal/ClientPluginChannelApi.java | 10 +++--- .../core/api/internal/ServerApi.java | 4 +-- .../core/level/DhClientLevel.java | 5 ++- .../core/level/DhServerLevel.java | 17 +++++---- .../client/AbstractFullDataRequestQueue.java | 6 ++-- .../client/ClientNetworkState.java | 13 ++++--- .../config/AbstractMultiplayerConfig.java | 2 +- .../server/RemotePlayerConnectionHandler.java | 16 ++++----- .../multiplayer/server/ServerPlayerState.java | 14 ++++---- .../{protocol => }/INetworkObject.java | 2 +- .../{ => event}/NetworkEventSource.java | 33 +++++++++-------- .../plugin => event}/PluginCloseEvent.java | 7 ++-- .../{ => event}/ScopedNetworkEventSource.java | 9 +++-- .../{plugin => }/ILevelRelatedMessage.java | 2 +- ...sageRegistry.java => MessageRegistry.java} | 35 +++++++++---------- .../NetworkMessage.java} | 13 +++---- .../TrackableMessage.java | 8 ++--- .../{plugin => }/base/CloseReasonMessage.java | 6 ++-- .../CurrentLevelKeyMessage.java | 6 ++-- .../RemotePlayerConfigMessage.java | 8 ++--- .../FullDataPartialUpdateMessage.java | 10 +++--- .../FullDataSourceRequestMessage.java | 8 ++--- .../FullDataSourceResponseMessage.java | 6 ++-- .../base => requests}/CancelMessage.java | 4 +-- .../base => requests}/ExceptionMessage.java | 4 +-- .../Session.java} | 20 +++++------ .../SessionClosedException.java | 2 +- .../core/sql/dto/FullDataSourceV2DTO.java | 2 +- .../misc/IPluginPacketSender.java | 9 ++--- 30 files changed, 135 insertions(+), 150 deletions(-) rename core/src/main/java/com/seibel/distanthorizons/core/network/{protocol => }/INetworkObject.java (98%) rename core/src/main/java/com/seibel/distanthorizons/core/network/{ => event}/NetworkEventSource.java (76%) rename core/src/main/java/com/seibel/distanthorizons/core/network/{messages/plugin => event}/PluginCloseEvent.java (63%) rename core/src/main/java/com/seibel/distanthorizons/core/network/{ => event}/ScopedNetworkEventSource.java (79%) rename core/src/main/java/com/seibel/distanthorizons/core/network/messages/{plugin => }/ILevelRelatedMessage.java (86%) rename core/src/main/java/com/seibel/distanthorizons/core/network/messages/{PluginMessageRegistry.java => MessageRegistry.java} (62%) rename core/src/main/java/com/seibel/distanthorizons/core/network/{plugin/PluginChannelMessage.java => messages/NetworkMessage.java} (65%) rename core/src/main/java/com/seibel/distanthorizons/core/network/{plugin => messages}/TrackableMessage.java (88%) rename core/src/main/java/com/seibel/distanthorizons/core/network/messages/{plugin => }/base/CloseReasonMessage.java (86%) rename core/src/main/java/com/seibel/distanthorizons/core/network/messages/{plugin => base}/CurrentLevelKeyMessage.java (72%) rename core/src/main/java/com/seibel/distanthorizons/core/network/messages/{plugin/session => base}/RemotePlayerConfigMessage.java (84%) rename core/src/main/java/com/seibel/distanthorizons/core/network/messages/{plugin => }/fullData/FullDataPartialUpdateMessage.java (85%) rename core/src/main/java/com/seibel/distanthorizons/core/network/messages/{plugin => }/fullData/FullDataSourceRequestMessage.java (86%) rename core/src/main/java/com/seibel/distanthorizons/core/network/messages/{plugin => }/fullData/FullDataSourceResponseMessage.java (91%) rename core/src/main/java/com/seibel/distanthorizons/core/network/messages/{plugin/base => requests}/CancelMessage.java (87%) rename core/src/main/java/com/seibel/distanthorizons/core/network/messages/{plugin/base => requests}/ExceptionMessage.java (94%) rename core/src/main/java/com/seibel/distanthorizons/core/network/{plugin/PluginChannelSession.java => session/Session.java} (79%) rename core/src/main/java/com/seibel/distanthorizons/core/network/{exceptions => session}/SessionClosedException.java (74%) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java index b5dfc7c7c..80a8a6d88 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java @@ -24,7 +24,7 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiRenderPass; import com.seibel.distanthorizons.api.methods.events.abstractEvents.*; import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam; import com.seibel.distanthorizons.core.config.Config; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelMessage; +import com.seibel.distanthorizons.core.network.messages.NetworkMessage; import com.seibel.distanthorizons.coreapi.ModInfo; import com.seibel.distanthorizons.api.enums.rendering.EDhApiDebugRendering; import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode; @@ -330,7 +330,7 @@ public class ClientApi // networking // //============// - public void pluginMessageReceived(@NotNull PluginChannelMessage message) + public void pluginMessageReceived(@NotNull NetworkMessage message) { this.pluginChannelApi.session.tryHandleMessage(message); } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientPluginChannelApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientPluginChannelApi.java index d3452ec37..465372a2f 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientPluginChannelApi.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientPluginChannelApi.java @@ -5,9 +5,9 @@ import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.level.IKeyedClientLevelManager; import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel; import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; -import com.seibel.distanthorizons.core.network.messages.plugin.PluginCloseEvent; -import com.seibel.distanthorizons.core.network.messages.plugin.CurrentLevelKeyMessage; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelSession; +import com.seibel.distanthorizons.core.network.event.PluginCloseEvent; +import com.seibel.distanthorizons.core.network.messages.base.CurrentLevelKeyMessage; +import com.seibel.distanthorizons.core.network.session.Session; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; import org.apache.logging.log4j.LogManager; @@ -29,7 +29,7 @@ public class ClientPluginChannelApi private final Consumer levelUnloadHandler; private final Consumer multiverseLevelLoadHandler; - public PluginChannelSession session; + public Session session; public boolean allowLevelAutoload() @@ -45,7 +45,7 @@ public class ClientPluginChannelApi this.multiverseLevelLoadHandler = levelLoadHandler; } - public void onJoin(@NonNull PluginChannelSession session) + public void onJoin(@NonNull Session session) { Objects.requireNonNull(session); this.session = session; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ServerApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ServerApi.java index 11793c1e0..7f16944bf 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ServerApi.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ServerApi.java @@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.internal; import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelLoadEvent; import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelUnloadEvent; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelMessage; +import com.seibel.distanthorizons.core.network.messages.NetworkMessage; import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper; import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector; import com.seibel.distanthorizons.core.world.AbstractDhWorld; @@ -174,7 +174,7 @@ public class ServerApi } } - public void pluginMessageReceived(IServerPlayerWrapper player, @NotNull PluginChannelMessage message) + public void pluginMessageReceived(IServerPlayerWrapper player, @NotNull NetworkMessage message) { IDhServerWorld serverWorld = SharedApi.getIDhServerWorld(); if (serverWorld instanceof DhServerWorld) // TODO add support for DhClientServerWorld's (lan worlds) as well diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java index ae8c7c98c..3c95cfee4 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java @@ -31,11 +31,10 @@ import com.seibel.distanthorizons.core.generation.WorldRemoteGenerationQueue; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.multiplayer.client.ClientNetworkState; import com.seibel.distanthorizons.core.multiplayer.client.FullDataRefreshQueue; -import com.seibel.distanthorizons.core.network.ScopedNetworkEventSource; -import com.seibel.distanthorizons.core.network.messages.plugin.fullData.FullDataPartialUpdateMessage; +import com.seibel.distanthorizons.core.network.event.ScopedNetworkEventSource; +import com.seibel.distanthorizons.core.network.messages.fullData.FullDataPartialUpdateMessage; import com.seibel.distanthorizons.core.pos.DhBlockPos; import com.seibel.distanthorizons.core.pos.DhBlockPos2D; -import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.render.renderer.DebugRenderer; import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java index 3932deb7e..6dcf896ce 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java @@ -27,14 +27,13 @@ import com.seibel.distanthorizons.core.multiplayer.server.ServerPlayerState; import com.seibel.distanthorizons.core.multiplayer.server.RemotePlayerConnectionHandler; import com.seibel.distanthorizons.core.network.exceptions.InvalidLevelException; import com.seibel.distanthorizons.core.network.exceptions.RequestRejectedException; -import com.seibel.distanthorizons.core.network.messages.plugin.ILevelRelatedMessage; -import com.seibel.distanthorizons.core.network.messages.plugin.base.CancelMessage; -import com.seibel.distanthorizons.core.network.messages.plugin.fullData.FullDataSourceRequestMessage; -import com.seibel.distanthorizons.core.network.messages.plugin.fullData.FullDataSourceResponseMessage; -import com.seibel.distanthorizons.core.network.messages.plugin.fullData.FullDataPartialUpdateMessage; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelMessage; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelSession; -import com.seibel.distanthorizons.core.network.plugin.TrackableMessage; +import com.seibel.distanthorizons.core.network.messages.ILevelRelatedMessage; +import com.seibel.distanthorizons.core.network.messages.requests.CancelMessage; +import com.seibel.distanthorizons.core.network.messages.fullData.FullDataSourceRequestMessage; +import com.seibel.distanthorizons.core.network.messages.fullData.FullDataSourceResponseMessage; +import com.seibel.distanthorizons.core.network.messages.fullData.FullDataPartialUpdateMessage; +import com.seibel.distanthorizons.core.network.messages.NetworkMessage; +import com.seibel.distanthorizons.core.network.messages.TrackableMessage; import com.seibel.distanthorizons.core.pos.DhBlockPos2D; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.pos.DhSectionPos; @@ -178,7 +177,7 @@ public class DhServerLevel extends AbstractDhLevel implements IDhServerLevel - public Consumer currentLevelOnly(Consumer next) + public Consumer currentLevelOnly(Consumer next) { return msg -> { diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/AbstractFullDataRequestQueue.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/AbstractFullDataRequestQueue.java index da340bd86..725cf2ce0 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/AbstractFullDataRequestQueue.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/AbstractFullDataRequestQueue.java @@ -10,9 +10,9 @@ import com.seibel.distanthorizons.core.logging.ConfigBasedSpamLogger; import com.seibel.distanthorizons.core.network.exceptions.InvalidLevelException; import com.seibel.distanthorizons.core.network.exceptions.RateLimitedException; import com.seibel.distanthorizons.core.network.exceptions.RequestRejectedException; -import com.seibel.distanthorizons.core.network.exceptions.SessionClosedException; -import com.seibel.distanthorizons.core.network.messages.plugin.fullData.FullDataSourceRequestMessage; -import com.seibel.distanthorizons.core.network.messages.plugin.fullData.FullDataSourceResponseMessage; +import com.seibel.distanthorizons.core.network.session.SessionClosedException; +import com.seibel.distanthorizons.core.network.messages.fullData.FullDataSourceRequestMessage; +import com.seibel.distanthorizons.core.network.messages.fullData.FullDataSourceResponseMessage; import com.seibel.distanthorizons.core.pos.DhBlockPos2D; import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.render.renderer.DebugRenderer; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/ClientNetworkState.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/ClientNetworkState.java index 804b78120..db5389b23 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/ClientNetworkState.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/ClientNetworkState.java @@ -2,13 +2,12 @@ package com.seibel.distanthorizons.core.multiplayer.client; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; -import com.seibel.distanthorizons.core.logging.f3.F3Screen; import com.seibel.distanthorizons.core.multiplayer.config.MultiplayerConfig; import com.seibel.distanthorizons.core.multiplayer.config.MultiplayerConfigChangeListener; -import com.seibel.distanthorizons.core.network.ScopedNetworkEventSource; -import com.seibel.distanthorizons.core.network.messages.plugin.PluginCloseEvent; -import com.seibel.distanthorizons.core.network.messages.plugin.session.RemotePlayerConfigMessage; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelSession; +import com.seibel.distanthorizons.core.network.event.ScopedNetworkEventSource; +import com.seibel.distanthorizons.core.network.event.PluginCloseEvent; +import com.seibel.distanthorizons.core.network.messages.base.RemotePlayerConfigMessage; +import com.seibel.distanthorizons.core.network.session.Session; import org.apache.logging.log4j.LogManager; import java.io.Closeable; @@ -19,7 +18,7 @@ public class ClientNetworkState implements Closeable protected static final ConfigBasedLogger LOGGER = new ConfigBasedLogger(LogManager.getLogger(), () -> Config.Client.Advanced.Logging.logNetworkEvent.get()); - private final PluginChannelSession session = new PluginChannelSession(null); + private final Session session = new Session(null); private EServerSupportStatus serverSupportStatus = EServerSupportStatus.NONE; @@ -32,7 +31,7 @@ public class ClientNetworkState implements Closeable * Returns the client used by this instance.

* If you need to subscribe to any packet events, create an instance of {@link ScopedNetworkEventSource} using the returned instance. */ - public PluginChannelSession getSession() { return this.session; } + public Session getSession() { return this.session; } /** * Constructs a new instance. diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/AbstractMultiplayerConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/AbstractMultiplayerConfig.java index 317bb0910..444a53464 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/AbstractMultiplayerConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/AbstractMultiplayerConfig.java @@ -1,7 +1,7 @@ package com.seibel.distanthorizons.core.multiplayer.config; import com.google.common.base.MoreObjects; -import com.seibel.distanthorizons.core.network.protocol.INetworkObject; +import com.seibel.distanthorizons.core.network.INetworkObject; import io.netty.buffer.ByteBuf; public abstract class AbstractMultiplayerConfig implements INetworkObject diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/RemotePlayerConnectionHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/RemotePlayerConnectionHandler.java index 97b28c093..be1c9798f 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/RemotePlayerConnectionHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/RemotePlayerConnectionHandler.java @@ -1,7 +1,7 @@ package com.seibel.distanthorizons.core.multiplayer.server; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelMessage; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelSession; +import com.seibel.distanthorizons.core.network.messages.NetworkMessage; +import com.seibel.distanthorizons.core.network.session.Session; import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper; import java.util.Queue; @@ -12,15 +12,15 @@ import java.util.concurrent.ConcurrentMap; public class RemotePlayerConnectionHandler { private final ConcurrentMap connectedPlayers = new ConcurrentHashMap<>(); - private final ConcurrentMap> messageQueue = new ConcurrentHashMap<>(); + private final ConcurrentMap> messageQueue = new ConcurrentHashMap<>(); - public void handlePluginMessage(IServerPlayerWrapper player, PluginChannelMessage message) + public void handlePluginMessage(IServerPlayerWrapper player, NetworkMessage message) { ServerPlayerState playerState = this.connectedPlayers.get(player); if (playerState != null) { - PluginChannelSession session = playerState.session; + Session session = playerState.session; message.setSession(session); session.tryHandleMessage(message); } @@ -45,11 +45,11 @@ public class RemotePlayerConnectionHandler ServerPlayerState state = new ServerPlayerState(serverPlayer); this.connectedPlayers.put(serverPlayer, state); - Queue queuedMessages = this.messageQueue.get(serverPlayer); + Queue queuedMessages = this.messageQueue.get(serverPlayer); if (queuedMessages != null) { - PluginChannelSession session = state.session; - for (PluginChannelMessage message : queuedMessages) + Session session = state.session; + for (NetworkMessage message : queuedMessages) { message.setSession(session); session.tryHandleMessage(message); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/ServerPlayerState.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/ServerPlayerState.java index 540624b34..4fc4204ee 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/ServerPlayerState.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/ServerPlayerState.java @@ -3,12 +3,12 @@ package com.seibel.distanthorizons.core.multiplayer.server; import com.seibel.distanthorizons.core.level.DhServerLevel; import com.seibel.distanthorizons.core.multiplayer.config.MultiplayerConfig; import com.seibel.distanthorizons.core.multiplayer.config.MultiplayerConfigChangeListener; -import com.seibel.distanthorizons.core.network.messages.plugin.CurrentLevelKeyMessage; -import com.seibel.distanthorizons.core.network.messages.plugin.session.RemotePlayerConfigMessage; -import com.seibel.distanthorizons.core.network.messages.plugin.PluginCloseEvent; +import com.seibel.distanthorizons.core.network.messages.base.CurrentLevelKeyMessage; +import com.seibel.distanthorizons.core.network.messages.base.RemotePlayerConfigMessage; +import com.seibel.distanthorizons.core.network.event.PluginCloseEvent; import com.seibel.distanthorizons.core.network.exceptions.RateLimitedException; -import com.seibel.distanthorizons.core.network.messages.plugin.fullData.FullDataSourceRequestMessage; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelSession; +import com.seibel.distanthorizons.core.network.messages.fullData.FullDataSourceRequestMessage; +import com.seibel.distanthorizons.core.network.session.Session; import com.seibel.distanthorizons.core.util.ratelimiting.SupplierBasedRateAndConcurrencyLimiter; import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper; import org.jetbrains.annotations.NotNull; @@ -19,7 +19,7 @@ import static com.seibel.distanthorizons.core.config.Config.Client.Advanced.Mult public class ServerPlayerState { - public final PluginChannelSession session; + public final Session session; public IServerPlayerWrapper serverPlayer() { return this.session.serverPlayer; } @NotNull @@ -41,7 +41,7 @@ public class ServerPlayerState public ServerPlayerState(IServerPlayerWrapper serverPlayer) { - this.session = new PluginChannelSession(serverPlayer); + this.session = new Session(serverPlayer); this.session.registerHandler(RemotePlayerConfigMessage.class, remotePlayerConfigMessage -> { diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/protocol/INetworkObject.java b/core/src/main/java/com/seibel/distanthorizons/core/network/INetworkObject.java similarity index 98% rename from core/src/main/java/com/seibel/distanthorizons/core/network/protocol/INetworkObject.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/INetworkObject.java index 3e746c075..4d81250e1 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/protocol/INetworkObject.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/INetworkObject.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.core.network.protocol; +package com.seibel.distanthorizons.core.network; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.Contract; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/NetworkEventSource.java b/core/src/main/java/com/seibel/distanthorizons/core/network/event/NetworkEventSource.java similarity index 76% rename from core/src/main/java/com/seibel/distanthorizons/core/network/NetworkEventSource.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/event/NetworkEventSource.java index 1b99328b7..b0926ffda 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/NetworkEventSource.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/event/NetworkEventSource.java @@ -17,17 +17,16 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.core.network; +package com.seibel.distanthorizons.core.network.event; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; -import com.seibel.distanthorizons.core.network.exceptions.SessionClosedException; -import com.seibel.distanthorizons.core.network.messages.PluginMessageRegistry; -import com.seibel.distanthorizons.core.network.messages.plugin.base.CancelMessage; -import com.seibel.distanthorizons.core.network.messages.plugin.base.ExceptionMessage; -import com.seibel.distanthorizons.core.network.messages.plugin.PluginCloseEvent; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelMessage; -import com.seibel.distanthorizons.core.network.plugin.TrackableMessage; +import com.seibel.distanthorizons.core.network.messages.NetworkMessage; +import com.seibel.distanthorizons.core.network.messages.TrackableMessage; +import com.seibel.distanthorizons.core.network.messages.MessageRegistry; +import com.seibel.distanthorizons.core.network.session.SessionClosedException; +import com.seibel.distanthorizons.core.network.messages.requests.CancelMessage; +import com.seibel.distanthorizons.core.network.messages.requests.ExceptionMessage; import com.seibel.distanthorizons.coreapi.ModInfo; import org.apache.logging.log4j.LogManager; @@ -44,23 +43,23 @@ public abstract class NetworkEventSource { private static final ConfigBasedLogger LOGGER = new ConfigBasedLogger(LogManager.getLogger(), () -> Config.Client.Advanced.Logging.logNetworkEvent.get()); - protected final ConcurrentMap, Set>> handlers = new ConcurrentHashMap<>(); + protected final ConcurrentMap, Set>> handlers = new ConcurrentHashMap<>(); private final ConcurrentMap pendingFutures = new ConcurrentHashMap<>(); - protected boolean hasHandler(Class handlerClass) + protected boolean hasHandler(Class handlerClass) { return this.handlers.containsKey(handlerClass); } - protected void handleMessage(PluginChannelMessage message) + protected void handleMessage(NetworkMessage message) { boolean handled = false; - Set> handlerList = this.handlers.get(message.getClass()); + Set> handlerList = this.handlers.get(message.getClass()); if (handlerList != null) { - for (Consumer handler : handlerList) + for (Consumer handler : handlerList) { handled = true; handler.accept(message); @@ -96,7 +95,7 @@ public abstract class NetworkEventSource } } - public void registerHandler(Class handlerClass, Consumer handlerImplementation) + public void registerHandler(Class handlerClass, Consumer handlerImplementation) { //noinspection unchecked this.handlers.computeIfAbsent(handlerClass, missingHandlerClass -> @@ -104,14 +103,14 @@ public abstract class NetworkEventSource // Will throw if the handler class is not found if (handlerClass != PluginCloseEvent.class) { - PluginMessageRegistry.INSTANCE.getMessageId(handlerClass); + MessageRegistry.INSTANCE.getMessageId(handlerClass); } return new HashSet<>(); }) - .add((Consumer) handlerImplementation); + .add((Consumer) handlerImplementation); } - protected void removeHandler(Class handlerClass, Consumer handlerImplementation) + protected void removeHandler(Class handlerClass, Consumer handlerImplementation) { this.handlers.computeIfAbsent(handlerClass, missingHandlerClass -> new HashSet<>()) .remove(handlerImplementation); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/PluginCloseEvent.java b/core/src/main/java/com/seibel/distanthorizons/core/network/event/PluginCloseEvent.java similarity index 63% rename from core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/PluginCloseEvent.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/event/PluginCloseEvent.java index 8d2fbb693..1a6cee6b7 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/PluginCloseEvent.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/event/PluginCloseEvent.java @@ -1,13 +1,12 @@ -package com.seibel.distanthorizons.core.network.messages.plugin; +package com.seibel.distanthorizons.core.network.event; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelMessage; -import com.seibel.distanthorizons.core.network.protocol.INetworkObject; +import com.seibel.distanthorizons.core.network.messages.NetworkMessage; import io.netty.buffer.ByteBuf; /** * This is not a "real" message, and only used to indicate a disconnection. */ -public class PluginCloseEvent extends PluginChannelMessage +public class PluginCloseEvent extends NetworkMessage { @Override public void encode(ByteBuf out) { throw new UnsupportedOperationException(this.getClass().getSimpleName() + " is not a real message, and cannot be sent."); } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/ScopedNetworkEventSource.java b/core/src/main/java/com/seibel/distanthorizons/core/network/event/ScopedNetworkEventSource.java similarity index 79% rename from core/src/main/java/com/seibel/distanthorizons/core/network/ScopedNetworkEventSource.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/event/ScopedNetworkEventSource.java index a66a2f2b7..2c99e25dd 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/ScopedNetworkEventSource.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/event/ScopedNetworkEventSource.java @@ -17,10 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.core.network; +package com.seibel.distanthorizons.core.network.event; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelMessage; -import com.seibel.distanthorizons.core.network.protocol.INetworkObject; +import com.seibel.distanthorizons.core.network.messages.NetworkMessage; import java.util.function.Consumer; @@ -36,7 +35,7 @@ public final class ScopedNetworkEventSource extends NetworkEventSource } @Override - public void registerHandler(Class handlerClass, Consumer handlerImplementation) + public void registerHandler(Class handlerClass, Consumer handlerImplementation) { if (this.isClosed) { @@ -55,7 +54,7 @@ public final class ScopedNetworkEventSource extends NetworkEventSource public void close() { this.isClosed = true; - for (Class handlerClass : this.handlers.keySet()) + for (Class handlerClass : this.handlers.keySet()) { this.parent.removeHandler(handlerClass, this::handleMessage); } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/ILevelRelatedMessage.java b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/ILevelRelatedMessage.java similarity index 86% rename from core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/ILevelRelatedMessage.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/messages/ILevelRelatedMessage.java index 8db135a64..3bbb5826d 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/ILevelRelatedMessage.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/ILevelRelatedMessage.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.core.network.messages.plugin; +package com.seibel.distanthorizons.core.network.messages; import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/PluginMessageRegistry.java b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/MessageRegistry.java similarity index 62% rename from core/src/main/java/com/seibel/distanthorizons/core/network/messages/PluginMessageRegistry.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/messages/MessageRegistry.java index 71bbcff9d..d1c3d00fc 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/PluginMessageRegistry.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/MessageRegistry.java @@ -21,30 +21,29 @@ package com.seibel.distanthorizons.core.network.messages; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import com.seibel.distanthorizons.core.network.messages.plugin.CurrentLevelKeyMessage; -import com.seibel.distanthorizons.core.network.messages.plugin.base.CancelMessage; -import com.seibel.distanthorizons.core.network.messages.plugin.base.CloseReasonMessage; -import com.seibel.distanthorizons.core.network.messages.plugin.base.ExceptionMessage; -import com.seibel.distanthorizons.core.network.messages.plugin.fullData.FullDataPartialUpdateMessage; -import com.seibel.distanthorizons.core.network.messages.plugin.fullData.FullDataSourceRequestMessage; -import com.seibel.distanthorizons.core.network.messages.plugin.fullData.FullDataSourceResponseMessage; -import com.seibel.distanthorizons.core.network.messages.plugin.session.RemotePlayerConfigMessage; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelMessage; +import com.seibel.distanthorizons.core.network.messages.base.CurrentLevelKeyMessage; +import com.seibel.distanthorizons.core.network.messages.base.RemotePlayerConfigMessage; +import com.seibel.distanthorizons.core.network.messages.requests.CancelMessage; +import com.seibel.distanthorizons.core.network.messages.base.CloseReasonMessage; +import com.seibel.distanthorizons.core.network.messages.requests.ExceptionMessage; +import com.seibel.distanthorizons.core.network.messages.fullData.FullDataPartialUpdateMessage; +import com.seibel.distanthorizons.core.network.messages.fullData.FullDataSourceRequestMessage; +import com.seibel.distanthorizons.core.network.messages.fullData.FullDataSourceResponseMessage; import java.util.HashMap; import java.util.Map; import java.util.function.Supplier; -public class PluginMessageRegistry +public class MessageRegistry { - public static final PluginMessageRegistry INSTANCE = new PluginMessageRegistry(); + public static final MessageRegistry INSTANCE = new MessageRegistry(); - private final Map> idToSupplier = new HashMap<>(); - private final BiMap, Integer> classToId = HashBiMap.create(); + private final Map> idToSupplier = new HashMap<>(); + private final BiMap, Integer> classToId = HashBiMap.create(); - private PluginMessageRegistry() + private MessageRegistry() { // Note: Messages must have parameterless constructors @@ -69,14 +68,14 @@ public class PluginMessageRegistry - protected void registerMessage(Class clazz, Supplier supplier) + protected void registerMessage(Class clazz, Supplier supplier) { int id = this.idToSupplier.size() + 1; this.idToSupplier.put(id, supplier); this.classToId.put(clazz, id); } - public PluginChannelMessage createMessage(int messageId) throws IllegalArgumentException + public NetworkMessage createMessage(int messageId) throws IllegalArgumentException { try { @@ -88,12 +87,12 @@ public class PluginMessageRegistry } } - public int getMessageId(PluginChannelMessage message) + public int getMessageId(NetworkMessage message) { return this.getMessageId(message.getClass()); } - public int getMessageId(Class messageClass) + public int getMessageId(Class messageClass) { try { diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/plugin/PluginChannelMessage.java b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/NetworkMessage.java similarity index 65% rename from core/src/main/java/com/seibel/distanthorizons/core/network/plugin/PluginChannelMessage.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/messages/NetworkMessage.java index 003e8bc39..64e684075 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/plugin/PluginChannelMessage.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/NetworkMessage.java @@ -1,22 +1,23 @@ -package com.seibel.distanthorizons.core.network.plugin; +package com.seibel.distanthorizons.core.network.messages; import com.google.common.base.MoreObjects; -import com.seibel.distanthorizons.core.network.protocol.INetworkObject; +import com.seibel.distanthorizons.core.network.INetworkObject; +import com.seibel.distanthorizons.core.network.session.Session; import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper; -public abstract class PluginChannelMessage implements INetworkObject +public abstract class NetworkMessage implements INetworkObject { - public PluginChannelSession session = null; + public Session session = null; public IServerPlayerWrapper serverPlayer() { return this.session.serverPlayer; } public boolean warnWhenUnhandled() { return true; } - public PluginChannelSession getConnection() + public Session getConnection() { return this.session; } - public void setSession(PluginChannelSession connection) + public void setSession(Session connection) { if (this.session != null) { diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/plugin/TrackableMessage.java b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/TrackableMessage.java similarity index 88% rename from core/src/main/java/com/seibel/distanthorizons/core/network/plugin/TrackableMessage.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/messages/TrackableMessage.java index e303f934c..ca9227c3a 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/plugin/TrackableMessage.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/TrackableMessage.java @@ -17,20 +17,18 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.core.network.plugin; +package com.seibel.distanthorizons.core.network.messages; import com.google.common.base.MoreObjects; -import com.google.common.collect.MapMaker; import com.seibel.distanthorizons.core.api.internal.SharedApi; -import com.seibel.distanthorizons.core.network.messages.plugin.base.ExceptionMessage; +import com.seibel.distanthorizons.core.network.messages.requests.ExceptionMessage; import com.seibel.distanthorizons.core.world.EWorldEnvironment; import io.netty.buffer.ByteBuf; import java.util.Objects; -import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; -public abstract class TrackableMessage extends PluginChannelMessage +public abstract class TrackableMessage extends NetworkMessage { private static final AtomicInteger lastId = new AtomicInteger(); // 32 bits - Context ID (not transmitted) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/base/CloseReasonMessage.java b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/base/CloseReasonMessage.java similarity index 86% rename from core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/base/CloseReasonMessage.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/messages/base/CloseReasonMessage.java index 367a609a8..3539fb5d7 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/base/CloseReasonMessage.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/base/CloseReasonMessage.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.core.network.messages.plugin.base; +package com.seibel.distanthorizons.core.network.messages.base; import com.google.common.base.MoreObjects; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelMessage; +import com.seibel.distanthorizons.core.network.messages.NetworkMessage; import io.netty.buffer.ByteBuf; -public class CloseReasonMessage extends PluginChannelMessage +public class CloseReasonMessage extends NetworkMessage { public String reason; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/CurrentLevelKeyMessage.java b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/base/CurrentLevelKeyMessage.java similarity index 72% rename from core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/CurrentLevelKeyMessage.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/messages/base/CurrentLevelKeyMessage.java index b5fd4dd97..e2d4e8d7f 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/CurrentLevelKeyMessage.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/base/CurrentLevelKeyMessage.java @@ -1,10 +1,10 @@ -package com.seibel.distanthorizons.core.network.messages.plugin; +package com.seibel.distanthorizons.core.network.messages.base; import com.google.common.base.MoreObjects; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelMessage; +import com.seibel.distanthorizons.core.network.messages.NetworkMessage; import io.netty.buffer.ByteBuf; -public class CurrentLevelKeyMessage extends PluginChannelMessage +public class CurrentLevelKeyMessage extends NetworkMessage { public String levelKey; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/session/RemotePlayerConfigMessage.java b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/base/RemotePlayerConfigMessage.java similarity index 84% rename from core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/session/RemotePlayerConfigMessage.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/messages/base/RemotePlayerConfigMessage.java index 3cb0f6795..605c63998 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/session/RemotePlayerConfigMessage.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/base/RemotePlayerConfigMessage.java @@ -17,16 +17,16 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.core.network.messages.plugin.session; +package com.seibel.distanthorizons.core.network.messages.base; import com.google.common.base.MoreObjects; import com.seibel.distanthorizons.core.multiplayer.config.AbstractMultiplayerConfig; import com.seibel.distanthorizons.core.multiplayer.config.MultiplayerConfig; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelMessage; -import com.seibel.distanthorizons.core.network.protocol.INetworkObject; +import com.seibel.distanthorizons.core.network.INetworkObject; +import com.seibel.distanthorizons.core.network.messages.NetworkMessage; import io.netty.buffer.ByteBuf; -public class RemotePlayerConfigMessage extends PluginChannelMessage +public class RemotePlayerConfigMessage extends NetworkMessage { public AbstractMultiplayerConfig payload; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/fullData/FullDataPartialUpdateMessage.java b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/fullData/FullDataPartialUpdateMessage.java similarity index 85% rename from core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/fullData/FullDataPartialUpdateMessage.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/messages/fullData/FullDataPartialUpdateMessage.java index 321901d88..be01ba975 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/fullData/FullDataPartialUpdateMessage.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/fullData/FullDataPartialUpdateMessage.java @@ -17,22 +17,22 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.core.network.messages.plugin.fullData; +package com.seibel.distanthorizons.core.network.messages.fullData; import com.google.common.base.MoreObjects; import com.seibel.distanthorizons.api.enums.config.EDhApiDataCompressionMode; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2; -import com.seibel.distanthorizons.core.network.messages.plugin.ILevelRelatedMessage; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelMessage; -import com.seibel.distanthorizons.core.network.protocol.INetworkObject; +import com.seibel.distanthorizons.core.network.messages.ILevelRelatedMessage; +import com.seibel.distanthorizons.core.network.messages.NetworkMessage; +import com.seibel.distanthorizons.core.network.INetworkObject; import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV2DTO; import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import io.netty.buffer.ByteBuf; import java.io.IOException; -public class FullDataPartialUpdateMessage extends PluginChannelMessage implements ILevelRelatedMessage +public class FullDataPartialUpdateMessage extends NetworkMessage implements ILevelRelatedMessage { private String levelName; @Override diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/fullData/FullDataSourceRequestMessage.java b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/fullData/FullDataSourceRequestMessage.java similarity index 86% rename from core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/fullData/FullDataSourceRequestMessage.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/messages/fullData/FullDataSourceRequestMessage.java index 8d030a7af..09f72c190 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/fullData/FullDataSourceRequestMessage.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/fullData/FullDataSourceRequestMessage.java @@ -17,13 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.core.network.messages.plugin.fullData; +package com.seibel.distanthorizons.core.network.messages.fullData; import com.google.common.base.MoreObjects; -import com.seibel.distanthorizons.core.network.messages.plugin.ILevelRelatedMessage; -import com.seibel.distanthorizons.core.network.plugin.TrackableMessage; -import com.seibel.distanthorizons.core.network.protocol.INetworkObject; -import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.network.messages.ILevelRelatedMessage; +import com.seibel.distanthorizons.core.network.messages.TrackableMessage; import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import io.netty.buffer.ByteBuf; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/fullData/FullDataSourceResponseMessage.java b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/fullData/FullDataSourceResponseMessage.java similarity index 91% rename from core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/fullData/FullDataSourceResponseMessage.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/messages/fullData/FullDataSourceResponseMessage.java index 74176220d..9d8b30908 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/fullData/FullDataSourceResponseMessage.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/fullData/FullDataSourceResponseMessage.java @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.core.network.messages.plugin.fullData; +package com.seibel.distanthorizons.core.network.messages.fullData; import com.google.common.base.MoreObjects; import com.seibel.distanthorizons.api.enums.config.EDhApiDataCompressionMode; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2; -import com.seibel.distanthorizons.core.network.plugin.TrackableMessage; -import com.seibel.distanthorizons.core.network.protocol.INetworkObject; +import com.seibel.distanthorizons.core.network.messages.TrackableMessage; +import com.seibel.distanthorizons.core.network.INetworkObject; import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV2DTO; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.Nullable; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/base/CancelMessage.java b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/requests/CancelMessage.java similarity index 87% rename from core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/base/CancelMessage.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/messages/requests/CancelMessage.java index 15c173901..b7b52a92e 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/base/CancelMessage.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/requests/CancelMessage.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.core.network.messages.plugin.base; +package com.seibel.distanthorizons.core.network.messages.requests; -import com.seibel.distanthorizons.core.network.plugin.TrackableMessage; +import com.seibel.distanthorizons.core.network.messages.TrackableMessage; import io.netty.buffer.ByteBuf; public class CancelMessage extends TrackableMessage diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/base/ExceptionMessage.java b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/requests/ExceptionMessage.java similarity index 94% rename from core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/base/ExceptionMessage.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/messages/requests/ExceptionMessage.java index d10589f5c..e1268bf91 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/plugin/base/ExceptionMessage.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/requests/ExceptionMessage.java @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.core.network.messages.plugin.base; +package com.seibel.distanthorizons.core.network.messages.requests; import com.google.common.base.MoreObjects; import com.seibel.distanthorizons.core.network.exceptions.InvalidLevelException; import com.seibel.distanthorizons.core.network.exceptions.InvalidSectionPosException; import com.seibel.distanthorizons.core.network.exceptions.RateLimitedException; import com.seibel.distanthorizons.core.network.exceptions.RequestRejectedException; -import com.seibel.distanthorizons.core.network.plugin.TrackableMessage; +import com.seibel.distanthorizons.core.network.messages.TrackableMessage; import io.netty.buffer.ByteBuf; import java.util.ArrayList; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/plugin/PluginChannelSession.java b/core/src/main/java/com/seibel/distanthorizons/core/network/session/Session.java similarity index 79% rename from core/src/main/java/com/seibel/distanthorizons/core/network/plugin/PluginChannelSession.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/session/Session.java index 3974b0fbc..609633966 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/plugin/PluginChannelSession.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/session/Session.java @@ -1,23 +1,21 @@ -package com.seibel.distanthorizons.core.network.plugin; +package com.seibel.distanthorizons.core.network.session; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; -import com.seibel.distanthorizons.core.network.NetworkEventSource; -import com.seibel.distanthorizons.core.network.messages.PluginMessageRegistry; -import com.seibel.distanthorizons.core.network.messages.plugin.PluginCloseEvent; +import com.seibel.distanthorizons.core.network.event.NetworkEventSource; +import com.seibel.distanthorizons.core.network.event.PluginCloseEvent; +import com.seibel.distanthorizons.core.network.messages.NetworkMessage; +import com.seibel.distanthorizons.core.network.messages.TrackableMessage; import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender; import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper; -import com.seibel.distanthorizons.coreapi.ModInfo; -import io.netty.buffer.ByteBuf; import org.apache.logging.log4j.LogManager; import org.jetbrains.annotations.Nullable; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Consumer; -public class PluginChannelSession extends NetworkEventSource +public class Session extends NetworkEventSource { private static final ConfigBasedLogger LOGGER = new ConfigBasedLogger(LogManager.getLogger(), () -> Config.Client.Advanced.Logging.logNetworkEvent.get()); @@ -36,13 +34,13 @@ public class PluginChannelSession extends NetworkEventSource @Nullable public final IServerPlayerWrapper serverPlayer; - public PluginChannelSession(@Nullable IServerPlayerWrapper serverPlayer) + public Session(@Nullable IServerPlayerWrapper serverPlayer) { this.serverPlayer = serverPlayer; } - public void tryHandleMessage(PluginChannelMessage message) + public void tryHandleMessage(NetworkMessage message) { if (this.closeReason.get() != null) { @@ -70,7 +68,7 @@ public class PluginChannelSession extends NetworkEventSource return responseFuture; } - public void sendMessage(PluginChannelMessage message) + public void sendMessage(NetworkMessage message) { LOGGER.debug("Sending message: {}", message); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/exceptions/SessionClosedException.java b/core/src/main/java/com/seibel/distanthorizons/core/network/session/SessionClosedException.java similarity index 74% rename from core/src/main/java/com/seibel/distanthorizons/core/network/exceptions/SessionClosedException.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/session/SessionClosedException.java index 1c4f0571c..da6399dcb 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/exceptions/SessionClosedException.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/session/SessionClosedException.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.core.network.exceptions; +package com.seibel.distanthorizons.core.network.session; import java.io.IOException; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/sql/dto/FullDataSourceV2DTO.java b/core/src/main/java/com/seibel/distanthorizons/core/sql/dto/FullDataSourceV2DTO.java index 987289616..0755b8fcf 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/sql/dto/FullDataSourceV2DTO.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/sql/dto/FullDataSourceV2DTO.java @@ -26,7 +26,7 @@ import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGeneratio import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap; import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2; import com.seibel.distanthorizons.core.pos.DhSectionPos; -import com.seibel.distanthorizons.core.network.protocol.INetworkObject; +import com.seibel.distanthorizons.core.network.INetworkObject; import com.seibel.distanthorizons.core.util.FullDataPointUtil; import com.seibel.distanthorizons.core.util.LodUtil; import com.seibel.distanthorizons.core.util.objects.DataCorruptedException; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/misc/IPluginPacketSender.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/misc/IPluginPacketSender.java index b16ba0a4b..5ab16ecfa 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/misc/IPluginPacketSender.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/misc/IPluginPacketSender.java @@ -1,14 +1,11 @@ package com.seibel.distanthorizons.core.wrapperInterfaces.misc; -import com.seibel.distanthorizons.core.network.plugin.PluginChannelMessage; +import com.seibel.distanthorizons.core.network.messages.NetworkMessage; import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; -import io.netty.buffer.ByteBuf; - -import java.util.function.Consumer; public interface IPluginPacketSender extends IBindable { - void sendPluginPacketClient(PluginChannelMessage message); - void sendPluginPacketServer(IServerPlayerWrapper serverPlayer, PluginChannelMessage message); + void sendPluginPacketClient(NetworkMessage message); + void sendPluginPacketServer(IServerPlayerWrapper serverPlayer, NetworkMessage message); } \ No newline at end of file