2.6.0, too many changes to list, will be in release readme

DylanKeir · DylanKeir · commit 1af7f1efdef2 · 2022-06-28T03:29:13.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,7 @@ plugins {
 // --
 // Variables
 // --
-version = '2.5.6'
+version = '2.6.0'
 group = 'net.tcpshield.tcpshield'
 archivesBaseName = 'TCPShield'
 
@@ -95,7 +95,7 @@ repositories {
 dependencies {
     // Bukkit
     compileOnly group: 'org.spigotmc', name: 'spigot-api', version: '1.11-R0.1-SNAPSHOT'
-    compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '4.4.0'
+    compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.0.0-SNAPSHOT'
 
     // Paper
     compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.15.2-R0.1-SNAPSHOT'
diff --git a/src/main/java/net/tcpshield/tcpshield/bukkit/BukkitConfig.java b/src/main/java/net/tcpshield/tcpshield/bukkit/BukkitConfig.java
@@ -66,12 +66,13 @@ protected void load() throws ConfigLoadException {
 		try {
 			loadedConfiguration = YamlConfiguration.loadConfiguration(configFile);
 
-			checkNodes("only-allow-proxy-connections", "timestamp-validation", "debug-mode");
+			checkNodes("only-allow-proxy-connections", "timestamp-validation", "debug-mode", "enable-geyser-support", "prefer-protocollib");
 
 			this.onlyProxy = loadedConfiguration.getBoolean("only-allow-proxy-connections");
 			this.timestampValidationMode = loadedConfiguration.getString("timestamp-validation");
 			this.doDebug = loadedConfiguration.getBoolean("debug-mode");
 			this.geyser = loadedConfiguration.getBoolean("enable-geyser-support");
+			this.preferProtocolLib = loadedConfiguration.getBoolean("prefer-protocollib");
 		} catch (Exception e) {
 			throw new ConfigLoadException(e);
 		}
diff --git a/src/main/java/net/tcpshield/tcpshield/bukkit/TCPShieldBukkit.java b/src/main/java/net/tcpshield/tcpshield/bukkit/TCPShieldBukkit.java
@@ -29,15 +29,16 @@ public void onEnable() {
 			debugger = Debugger.createDebugger(this);
 			packetHandler = new TCPShieldPacketHandler(this);
 
-			if (BukkitImplProvider.hasPaperEvent())
+			// check force plib option -> paper -> plib -> error
+			if (this.configProvider.preferProtocolLib() && getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
+				bukkitImpl = new BukkitProtocolLib(this);
+			} else if (BukkitImplProvider.hasPaperEvent()) {
 				bukkitImpl = new BukkitPaper(this);
-			else {
-				if (getServer().getPluginManager().getPlugin("ProtocolLib") == null) {
-					getLogger().severe("TCPShield not loading because ProtocolLib is not installed. Either use Paper to enable native compatibility or install ProtocolLib.");
-					return;
-				}
-
+			} else if (getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
 				bukkitImpl = new BukkitProtocolLib(this);
+			} else {
+				getLogger().severe("TCPShield not loading because ProtocolLib is not installed. Either use Paper to enable native compatibility or install ProtocolLib.");
+				return;
 			}
 
 			bukkitImpl.load();
@@ -48,6 +49,7 @@ public void onEnable() {
 		} catch (Exception e) {
 			throw new InitializationException(e);
 		}
+
 	}
 
 
diff --git a/src/main/java/net/tcpshield/tcpshield/bukkit/paper/BukkitPaper.java b/src/main/java/net/tcpshield/tcpshield/bukkit/paper/BukkitPaper.java
@@ -13,7 +13,6 @@ public BukkitPaper(TCPShieldBukkit bukkitPlugin) {
 		super(bukkitPlugin);
 	}
 
-
 	@Override
 	public void load() {
 		PaperHandshakeHandler packetHandler = new PaperHandshakeHandler(this);
diff --git a/src/main/java/net/tcpshield/tcpshield/bukkit/paper/handler/PaperHandshakeHandler.java b/src/main/java/net/tcpshield/tcpshield/bukkit/paper/handler/PaperHandshakeHandler.java
@@ -19,7 +19,6 @@ public PaperHandshakeHandler(BukkitImplProvider bukkitProvider) {
 		this.bukkitProvider = bukkitProvider;
 	}
 
-
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onHandshake(PlayerHandshakeEvent e) {
 		PaperPacket packet = new PaperPacket(e);
@@ -36,6 +35,8 @@ public void onHandshake(PlayerHandshakeEvent e) {
 	public void onServerPing(PaperServerListPingEvent e) {
 		if (e.getClient().isLegacy())
 			e.setCancelled(true);
+
+
 	}
 
 }
diff --git a/src/main/java/net/tcpshield/tcpshield/bukkit/paper/handler/PaperPacket.java b/src/main/java/net/tcpshield/tcpshield/bukkit/paper/handler/PaperPacket.java
@@ -15,7 +15,6 @@ public PaperPacket(PlayerHandshakeEvent handshakeEvent) {
 		this.handshakeEvent = handshakeEvent;
 	}
 
-
 	@Override
 	public String getPayloadString() {
 		return handshakeEvent.getOriginalHandshake();
diff --git a/src/main/java/net/tcpshield/tcpshield/bukkit/paper/handler/PaperPlayer.java b/src/main/java/net/tcpshield/tcpshield/bukkit/paper/handler/PaperPlayer.java
@@ -18,7 +18,6 @@ public PaperPlayer(PlayerHandshakeEvent handshakeEvent) {
 		this.handshakeEvent = handshakeEvent;
 	}
 
-
 	/**
 	 * Trys to grab the UUID of the handshake
 	 * @return If found, the corrosponding uuid, if not, unknown
diff --git a/src/main/java/net/tcpshield/tcpshield/bukkit/protocollib/BukkitProtocolLib.java b/src/main/java/net/tcpshield/tcpshield/bukkit/protocollib/BukkitProtocolLib.java
@@ -13,7 +13,6 @@ public BukkitProtocolLib(TCPShieldBukkit bukkitPlugin) {
 		super(bukkitPlugin);
 	}
 
-
 	@Override
 	public void load() {
 		ProtocolLibHandshakeHandler packetHandler = new ProtocolLibHandshakeHandler(this);
diff --git a/src/main/java/net/tcpshield/tcpshield/bukkit/protocollib/handler/ProtocolLibHandshakeHandler.java b/src/main/java/net/tcpshield/tcpshield/bukkit/protocollib/handler/ProtocolLibHandshakeHandler.java
@@ -19,7 +19,6 @@ public ProtocolLibHandshakeHandler(BukkitImplProvider bukkitProvider) {
 		this.bukkitProvider = bukkitProvider;
 	}
 
-
 	@Override
 	public void onPacketReceiving(PacketEvent e) {
 		ProtocolLibPacket packet = new ProtocolLibPacket(e.getPacket());
diff --git a/src/main/java/net/tcpshield/tcpshield/bukkit/protocollib/handler/ProtocolLibPacket.java b/src/main/java/net/tcpshield/tcpshield/bukkit/protocollib/handler/ProtocolLibPacket.java
@@ -17,7 +17,6 @@ public ProtocolLibPacket(PacketContainer packetContainer) {
 		this.rawPayload = packetContainer.getStrings().read(0);
 	}
 
-
 	@Override
 	public String getPayloadString() {
 		return rawPayload;
diff --git a/src/main/java/net/tcpshield/tcpshield/bukkit/protocollib/handler/ProtocolLibPlayer.java b/src/main/java/net/tcpshield/tcpshield/bukkit/protocollib/handler/ProtocolLibPlayer.java
@@ -1,7 +1,7 @@
 package net.tcpshield.tcpshield.bukkit.protocollib.handler;
 
-import com.comphenix.protocol.injector.server.SocketInjector;
-import com.comphenix.protocol.injector.server.TemporaryPlayerFactory;
+import com.comphenix.protocol.injector.temporary.MinimalInjector;
+import com.comphenix.protocol.injector.temporary.TemporaryPlayerFactory;
 import net.tcpshield.tcpshield.provider.PlayerProvider;
 import net.tcpshield.tcpshield.util.ReflectionUtil;
 import net.tcpshield.tcpshield.util.exception.manipulate.PlayerManipulationException;
@@ -34,7 +34,6 @@ public class ProtocolLibPlayer implements PlayerProvider {
 		}
 	}
 
-
 	private final Player player;
 	private String ip;
 
@@ -72,13 +71,13 @@ public void setIP(InetSocketAddress ip) throws PlayerManipulationException {
 		try {
 			this.ip = ip.getAddress().getHostAddress();
 
-			SocketInjector ignored = TemporaryPlayerFactory.getInjectorFromPlayer(player);
+			MinimalInjector ignored = TemporaryPlayerFactory.getInjectorFromPlayer(player);
 			Object injector = ReflectionUtil.getObjectInPrivateField(ignored, "injector");
 			Object networkManager = ReflectionUtil.getObjectInPrivateField(injector, "networkManager");
 
 			ReflectionUtil.setFinalField(networkManager, ReflectionUtil.searchFieldByClass(networkManager.getClass(), SocketAddress.class), ip);
 
-			Object channel = ReflectionUtil.getObjectInPrivateField(injector, "originalChannel");
+			Object channel = ReflectionUtil.getObjectInPrivateField(injector, "wrappedChannel");
 			ReflectionUtil.setFinalField(channel, ReflectionUtil.getDeclaredField(abstractChannelClass, "remoteAddress"), ip);
 		} catch (Exception e) {
 			throw new PlayerManipulationException(e);
diff --git a/src/main/java/net/tcpshield/tcpshield/provider/ConfigProvider.java b/src/main/java/net/tcpshield/tcpshield/provider/ConfigProvider.java
@@ -19,24 +19,36 @@ public abstract class ConfigProvider {
 	protected String timestampValidationMode = "htpdate";
 	protected boolean doDebug = true; // Fail-safe default set to true
 	protected boolean geyser = false;
+	protected boolean velocityHandlePreLoginEvent = true;
+
+	// spigot/paper only option
+	protected boolean preferProtocolLib;
 
 	protected File dataFolder;
 	protected File configFile;
 
 	public boolean isOnlyProxy() {
-		return onlyProxy;
+		return this.onlyProxy;
 	}
 
 	public boolean isGeyser() {
-		return geyser;
+		return this.geyser;
+	}
+
+	public boolean handlePreLoginEvent() {
+		return this.velocityHandlePreLoginEvent;
 	}
 
 	public String getTimestampValidationMode() {
 		return this.timestampValidationMode;
 	}
 
 	public boolean doDebug() {
-		return doDebug;
+		return this.doDebug;
+	}
+
+	public boolean preferProtocolLib() {
+		return this.preferProtocolLib;
 	}
 
 	public File getDataFolder() {
diff --git a/src/main/java/net/tcpshield/tcpshield/velocity/VelocityConfig.java b/src/main/java/net/tcpshield/tcpshield/velocity/VelocityConfig.java
@@ -65,12 +65,13 @@ protected void load() throws ConfigLoadException {
 		try {
 			loadedToml = new Toml().read(configFile);
 
-			checkNodes("only-allow-proxy-connections", "timestamp-validation", "debug-mode");
+			checkNodes("only-allow-proxy-connections", "timestamp-validation", "debug-mode", "enable-geyser-support", "pre-login-event");
 
 			this.onlyProxy = loadedToml.getBoolean("only-allow-proxy-connections");
 			this.timestampValidationMode = loadedToml.getString("timestamp-validation");
 			this.doDebug = loadedToml.getBoolean("debug-mode");
 			this.geyser = loadedToml.getBoolean("enable-geyser-support");
+			this.velocityHandlePreLoginEvent = loadedToml.getBoolean("pre-login-event");
 		} catch (Exception e) {
 			throw new ConfigLoadException(e);
 		}
diff --git a/src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityHandshakeHandler.java b/src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityHandshakeHandler.java
@@ -25,6 +25,10 @@ public VelocityHandshakeHandler(TCPShieldPlugin plugin) {
 	// issues with the verification process.
 	@Subscribe(order = PostOrder.FIRST)
 	public void onPreLogin(PreLoginEvent e) {
+		if (!this.plugin.getConfigProvider().handlePreLoginEvent()) {
+			return;
+		}
+
 		InboundConnection connection = e.getConnection();
 		handleEvent(connection, "onPreLogin");
 	}
diff --git a/src/main/resources/bungee.yml b/src/main/resources/bungee.yml
@@ -1,5 +1,5 @@
 name: TCPShield
-version: 2.5.6
+version: 2.6.0
 main: net.tcpshield.tcpshield.bungee.TCPShieldBungee
 author: https://tcpshield.com
 softdepends:
diff --git a/src/main/resources/config.toml b/src/main/resources/config.toml
@@ -9,3 +9,6 @@ debug-mode = false
 
 # Toggle to enable support for Geyser/Floodgate v2
 enable-geyser-support = false
+
+# enable handling handshake on PreLoginEvent
+pre-login-event = true
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -9,3 +9,6 @@ debug-mode: false
 
 # Toggle to enable support for Geyser/Floodgate v2
 enable-geyser-support: false
+
+# Spigot/Paper option only, does not affect bungeecord
+prefer-protocollib: true
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: TCPShield
-version: 2.5.6
+version: 2.6.0
 main: net.tcpshield.tcpshield.bukkit.TCPShieldBukkit
 softdepend:
 - ProtocolLib
diff --git a/src/main/resources/velocity-plugin.json b/src/main/resources/velocity-plugin.json
@@ -1,7 +1,7 @@
 {
   "id": "tcpshield",
   "name": "TCPShield",
-  "version": "2.5.6",
+  "version": "2.6.0",
   "description": "TCPShield IP parsing capabilities for Velocity",
   "authors": [
     "TCPShield"

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public BukkitPaper(TCPShieldBukkit bukkitPlugin) {`
`13`	`13`	`super(bukkitPlugin);`
`14`	`14`	`}`
`15`	`15`
`16`		`-`
`17`	`16`	`@Override`
`18`	`17`	`public void load() {`
`19`	`18`	`PaperHandshakeHandler packetHandler = new PaperHandshakeHandler(this);`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ public PaperHandshakeHandler(BukkitImplProvider bukkitProvider) {`
`19`	`19`	`this.bukkitProvider = bukkitProvider;`
`20`	`20`	`}`
`21`	`21`
`22`		`-`
`23`	`22`	`@EventHandler(priority = EventPriority.LOWEST)`
`24`	`23`	`public void onHandshake(PlayerHandshakeEvent e) {`
`25`	`24`	`PaperPacket packet = new PaperPacket(e);`
`@@ -36,6 +35,8 @@ public void onHandshake(PlayerHandshakeEvent e) {`
`36`	`35`	`public void onServerPing(PaperServerListPingEvent e) {`
`37`	`36`	`if (e.getClient().isLegacy())`
`38`	`37`	`e.setCancelled(true);`
	`38`	`+`
	`39`	`+`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ public PaperPacket(PlayerHandshakeEvent handshakeEvent) {`
`15`	`15`	`this.handshakeEvent = handshakeEvent;`
`16`	`16`	`}`
`17`	`17`
`18`		`-`
`19`	`18`	`@Override`
`20`	`19`	`public String getPayloadString() {`
`21`	`20`	`return handshakeEvent.getOriginalHandshake();`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ public PaperPlayer(PlayerHandshakeEvent handshakeEvent) {`
`18`	`18`	`this.handshakeEvent = handshakeEvent;`
`19`	`19`	`}`
`20`	`20`
`21`		`-`
`22`	`21`	`/**`
`23`	`22`	`* Trys to grab the UUID of the handshake`
`24`	`23`	`* @return If found, the corrosponding uuid, if not, unknown`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public BukkitProtocolLib(TCPShieldBukkit bukkitPlugin) {`
`13`	`13`	`super(bukkitPlugin);`
`14`	`14`	`}`
`15`	`15`
`16`		`-`
`17`	`16`	`@Override`
`18`	`17`	`public void load() {`
`19`	`18`	`ProtocolLibHandshakeHandler packetHandler = new ProtocolLibHandshakeHandler(this);`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ public ProtocolLibHandshakeHandler(BukkitImplProvider bukkitProvider) {`
`19`	`19`	`this.bukkitProvider = bukkitProvider;`
`20`	`20`	`}`
`21`	`21`
`22`		`-`
`23`	`22`	`@Override`
`24`	`23`	`public void onPacketReceiving(PacketEvent e) {`
`25`	`24`	`ProtocolLibPacket packet = new ProtocolLibPacket(e.getPacket());`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ public ProtocolLibPacket(PacketContainer packetContainer) {`
`17`	`17`	`this.rawPayload = packetContainer.getStrings().read(0);`
`18`	`18`	`}`
`19`	`19`
`20`		`-`
`21`	`20`	`@Override`
`22`	`21`	`public String getPayloadString() {`
`23`	`22`	`return rawPayload;`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "tcpshield",`
`3`	`3`	`"name": "TCPShield",`
`4`		`- "version": "2.5.6",`
	`4`	`+ "version": "2.6.0",`
`5`	`5`	`"description": "TCPShield IP parsing capabilities for Velocity",`
`6`	`6`	`"authors": [`
`7`	`7`	`"TCPShield"`