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 d5b781fd8..e6fd29ad8 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,7 +5,7 @@ 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.event.CloseEvent; +import com.seibel.distanthorizons.core.network.event.internal.CloseEvent; 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; 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 130a5ca73..571611e67 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 @@ -7,7 +7,7 @@ import com.seibel.distanthorizons.core.multiplayer.config.MultiplayerConfig; import com.seibel.distanthorizons.core.multiplayer.config.MultiplayerConfigChangeListener; import com.seibel.distanthorizons.core.network.INetworkObject; import com.seibel.distanthorizons.core.network.event.ScopedNetworkEventSource; -import com.seibel.distanthorizons.core.network.event.CloseEvent; +import com.seibel.distanthorizons.core.network.event.internal.CloseEvent; import com.seibel.distanthorizons.core.network.messages.base.RemotePlayerConfigMessage; import com.seibel.distanthorizons.core.network.messages.fullData.FullDataChunkMessage; import com.seibel.distanthorizons.core.network.messages.fullData.FullDataPartialUpdateMessage; 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 68c90ddde..2d798bf86 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 @@ -6,7 +6,7 @@ import com.seibel.distanthorizons.core.multiplayer.config.MultiplayerConfig; import com.seibel.distanthorizons.core.multiplayer.config.MultiplayerConfigChangeListener; 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.CloseEvent; +import com.seibel.distanthorizons.core.network.event.internal.CloseEvent; import com.seibel.distanthorizons.core.network.exceptions.RateLimitedException; import com.seibel.distanthorizons.core.network.messages.fullData.FullDataSourceRequestMessage; import com.seibel.distanthorizons.core.network.session.Session; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/event/NetworkEventSource.java b/core/src/main/java/com/seibel/distanthorizons/core/network/event/NetworkEventSource.java index 8d63dfa38..cfb7fae52 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/event/NetworkEventSource.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/event/NetworkEventSource.java @@ -22,6 +22,7 @@ package com.seibel.distanthorizons.core.network.event; import com.google.common.cache.CacheBuilder; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; +import com.seibel.distanthorizons.core.network.event.internal.InternalEvent; import com.seibel.distanthorizons.core.network.messages.NetworkMessage; import com.seibel.distanthorizons.core.network.messages.TrackableMessage; import com.seibel.distanthorizons.core.network.messages.MessageRegistry; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/event/CloseEvent.java b/core/src/main/java/com/seibel/distanthorizons/core/network/event/internal/CloseEvent.java similarity index 62% rename from core/src/main/java/com/seibel/distanthorizons/core/network/event/CloseEvent.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/event/internal/CloseEvent.java index cbd3a1a31..93458c331 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/event/CloseEvent.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/event/internal/CloseEvent.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.core.network.event; +package com.seibel.distanthorizons.core.network.event.internal; /** * This event is used to indicate a disconnect. diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/event/InternalEvent.java b/core/src/main/java/com/seibel/distanthorizons/core/network/event/internal/InternalEvent.java similarity index 89% rename from core/src/main/java/com/seibel/distanthorizons/core/network/event/InternalEvent.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/event/internal/InternalEvent.java index 12bcf834e..09c8b8855 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/event/InternalEvent.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/event/internal/InternalEvent.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.core.network.event; +package com.seibel.distanthorizons.core.network.event.internal; import com.seibel.distanthorizons.core.network.messages.NetworkMessage; import io.netty.buffer.ByteBuf; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/event/ProtocolErrorEvent.java b/core/src/main/java/com/seibel/distanthorizons/core/network/event/internal/ProtocolErrorEvent.java similarity index 90% rename from core/src/main/java/com/seibel/distanthorizons/core/network/event/ProtocolErrorEvent.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/event/internal/ProtocolErrorEvent.java index e3e167174..01a2acaa6 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/event/ProtocolErrorEvent.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/event/internal/ProtocolErrorEvent.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.core.network.event; +package com.seibel.distanthorizons.core.network.event.internal; import com.seibel.distanthorizons.core.network.messages.NetworkMessage; import org.jetbrains.annotations.Nullable; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/session/Session.java b/core/src/main/java/com/seibel/distanthorizons/core/network/session/Session.java index 6bd0215ed..e38a45823 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/session/Session.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/session/Session.java @@ -4,8 +4,8 @@ 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.event.NetworkEventSource; -import com.seibel.distanthorizons.core.network.event.CloseEvent; -import com.seibel.distanthorizons.core.network.event.ProtocolErrorEvent; +import com.seibel.distanthorizons.core.network.event.internal.CloseEvent; +import com.seibel.distanthorizons.core.network.event.internal.ProtocolErrorEvent; import com.seibel.distanthorizons.core.network.messages.NetworkMessage; import com.seibel.distanthorizons.core.network.messages.TrackableMessage; import com.seibel.distanthorizons.core.network.messages.base.CloseReasonMessage;