Exclude CODEOWNERS from language statistics

Correct typo in handshake failure kick

.gitattributes

@@ -0,0 +1 @@
+.gitea/CODEOWNERS linguist-detectable=false

.gitea/CODEOWNERS

@@ -0,0 +1,3 @@
+# Pull requests request review from the eligible staff team(s).
+# One approval from either an Admin or Developer satisfies branch protection.
+*   @trueog/Admins @trueog/Developers

.gitignore

@@ -3,14 +3,16 @@ ip-whitelist/
 
 # IntelliJ
 .idea/
-build/
 *.iml
 
+# Eclipse
+.classpath
+.project
+.settings/
+
 # Gradle
 .gradle/
-gradle/
-gradlew
-gradlew.bat
 
+# Build
 libs/
-
+build/

build.gradle

@@ -1,178 +0,0 @@
-import com.google.gson.JsonObject
-import com.google.gson.JsonParser
-import org.yaml.snakeyaml.DumperOptions
-import org.yaml.snakeyaml.Yaml
-
-import java.nio.charset.StandardCharsets
-
-// --
-// Building
-// --
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath(group: 'org.yaml', name: 'snakeyaml', version: '1.26')
-        classpath(group: 'com.google.code.gson', name: 'gson', version: '2.8.6')
-    }
-}
-
-plugins {
-    id 'java'
-    id 'idea'
-}
-
-// --
-// Variables
-// --
-version = '2.5.5'
-group = 'net.tcpshield.tcpshield'
-archivesBaseName = 'TCPShield'
-
-// --
-// Misc.
-// --
-idea {
-    module {
-        downloadJavadoc = true
-        downloadSources = true
-    }
-}
-
-sourceSets {
-    main {
-        java {
-            srcDirs('src/main/java')
-        }
-        resources {
-            srcDirs('src/main/resources')
-        }
-    }
-    test {
-        java {
-            srcDirs('src/test/java')
-        }
-        resources {
-            srcDirs('src/test/resources')
-        }
-    }
-}
-
-compileJava {
-    sourceCompatibility = "8"
-    targetCompatibility = "8"
-    options.encoding = 'UTF-8'
-}
-
-// --
-// Dependencies
-// --
-repositories {
-    maven {
-        url = 'https://repo1.maven.org/maven2/'
-    }
-    maven {
-        url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
-    }
-    maven {
-        url = 'https://repo.dmulloy2.net/nexus/repository/public/'
-    }
-    maven {
-        url = 'https://oss.sonatype.org/content/repositories/snapshots'
-    }
-    maven {
-        url = 'https://papermc.io/repo/repository/maven-public/'
-    }
-    maven {
-        url = 'https://repo.velocitypowered.com/snapshots/'
-    }
-    maven {
-        url = "https://repo.opencollab.dev/maven-snapshots/"
-    }
-}
-
-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'
-
-    // Paper
-    compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.15.2-R0.1-SNAPSHOT'
-
-    // BungeeCord
-    compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'
-
-    // Velocity
-    compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '1.0.0-SNAPSHOT'
-
-    // Testing
-    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
-    testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.0-M1'
-    compileOnly 'org.geysermc.floodgate:api:2.0-SNAPSHOT'
-}
-
-processResources {
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-}
-
-// --
-// Build Tasks
-// --
-test {
-    useJUnitPlatform()
-}
-
-configurations {
-    testImplementation.extendsFrom compileOnly
-}
-
-task updateVersion {
-    updateYamls()
-    updateJsons()
-}
-
-void updateYamls() {
-    DumperOptions options = new DumperOptions()
-    options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK)
-    options.setSplitLines(false)
-    options.setPrettyFlow(true)
-
-    def yaml = new Yaml(options)
-
-    def bukkitYamlFile = new File('src/main/resources/plugin.yml')
-    def bungeeYamlFile = new File('src/main/resources/bungee.yml')
-
-    def files = [bukkitYamlFile, bungeeYamlFile]
-    files.each { file ->
-        file.newInputStream().withCloseable { inputStream ->
-            def cfg = yaml.load(inputStream)
-            cfg.put("version", version)
-
-            new FileWriter(file).withCloseable { writer ->
-                yaml.dump(cfg, writer)
-            }
-        }
-    }
-}
-
-void updateJsons() {
-    def velocityJson = new File('src/main/resources/velocity-plugin.json')
-
-    def files = [velocityJson]
-    files.each { file ->
-        file.newInputStream().withCloseable { inputStream ->
-            new InputStreamReader(inputStream, StandardCharsets.UTF_8).withCloseable { inputStreamReader ->
-                JsonObject object = JsonParser.parseReader(inputStreamReader).getAsJsonObject()
-                object.addProperty("version", version.toString())
-
-                new FileWriter(file).withCloseable { writer ->
-                    writer.write(object.toString())
-                }
-            }
-        }
-
-    }
-}
-
-build.dependsOn updateVersion

