GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-21 07:49:18 +00:00
Code Issues Releases Activity

Renamed original HandshakeHandler to prevent confusion

Browse Source
This commit is contained in:
Tim203
2021-01-16 17:48:30 +01:00
parent b737184fb0
commit 6b47ef1a7a
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bungee/src/main/java/org/geysermc/floodgate/handler/BungeeDataHandler.java
View File

@@ -26,7 +26,7 @@
package org.geysermc.floodgate.handler; package org.geysermc.floodgate.handler;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static org.geysermc.floodgate.player.HandshakeHandler.ResultType; import static org.geysermc.floodgate.player.FloodgateHandshakeHandler.ResultType;
import com.google.inject.Inject; import com.google.inject.Inject;
import io.netty.channel.Channel; import io.netty.channel.Channel;
@@ -45,8 +45,8 @@ import org.geysermc.floodgate.api.logger.FloodgateLogger;
import org.geysermc.floodgate.api.player.FloodgatePlayer; import org.geysermc.floodgate.api.player.FloodgatePlayer;
import org.geysermc.floodgate.api.player.PropertyKey; import org.geysermc.floodgate.api.player.PropertyKey;
import org.geysermc.floodgate.config.ProxyFloodgateConfig; import org.geysermc.floodgate.config.ProxyFloodgateConfig;
import org.geysermc.floodgate.player.HandshakeHandler; import org.geysermc.floodgate.player.FloodgateHandshakeHandler;
import org.geysermc.floodgate.player.HandshakeHandler.HandshakeResult; import org.geysermc.floodgate.player.FloodgateHandshakeHandler.HandshakeResult;
import org.geysermc.floodgate.util.BedrockData; import org.geysermc.floodgate.util.BedrockData;
import org.geysermc.floodgate.util.ReflectionUtils; import org.geysermc.floodgate.util.ReflectionUtils;
@@ -84,7 +84,7 @@ public final class BungeeDataHandler {
@Inject private Plugin plugin; @Inject private Plugin plugin;
@Inject private ProxyFloodgateConfig config; @Inject private ProxyFloodgateConfig config;
@Inject private ProxyFloodgateApi api; @Inject private ProxyFloodgateApi api;
@Inject private HandshakeHandler handler; @Inject private FloodgateHandshakeHandler handler;
@Inject private FloodgateLogger logger; @Inject private FloodgateLogger logger;
public void handlePreLogin(PreLoginEvent event) { public void handlePreLogin(PreLoginEvent event) {

6
common/src/main/java/org/geysermc/floodgate/module/CommonModule.java
View File

@@ -51,7 +51,7 @@ import org.geysermc.floodgate.crypto.Base64Topping;
import org.geysermc.floodgate.crypto.FloodgateCipher; import org.geysermc.floodgate.crypto.FloodgateCipher;
import org.geysermc.floodgate.crypto.KeyProducer; import org.geysermc.floodgate.crypto.KeyProducer;
import org.geysermc.floodgate.inject.CommonPlatformInjector; import org.geysermc.floodgate.inject.CommonPlatformInjector;
import org.geysermc.floodgate.player.HandshakeHandler; import org.geysermc.floodgate.player.FloodgateHandshakeHandler;
import org.geysermc.floodgate.util.LanguageManager; import org.geysermc.floodgate.util.LanguageManager;
@RequiredArgsConstructor @RequiredArgsConstructor
@@ -131,7 +131,7 @@ public class CommonModule extends AbstractModule {
@Provides @Provides
@Singleton @Singleton
public HandshakeHandler handshakeHandler( public FloodgateHandshakeHandler handshakeHandler(
HandshakeHandlersImpl handshakeHandlers, HandshakeHandlersImpl handshakeHandlers,
SimpleFloodgateApi api, SimpleFloodgateApi api,
FloodgateCipher cipher, FloodgateCipher cipher,
@@ -139,7 +139,7 @@ public class CommonModule extends AbstractModule {
@Named("playerAttribute") AttributeKey<FloodgatePlayer> playerAttribute, @Named("playerAttribute") AttributeKey<FloodgatePlayer> playerAttribute,
FloodgateLogger logger FloodgateLogger logger
) { ) {
return new HandshakeHandler( return new FloodgateHandshakeHandler(
handshakeHandlers, handshakeHandlers,
api, api,
cipher, cipher,

2
common/src/main/java/org/geysermc/floodgate/player/HandshakeHandler.java → common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java
View File

@@ -56,7 +56,7 @@ import org.geysermc.floodgate.util.RawSkin;
import org.geysermc.floodgate.util.Utils; import org.geysermc.floodgate.util.Utils;
@RequiredArgsConstructor @RequiredArgsConstructor
public final class HandshakeHandler { public final class FloodgateHandshakeHandler {
private final HandshakeHandlersImpl handshakeHandlers; private final HandshakeHandlersImpl handshakeHandlers;
private final SimpleFloodgateApi api; private final SimpleFloodgateApi api;
private final FloodgateCipher cipher; private final FloodgateCipher cipher;

4
spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataAddon.java
View File

@@ -31,11 +31,11 @@ import io.netty.channel.Channel;
import org.geysermc.floodgate.api.inject.InjectorAddon; import org.geysermc.floodgate.api.inject.InjectorAddon;
import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.api.logger.FloodgateLogger;
import org.geysermc.floodgate.config.FloodgateConfig; import org.geysermc.floodgate.config.FloodgateConfig;
import org.geysermc.floodgate.player.HandshakeHandler; import org.geysermc.floodgate.player.FloodgateHandshakeHandler;
import org.geysermc.floodgate.util.Utils; import org.geysermc.floodgate.util.Utils;
public final class SpigotDataAddon implements InjectorAddon { public final class SpigotDataAddon implements InjectorAddon {
@Inject private HandshakeHandler handshakeHandler; @Inject private FloodgateHandshakeHandler handshakeHandler;
@Inject private FloodgateConfig config; @Inject private FloodgateConfig config;
@Inject private FloodgateLogger logger; @Inject private FloodgateLogger logger;

6
spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataHandler.java
View File

@@ -48,8 +48,8 @@ import org.geysermc.floodgate.api.logger.FloodgateLogger;
import org.geysermc.floodgate.api.player.FloodgatePlayer; import org.geysermc.floodgate.api.player.FloodgatePlayer;
import org.geysermc.floodgate.api.player.PropertyKey; import org.geysermc.floodgate.api.player.PropertyKey;
import org.geysermc.floodgate.config.FloodgateConfig; import org.geysermc.floodgate.config.FloodgateConfig;
import org.geysermc.floodgate.player.HandshakeHandler; import org.geysermc.floodgate.player.FloodgateHandshakeHandler;
import org.geysermc.floodgate.player.HandshakeHandler.HandshakeResult; import org.geysermc.floodgate.player.FloodgateHandshakeHandler.HandshakeResult;
import org.geysermc.floodgate.util.BedrockData; import org.geysermc.floodgate.util.BedrockData;
import org.geysermc.floodgate.util.ReflectionUtils; import org.geysermc.floodgate.util.ReflectionUtils;
@@ -157,7 +157,7 @@ public final class SpigotDataHandler extends SimpleChannelInboundHandler<Object>
/* per player stuff */ /* per player stuff */
private final FloodgateConfig config; private final FloodgateConfig config;
private final HandshakeHandler handshakeHandler; private final FloodgateHandshakeHandler handshakeHandler;
private final FloodgateLogger logger; private final FloodgateLogger logger;
private Object networkManager; private Object networkManager;
private FloodgatePlayer player; private FloodgatePlayer player;

4
velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityDataAddon.java
View File

@@ -33,11 +33,11 @@ import org.geysermc.floodgate.api.ProxyFloodgateApi;
import org.geysermc.floodgate.api.inject.InjectorAddon; import org.geysermc.floodgate.api.inject.InjectorAddon;
import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.api.logger.FloodgateLogger;
import org.geysermc.floodgate.config.ProxyFloodgateConfig; import org.geysermc.floodgate.config.ProxyFloodgateConfig;
import org.geysermc.floodgate.player.HandshakeHandler; import org.geysermc.floodgate.player.FloodgateHandshakeHandler;
import org.geysermc.floodgate.util.Utils; import org.geysermc.floodgate.util.Utils;
public final class VelocityDataAddon implements InjectorAddon { public final class VelocityDataAddon implements InjectorAddon {
@Inject private HandshakeHandler handshakeHandler; @Inject private FloodgateHandshakeHandler handshakeHandler;
@Inject private ProxyFloodgateConfig config; @Inject private ProxyFloodgateConfig config;
@Inject private ProxyFloodgateApi api; @Inject private ProxyFloodgateApi api;
@Inject private FloodgateLogger logger; @Inject private FloodgateLogger logger;

6
velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java
View File

@@ -42,8 +42,8 @@ import org.geysermc.floodgate.api.logger.FloodgateLogger;
import org.geysermc.floodgate.api.player.FloodgatePlayer; import org.geysermc.floodgate.api.player.FloodgatePlayer;
import org.geysermc.floodgate.api.player.PropertyKey; import org.geysermc.floodgate.api.player.PropertyKey;
import org.geysermc.floodgate.config.ProxyFloodgateConfig; import org.geysermc.floodgate.config.ProxyFloodgateConfig;
import org.geysermc.floodgate.player.HandshakeHandler; import org.geysermc.floodgate.player.FloodgateHandshakeHandler;
import org.geysermc.floodgate.player.HandshakeHandler.HandshakeResult; import org.geysermc.floodgate.player.FloodgateHandshakeHandler.HandshakeResult;
@RequiredArgsConstructor @RequiredArgsConstructor
public final class VelocityProxyDataHandler extends SimpleChannelInboundHandler<Object> { public final class VelocityProxyDataHandler extends SimpleChannelInboundHandler<Object> {
@@ -70,7 +70,7 @@ public final class VelocityProxyDataHandler extends SimpleChannelInboundHandler<
} }
private final ProxyFloodgateConfig config; private final ProxyFloodgateConfig config;
private final HandshakeHandler handshakeHandler; private final FloodgateHandshakeHandler handshakeHandler;
private final AttributeKey<String> kickMessageAttribute; private final AttributeKey<String> kickMessageAttribute;
private final FloodgateLogger logger; private final FloodgateLogger logger;
private boolean done; private boolean done;