wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename CloseEvent

Browse Source
This commit is contained in:
s809
2024-06-30 22:35:41 +05:00
parent 47541fa99c
commit 1b48d61d3f
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientPluginChannelApi.java
+3 -3
View File
@@ -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();
}
core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/ClientNetworkState.java
+2 -2
View File
@@ -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;
});
core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/ServerPlayerState.java
+2 -2
View File
@@ -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
});
}
core/src/main/java/com/seibel/distanthorizons/core/network/event/PluginCloseEvent.java → core/src/main/java/com/seibel/distanthorizons/core/network/event/CloseEvent.java
+1 -1
View File
@@ -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."); }
core/src/main/java/com/seibel/distanthorizons/core/network/event/NetworkEventSource.java
+1 -1
View File
@@ -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);
}
core/src/main/java/com/seibel/distanthorizons/core/network/session/Session.java
+2 -2
View File
@@ -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)
{