build.gradle.kts

@@ -0,0 +1,138 @@
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
+import org.yaml.snakeyaml.DumperOptions
+import org.yaml.snakeyaml.Yaml
+import java.io.File
+import java.io.FileWriter
+import java.io.InputStreamReader
+import java.nio.charset.StandardCharsets
+import org.gradle.api.tasks.compile.JavaCompile
+import org.gradle.api.tasks.testing.Test
+import org.gradle.kotlin.dsl.*
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath("org.yaml:snakeyaml:1.26")
+        classpath("com.google.code.gson:gson:2.8.6")
+    }
+}
+
+plugins {
+    id("java")
+    id("eclipse")
+    id("idea")
+}
+
+version = "2.8.0"
+group = "net.tcpshield.tcpshield"
+
+base {
+    archivesName.set("TCPShield")
+}
+
+idea {
+    module {
+        isDownloadJavadoc = true
+        isDownloadSources = true
+    }
+}
+
+sourceSets {
+    named("main") {
+        java.srcDir("src/main/java")
+        resources.srcDir("src/main/resources")
+    }
+    named("test") {
+        java.srcDir("src/test/java")
+        resources.srcDir("src/test/resources")
+    }
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "17"
+    targetCompatibility = "17"
+    options.encoding = "UTF-8"
+}
+
+repositories {
+    maven { url = uri("https://repo1.maven.org/maven2/") }
+    maven { url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") }
+    maven { url = uri("https://repo.dmulloy2.net/nexus/repository/public/") }
+    maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") }
+    maven { url = uri("https://repo.papermc.io/repository/maven-public/") }
+    maven { url = uri("https://repo.opencollab.dev/maven-snapshots/") }
+}
+
+dependencies {
+    compileOnly(files("libs/ProtocolLib-5.0.jar")) // Import Legacy ProtocolLib API.
+    compileOnly("io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT")
+    compileOnly("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0-M1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0-M1")
+    compileOnly("org.geysermc.floodgate:api:2.1.1-SNAPSHOT")
+}
+
+tasks.named<ProcessResources>("processResources") {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
+
+tasks.named<Test>("test") {
+    useJUnitPlatform()
+}
+
+configurations {
+    named("testImplementation") {
+        extendsFrom(configurations.named("compileOnly").get())
+    }
+}
+
+fun updateYamls() {
+    val options = DumperOptions().apply {
+        defaultFlowStyle = DumperOptions.FlowStyle.BLOCK
+        setSplitLines(false)
+        setPrettyFlow(true)
+    }
+    val yaml = Yaml(options)
+    val files = listOf(
+        File("src/main/resources/plugin.yml"),
+        File("src/main/resources/bungee.yml")
+    )
+    files.forEach { file ->
+        file.inputStream().use { inputStream ->
+            @Suppress("UNCHECKED_CAST")
+            val cfg = yaml.load<MutableMap<String, Any?>>(inputStream)
+            cfg["version"] = project.version.toString()
+            FileWriter(file).use { writer ->
+                yaml.dump(cfg, writer)
+            }
+        }
+    }
+}
+
+fun updateJsons() {
+    val file = File("src/main/resources/velocity-plugin.json")
+    file.inputStream().use { inputStream ->
+        InputStreamReader(inputStream, StandardCharsets.UTF_8).use { reader ->
+            val obj: JsonObject = JsonParser.parseReader(reader).asJsonObject
+            obj.addProperty("version", project.version.toString())
+            FileWriter(file).use { writer ->
+                writer.write(obj.toString())
+            }
+        }
+    }
+}
+
+tasks.register("updateVersion") {
+    doLast {
+        updateYamls()
+        updateJsons()
+    }
+}
+
+tasks.named("build") {
+    dependsOn("updateVersion")
+}
+

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,251 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH="\\\"\\\""
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

libs/License.txt

@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

settings.gradle

@@ -1,2 +0,0 @@
-rootProject.name = 'TCPShield'
-

settings.gradle.kts

@@ -0,0 +1,2 @@
+rootProject.name = "TCPShield"
+

src/main/java/net/tcpshield/tcpshield/TCPShieldPacketHandler.java

@@ -14,6 +14,7 @@ import net.tcpshield.tcpshield.util.validation.timestamp.TimestampValidator;
 import net.tcpshield.tcpshield.util.validation.timestamp.impl.HTPDateTimestampValidator;
 
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;

src/main/java/net/tcpshield/tcpshield/bukkit/BukkitConfig.java

@@ -66,12 +66,13 @@ public class BukkitConfig extends ConfigProvider {
 		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);
 		}

src/main/java/net/tcpshield/tcpshield/bukkit/TCPShieldBukkit.java

@@ -1,5 +1,6 @@
 package net.tcpshield.tcpshield.bukkit;
 
+import java.util.logging.Logger;
 import net.tcpshield.tcpshield.TCPShieldPacketHandler;
 import net.tcpshield.tcpshield.TCPShieldPlugin;
 import net.tcpshield.tcpshield.bukkit.paper.BukkitPaper;
@@ -9,6 +10,7 @@ import net.tcpshield.tcpshield.geyser.GeyserUtils;
 import net.tcpshield.tcpshield.provider.ConfigProvider;
 import net.tcpshield.tcpshield.util.Debugger;
 import net.tcpshield.tcpshield.util.exception.phase.InitializationException;
+import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 
 /**
@@ -29,15 +31,34 @@ public class TCPShieldBukkit extends JavaPlugin implements TCPShieldPlugin {
 			debugger = Debugger.createDebugger(this);
 			packetHandler = new TCPShieldPacketHandler(this);
 
-			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;
-				}
+			// check force plib option -> paper -> plib -> error
+			if (this.configProvider.preferProtocolLib() && getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
+				try {
+					String[] protocolLibVersion = getServer().getPluginManager().getPlugin("ProtocolLib").getDescription().getVersion().split("-")[0].split("\\.");
+					int major = Integer.parseInt(protocolLibVersion[0]);
+					int minor = Integer.parseInt(protocolLibVersion[1]);
+					int patch = Integer.parseInt(protocolLibVersion[2]);
 
+					String paperVersion = Bukkit.getServer().getMinecraftVersion();
+					if (major <= 5 && minor <= 2 && patch <= 1 && (paperVersion.equals("1.20.5") || paperVersion.equals("1.20.6"))) {
+						getLogger().severe("TCPShield is incompatible with ProtocolLib <= 5.2.1 on Paper 1.20.5/1.20.6 due to lack of support from ProtocolLib. Reverting to default Paper handler to prevent issues. This error can be avoided by disabling 'prefer-protocollib' in the config.");
+						bukkitImpl = new BukkitPaper(this);
+					} else {
+						bukkitImpl = new BukkitProtocolLib(this);
+					}
+				} catch (Exception t) {
+					getLogger().warning("Failed to check Paper or ProtocolLib version. This is not a critical error unless you are running Paper 1.20.5/1.20.6 with ProtocolLib version 5.2.1 or below.");
+					getDebugger().exception(t);
+
+					bukkitImpl = new BukkitProtocolLib(this);
+				}
+			} else if (BukkitImplProvider.hasPaperEvent()) {
+				bukkitImpl = new BukkitPaper(this);
+			} 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 +69,7 @@ public class TCPShieldBukkit extends JavaPlugin implements TCPShieldPlugin {
 		} catch (Exception e) {
 			throw new InitializationException(e);
 		}
+
 	}
 
 
@@ -70,4 +92,9 @@ public class TCPShieldBukkit extends JavaPlugin implements TCPShieldPlugin {
 		return configProvider;
 	}
 
+	@Override
+	public Logger getLogger() {
+		return super.getLogger();
+	}
+
 }

src/main/java/net/tcpshield/tcpshield/bukkit/paper/BukkitPaper.java

@@ -13,7 +13,6 @@ public class BukkitPaper extends BukkitImplProvider {
 		super(bukkitPlugin);
 	}
 
-
 	@Override
 	public void load() {
 		PaperHandshakeHandler packetHandler = new PaperHandshakeHandler(this);

src/main/java/net/tcpshield/tcpshield/bukkit/paper/handler/PaperHandshakeHandler.java

@@ -19,7 +19,6 @@ public class PaperHandshakeHandler implements Listener {
 		this.bukkitProvider = bukkitProvider;
 	}
 
-
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onHandshake(PlayerHandshakeEvent e) {
 		PaperPacket packet = new PaperPacket(e);
@@ -36,6 +35,8 @@ public class PaperHandshakeHandler implements Listener {
 	public void onServerPing(PaperServerListPingEvent e) {
 		if (e.getClient().isLegacy())
 			e.setCancelled(true);
+
+
 	}
 
 }

src/main/java/net/tcpshield/tcpshield/bukkit/paper/handler/PaperPacket.java

@@ -15,7 +15,6 @@ public class PaperPacket implements PacketProvider {
 		this.handshakeEvent = handshakeEvent;
 	}
 
-
 	@Override
 	public String getPayloadString() {
 		return handshakeEvent.getOriginalHandshake();

src/main/java/net/tcpshield/tcpshield/bukkit/paper/handler/PaperPlayer.java

@@ -18,7 +18,6 @@ public class PaperPlayer implements PlayerProvider {
 		this.handshakeEvent = handshakeEvent;
 	}
 
-
 	/**
 	 * Trys to grab the UUID of the handshake
 	 * @return If found, the corrosponding uuid, if not, unknown
@@ -58,7 +57,9 @@ public class PaperPlayer implements PlayerProvider {
 	@Override
 	public void disconnect() {
 		handshakeEvent.setCancelled(false); // Caused issues with newer versions of Paper (Thanks https://github.com/realDragonium)
-		handshakeEvent.setFailMessage("Connection failed. Please try again or contract an administrator.");
+		// Paper requires a non-empty fail message (Guava checkArgument), so use a single space
+		// to avoid the plugin echoing a visible kick reason back into the console.
+		handshakeEvent.setFailMessage(" ");
 		handshakeEvent.setFailed(true);
 	}
 

src/main/java/net/tcpshield/tcpshield/bukkit/protocollib/BukkitProtocolLib.java

@@ -13,7 +13,6 @@ public class BukkitProtocolLib extends BukkitImplProvider {
 		super(bukkitPlugin);
 	}
 
-
 	@Override
 	public void load() {
 		ProtocolLibHandshakeHandler packetHandler = new ProtocolLibHandshakeHandler(this);

src/main/java/net/tcpshield/tcpshield/bukkit/protocollib/handler/ProtocolLibHandshakeHandler.java

@@ -19,7 +19,6 @@ public class ProtocolLibHandshakeHandler extends PacketAdapter {
 		this.bukkitProvider = bukkitProvider;
 	}
 
-
 	@Override
 	public void onPacketReceiving(PacketEvent e) {
 		ProtocolLibPacket packet = new ProtocolLibPacket(e.getPacket());

src/main/java/net/tcpshield/tcpshield/bukkit/protocollib/handler/ProtocolLibPacket.java

@@ -17,7 +17,6 @@ public class ProtocolLibPacket implements PacketProvider {
 		this.rawPayload = packetContainer.getStrings().read(0);
 	}
 
-
 	@Override
 	public String getPayloadString() {
 		return rawPayload;

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 class ProtocolLibPlayer implements PlayerProvider {
 		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);

src/main/java/net/tcpshield/tcpshield/bungee/BungeeConfig.java

@@ -1,105 +0,0 @@
-package net.tcpshield.tcpshield.bungee;
-
-import net.md_5.bungee.api.plugin.Plugin;
-import net.md_5.bungee.config.Configuration;
-import net.md_5.bungee.config.ConfigurationProvider;
-import net.md_5.bungee.config.YamlConfiguration;
-import net.tcpshield.tcpshield.provider.ConfigProvider;
-import net.tcpshield.tcpshield.util.exception.config.ConfigLoadException;
-import net.tcpshield.tcpshield.util.exception.config.ConfigReloadException;
-import net.tcpshield.tcpshield.util.exception.config.ConfigResetException;
-import net.tcpshield.tcpshield.util.exception.phase.ConfigException;
-import net.tcpshield.tcpshield.velocity.VelocityConfig;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-
-/**
- * Bungee's configuration implementation
- */
-public class BungeeConfig extends ConfigProvider {
-
-	private final Plugin plugin;
-
-	private Configuration loadedConfiguration;
-
-	public BungeeConfig(Plugin plugin) throws ConfigException {
-		this.plugin = plugin;
-		this.dataFolder = plugin.getDataFolder();
-		this.configFile = new File(dataFolder, "config.yml");
-
-		try {
-			reload();
-		} catch (Exception e) {
-			throw new ConfigException(e);
-		}
-	}
-
-	@Override
-	protected void checkNodes(String... nodes) {
-		for (String node : nodes) {
-			if (!loadedConfiguration.contains(node))
-				throw new ConfigException("The node \"" + node + "\" does not exist in the config.");
-		}
-	}
-
-	@Override
-	protected void reset() throws ConfigResetException {
-		try {
-			loadedConfiguration = null; // To the garbage collector you go
-
-			try {
-				configFile.delete();
-			} catch (Exception ignored) {
-				// Just ignore since it either does not exist, or we can overwrite
-			}
-
-			try (InputStream in = plugin.getResourceAsStream("config.yml")) {
-				Files.copy(in, configFile.toPath());
-			}
-		} catch (Exception e) {
-			throw new ConfigResetException(e);
-		}
-	}
-
-	@Override
-	protected void load() throws ConfigLoadException {
-		try {
-			ConfigurationProvider configProvider = ConfigurationProvider.getProvider(YamlConfiguration.class);
-			loadedConfiguration = configProvider.load(configFile);
-
-			checkNodes("only-allow-proxy-connections", "timestamp-validation", "debug-mode");
-
-			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");
-		} catch (Exception e) {
-			throw new ConfigLoadException(e);
-		}
-	}
-
-	@Override
-	public void reload() throws ConfigReloadException {
-		try {
-			if (!dataFolder.exists())
-				dataFolder.mkdir();
-
-			if (!configFile.exists())
-				reset();
-
-			try {
-				load();
-			} catch (ConfigLoadException exception) {
-				plugin.getLogger().warning("Config loading failed, resetting to default config. (This can be ignored if you just switched builds of TCPShield)");
-				reset();
-				reload(); // Redo cycle, possible StackOverFlow, but realistically only happens if reset fails
-			}
-		} catch (Exception e) {
-			throw new ConfigReloadException(e);
-		}
-	}
-
-}

src/main/java/net/tcpshield/tcpshield/bungee/TCPShieldBungee.java

@@ -1,60 +0,0 @@
-package net.tcpshield.tcpshield.bungee;
-
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.api.plugin.Plugin;
-import net.md_5.bungee.api.plugin.PluginManager;
-import net.tcpshield.tcpshield.TCPShieldPacketHandler;
-import net.tcpshield.tcpshield.TCPShieldPlugin;
-import net.tcpshield.tcpshield.bungee.handler.BungeeHandshakeHandler;
-import net.tcpshield.tcpshield.geyser.GeyserUtils;
-import net.tcpshield.tcpshield.provider.ConfigProvider;
-import net.tcpshield.tcpshield.util.Debugger;
-import net.tcpshield.tcpshield.util.exception.phase.InitializationException;
-
-/**
- * The entry point for Bungee servers
- */
-public class TCPShieldBungee extends Plugin implements TCPShieldPlugin, Listener {
-
-	private ConfigProvider configProvider;
-	private TCPShieldPacketHandler packetHandler;
-	private Debugger debugger;
-
-	@Override
-	public void onEnable() {
-		try {
-			configProvider = new BungeeConfig(this);
-			debugger = Debugger.createDebugger(this);
-			packetHandler = new TCPShieldPacketHandler(this);
-
-			PluginManager pluginManager = this.getProxy().getPluginManager();
-			pluginManager.registerListener(this, new BungeeHandshakeHandler(this));
-
-			GeyserUtils.initGeyser(this, configProvider);
-
-			initialization();
-		} catch (Exception e) {
-			throw new InitializationException(e);
-		}
-	}
-
-	/*
-	 * The provider's base methods
-	 */
-
-	@Override
-	public ConfigProvider getConfigProvider() {
-		return configProvider;
-	}
-
-	@Override
-	public TCPShieldPacketHandler getPacketHandler() {
-		return packetHandler;
-	}
-
-	@Override
-	public Debugger getDebugger() {
-		return debugger;
-	}
-
-}

src/main/java/net/tcpshield/tcpshield/bungee/handler/BungeeHandshakeHandler.java

@@ -1,47 +0,0 @@
-package net.tcpshield.tcpshield.bungee.handler;
-
-import net.md_5.bungee.api.connection.PendingConnection;
-import net.md_5.bungee.api.event.PlayerHandshakeEvent;
-import net.md_5.bungee.api.event.ProxyPingEvent;
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.event.EventHandler;
-import net.md_5.bungee.event.EventPriority;
-import net.tcpshield.tcpshield.TCPShieldPlugin;
-import net.tcpshield.tcpshield.util.exception.phase.HandshakeException;
-
-/**
- * The handshake handler for Bungee
- */
-public class BungeeHandshakeHandler implements Listener {
-
-	private final TCPShieldPlugin plugin;
-
-	public BungeeHandshakeHandler(TCPShieldPlugin plugin) {
-		this.plugin = plugin;
-	}
-
-
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onProxyPingEvent(ProxyPingEvent e) {
-		PendingConnection connection = e.getConnection();
-		if (!connection.isLegacy())
-			return;
-
-		connection.disconnect();
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onPlayerHandshake(PlayerHandshakeEvent e) {
-		BungeePacket packet = new BungeePacket(e.getHandshake(), e.getConnection());
-		BungeePlayer player = new BungeePlayer(e.getConnection());
-
-		this.plugin.getDebugger().warn("BungeeCord: Raw player hostname: " + packet.getPayloadString());
-
-		try {
-			plugin.getPacketHandler().handleHandshake(packet, player);
-		} catch (HandshakeException exception) {
-			plugin.getDebugger().exception(exception);
-		}
-	}
-
-}

src/main/java/net/tcpshield/tcpshield/bungee/handler/BungeePacket.java

@@ -1,46 +0,0 @@
-package net.tcpshield.tcpshield.bungee.handler;
-
-import net.md_5.bungee.api.connection.PendingConnection;
-import net.md_5.bungee.protocol.packet.Handshake;
-import net.tcpshield.tcpshield.provider.PacketProvider;
-import net.tcpshield.tcpshield.util.ReflectionUtil;
-import net.tcpshield.tcpshield.util.exception.manipulate.PacketManipulationException;
-
-import java.net.InetSocketAddress;
-
-/**
- * A packet wrapper for Bungee
- */
-public class BungeePacket implements PacketProvider {
-
-	private final Handshake handshake;
-	private final PendingConnection pendingConnection;
-
-	public BungeePacket(Handshake handshake, PendingConnection pendingConnection) {
-		this.handshake = handshake;
-		this.pendingConnection = pendingConnection;
-	}
-
-
-	@Override
-	public String getPayloadString() {
-		return handshake.getHost();
-	}
-
-	@Override
-	public void setPacketHostname(String hostname) throws PacketManipulationException {
-		try {
-			InetSocketAddress virtualHost = InetSocketAddress.createUnresolved(hostname, handshake.getPort());
-			try {
-				ReflectionUtil.setFinalField(pendingConnection, "virtualHost", virtualHost);
-			} catch (Exception ex) {
-				ReflectionUtil.setFinalField(pendingConnection, "vHost", virtualHost);
-			}
-
-			ReflectionUtil.setField(handshake, "host", hostname);
-		} catch (Exception e) {
-			throw new PacketManipulationException(e);
-		}
-	}
-
-}

src/main/java/net/tcpshield/tcpshield/bungee/handler/BungeePlayer.java

@@ -1,82 +0,0 @@
-package net.tcpshield.tcpshield.bungee.handler;
-
-import net.md_5.bungee.api.connection.PendingConnection;
-import net.tcpshield.tcpshield.provider.PlayerProvider;
-import net.tcpshield.tcpshield.util.ReflectionUtil;
-import net.tcpshield.tcpshield.util.exception.manipulate.PlayerManipulationException;
-
-import java.lang.reflect.Field;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.util.UUID;
-
-/**
- * A player wrapper for Bungee
- */
-public class BungeePlayer implements PlayerProvider {
-
-	private final PendingConnection pendingConnection;
-	private String ip;
-
-	public BungeePlayer(PendingConnection pendingConnection) {
-		this.pendingConnection = pendingConnection;
-		this.ip = pendingConnection.getAddress().getAddress().getHostAddress();
-	}
-
-
-	/**
-	 * Trys to grab the UUID of the handshake
-	 *
-	 * @return If found, the corrosponding uuid, if not, unknown
-	 */
-	@Override
-	public String getUUID() {
-		UUID uuid = pendingConnection.getUniqueId();
-		if (uuid == null)
-			return "unknown";
-
-		return uuid.toString();
-	}
-
-	@Override
-	public String getName() {
-		return pendingConnection.getName();
-	}
-
-	@Override
-	public String getIP() {
-		return ip;
-	}
-
-	@Override
-	public void setIP(InetSocketAddress ip) throws PlayerManipulationException {
-		try {
-			this.ip = ip.getAddress().getHostAddress();
-
-			Object channelWrapper = ReflectionUtil.getObjectInPrivateField(pendingConnection, "ch");
-			Object channel = ReflectionUtil.getObjectInPrivateField(channelWrapper, "ch");
-
-			try {
-				Field socketAddressField = ReflectionUtil.searchFieldByClass(channelWrapper.getClass(), SocketAddress.class);
-				ReflectionUtil.setFinalField(channelWrapper, socketAddressField, ip);
-			} catch (IllegalArgumentException ignored) {
-				// Some BungeeCord versions, notably those on 1.7 (e.g. zBungeeCord) don't have an SocketAddress field in the ChannelWrapper class
-			}
-
-			ReflectionUtil.setFinalField(channel, ReflectionUtil.getPrivateField(channel.getClass(), "remoteAddress"), ip);
-			try {
-				ReflectionUtil.setFinalField(channel, ReflectionUtil.getPrivateField(channel.getClass(), "localAddress"), ip);
-			} catch (Throwable t) {
-				// ChannelWrapper doesn't have a localAddress
-			}
-		} catch (Exception e) {
-			throw new PlayerManipulationException(e);
-		}
-	}
-
-	@Override
-	public void disconnect() {
-		pendingConnection.disconnect();
-	}
-
-}

src/main/java/net/tcpshield/tcpshield/provider/ConfigProvider.java

@@ -19,16 +19,24 @@ 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() {
@@ -36,7 +44,11 @@ public abstract class ConfigProvider {
 	}
 
 	public boolean doDebug() {
-		return doDebug;
+		return this.doDebug;
+	}
+
+	public boolean preferProtocolLib() {
+		return this.preferProtocolLib;
 	}
 
 	public File getDataFolder() {

src/main/java/net/tcpshield/tcpshield/velocity/VelocityConfig.java

@@ -65,12 +65,13 @@ public class VelocityConfig extends ConfigProvider {
 		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);
 		}

src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityHandshakeHandler.java

@@ -16,6 +16,17 @@ public class VelocityHandshakeHandler {
 
 	private final TCPShieldPlugin plugin;
 
+
+	private static Class<?> CONNECTED_PLAYER_CONNECTION_CLASS;
+
+	static {
+		try {
+			CONNECTED_PLAYER_CONNECTION_CLASS = Class.forName("com.velocitypowered.proxy.connection.client.ConnectedPlayer");
+		} catch (Exception e) {
+			// ignore for old velocity versions
+		}
+	}
+
 	public VelocityHandshakeHandler(TCPShieldPlugin plugin) {
 		this.plugin = plugin;
 	}
@@ -23,11 +34,15 @@ public class VelocityHandshakeHandler {
 	// Turns out this event sometimes passes erroneous hostnames
 	// which have the null bytes terminated as FML data which causes
 	// issues with the verification process.
-//	@Subscribe(order = PostOrder.FIRST)
-//	public void onPreLogin(PreLoginEvent e) {
-//		InboundConnection connection = e.getConnection();
-//		handleEvent(connection, "onPreLogin");
-//	}
+	@Subscribe(order = PostOrder.FIRST)
+	public void onPreLogin(PreLoginEvent e) {
+		if (!this.plugin.getConfigProvider().handlePreLoginEvent()) {
+			return;
+		}
+
+		InboundConnection connection = e.getConnection();
+		handleEvent(connection, "onPreLogin");
+	}
 
 	@Subscribe(order = PostOrder.FIRST)
 	public void onHandshake(ConnectionHandshakeEvent e) {
@@ -38,6 +53,12 @@ public class VelocityHandshakeHandler {
 	@Subscribe(order = PostOrder.FIRST)
 	public void onProxyPing(ProxyPingEvent e) {
 		InboundConnection connection = e.getConnection();
+
+		if (connection.getClass() == CONNECTED_PLAYER_CONNECTION_CLASS) {
+			// new ServerData (0x42) packet on connect, we don't care about it
+			return;
+		}
+
 		handleEvent(connection, "onProxyPing");
 	}
 

src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityPacket.java

@@ -31,7 +31,15 @@ public class VelocityPacket implements PacketProvider {
 			Class<?> inboundConnection = Class.forName("com.velocitypowered.proxy.connection.client.InitialInboundConnection");
 
 			HANDSHAKE_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "handshake");
-			HOSTNAME_FIELD = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");
+
+			Field hostnameField;
+			try {
+				hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.HandshakePacket"), "serverAddress");
+			} catch (Exception e) {
+				hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");
+			}
+			HOSTNAME_FIELD = hostnameField;
+
 			CLEANED_ADDRESS_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "cleanedAddress");
 		} catch (Exception e) {
 			throw new InitializationException(new ReflectionException(e));

src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityPlayer.java

@@ -4,7 +4,6 @@ import com.velocitypowered.api.proxy.InboundConnection;
 import net.tcpshield.tcpshield.provider.PlayerProvider;
 import net.tcpshield.tcpshield.util.ReflectionUtil;
 import net.tcpshield.tcpshield.util.exception.manipulate.PlayerManipulationException;
-import net.tcpshield.tcpshield.util.exception.phase.HandshakeException;
 import net.tcpshield.tcpshield.util.exception.phase.InitializationException;
 import net.tcpshield.tcpshield.util.exception.phase.ReflectionException;
 
@@ -27,6 +26,7 @@ public class VelocityPlayer implements PlayerProvider {
 	private static final Method CLOSE_CHANNEL_METHOD;
 
 	// new velocity support
+
 	private static Class<?> LOGIN_INBOUND_CONNECTION_CLASS;
 	private static Field LOGIN_INBOUND_CONNECTION_DELEGATE_FIELD;
 
@@ -149,7 +149,7 @@ public class VelocityPlayer implements PlayerProvider {
 	}
 
 	enum ConnectionType {
-		LOGIN_INBOUND, INITIAL_INBOUND, LEGACY;
+		LOGIN_INBOUND, INITIAL_INBOUND, LEGACY
 	}
 
 }

src/main/resources/bungee.yml

@@ -1,5 +1,5 @@
 name: TCPShield
-version: 2.5.5
+version: 2.8.0
 main: net.tcpshield.tcpshield.bungee.TCPShieldBungee
 author: https://tcpshield.com
 softdepends:

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

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: false

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: TCPShield
-version: 2.5.5
+version: 2.8.0
 main: net.tcpshield.tcpshield.bukkit.TCPShieldBukkit
 softdepend:
 - ProtocolLib

src/main/resources/velocity-plugin.json

@@ -1,16 +1 @@
-{
-  "id": "tcpshield",
-  "name": "TCPShield",
-  "version": "2.5.5",
-  "description": "TCPShield IP parsing capabilities for Velocity",
-  "authors": [
-    "TCPShield"
-  ],
-  "dependencies": [
-    {
-      "id": "floodgate",
-      "optional": true
-    }
-  ],
-  "main": "net.tcpshield.tcpshield.velocity.TCPShieldVelocity"
-}
+{"id":"tcpshield","name":"TCPShield","version":"2.8.0","description":"TCPShield IP parsing capabilities for Velocity","authors":["TCPShield"],"dependencies":[{"id":"floodgate","optional":true}],"main":"net.tcpshield.tcpshield.velocity.TCPShieldVelocity"}