From 1b48d61d3ffaab7ca133ea8738ae4045d936563e Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Sun, 30 Jun 2024 22:35:41 +0500 Subject: [PATCH] Rename CloseEvent --- .../core/api/internal/ClientPluginChannelApi.java | 6 +++--- .../core/multiplayer/client/ClientNetworkState.java | 4 ++-- .../core/multiplayer/server/ServerPlayerState.java | 4 ++-- .../event/{PluginCloseEvent.java => CloseEvent.java} | 2 +- .../core/network/event/NetworkEventSource.java | 2 +- .../distanthorizons/core/network/session/Session.java | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) rename core/src/main/java/com/seibel/distanthorizons/core/network/event/{PluginCloseEvent.java => CloseEvent.java} (91%) 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 bbddfea23..ae9847328 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.PluginCloseEvent; +import com.seibel.distanthorizons.core.network.event.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; @@ -50,7 +50,7 @@ public class ClientPluginChannelApi Objects.requireNonNull(session); this.session = session; this.session.registerHandler(CurrentLevelKeyMessage.class, this::onCurrentLevelKeyMessage); - this.session.registerHandler(PluginCloseEvent.class, this::onClose); + this.session.registerHandler(CloseEvent.class, this::onClose); } private void onCurrentLevelKeyMessage(CurrentLevelKeyMessage msg) @@ -98,7 +98,7 @@ public class ClientPluginChannelApi KEYED_CLIENT_LEVEL_MANAGER.clearServerKeyedLevel(); } - private void onClose(PluginCloseEvent event) + private void onClose(CloseEvent event) { KEYED_CLIENT_LEVEL_MANAGER.disable(); } 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 db5389b23..7a27e13d6 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 @@ -5,7 +5,7 @@ import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; import com.seibel.distanthorizons.core.multiplayer.config.MultiplayerConfig; import com.seibel.distanthorizons.core.multiplayer.config.MultiplayerConfigChangeListener; import com.seibel.distanthorizons.core.network.event.ScopedNetworkEventSource; -import com.seibel.distanthorizons.core.network.event.PluginCloseEvent; +import com.seibel.distanthorizons.core.network.event.CloseEvent; import com.seibel.distanthorizons.core.network.messages.base.RemotePlayerConfigMessage; import com.seibel.distanthorizons.core.network.session.Session; import org.apache.logging.log4j.LogManager; @@ -47,7 +47,7 @@ public class ClientNetworkState implements Closeable this.configReceived = true; }); - this.session.registerHandler(PluginCloseEvent.class, msg -> + this.session.registerHandler(CloseEvent.class, msg -> { this.configReceived = false; }); 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 f9f0558de..6a3c04502 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.PluginCloseEvent; +import com.seibel.distanthorizons.core.network.event.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; @@ -53,7 +53,7 @@ public class ServerPlayerState this.session.sendMessage(new RemotePlayerConfigMessage(this.config)); }); - this.session.registerHandler(PluginCloseEvent.class, event -> { + this.session.registerHandler(CloseEvent.class, event -> { // Noop }); } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/event/PluginCloseEvent.java b/core/src/main/java/com/seibel/distanthorizons/core/network/event/CloseEvent.java similarity index 91% rename from core/src/main/java/com/seibel/distanthorizons/core/network/event/PluginCloseEvent.java rename to core/src/main/java/com/seibel/distanthorizons/core/network/event/CloseEvent.java index 1a6cee6b7..8ee84fbfb 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/event/PluginCloseEvent.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/event/CloseEvent.java @@ -6,7 +6,7 @@ import io.netty.buffer.ByteBuf; /** * This is not a "real" message, and only used to indicate a disconnection. */ -public class PluginCloseEvent extends NetworkMessage +public class CloseEvent 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/event/NetworkEventSource.java b/core/src/main/java/com/seibel/distanthorizons/core/network/event/NetworkEventSource.java index b0926ffda..d77ae366a 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 @@ -101,7 +101,7 @@ public abstract class NetworkEventSource this.handlers.computeIfAbsent(handlerClass, missingHandlerClass -> { // Will throw if the handler class is not found - if (handlerClass != PluginCloseEvent.class) + if (handlerClass != CloseEvent.class) { MessageRegistry.INSTANCE.getMessageId(handlerClass); } 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 609633966..954748324 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,7 +4,7 @@ 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.PluginCloseEvent; +import com.seibel.distanthorizons.core.network.event.CloseEvent; import com.seibel.distanthorizons.core.network.messages.NetworkMessage; import com.seibel.distanthorizons.core.network.messages.TrackableMessage; import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender; @@ -91,7 +91,7 @@ public class Session extends NetworkEventSource try { - this.handleMessage(new PluginCloseEvent()); + this.handleMessage(new CloseEvent()); } catch (Throwable ignored) {