Release 2.1.45 (#553)

Bumps gradle-wrapper from 9.3.0 to 9.3.1.

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/gradle.yml

@@ -23,10 +23,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Setup Gradle

api/src/main/java/xyz/jonesdev/sonar/api/config/SonarConfiguration.java

@@ -201,6 +201,7 @@ public final class SonarConfiguration {
     verification.validNameRegex = Pattern.compile(generalConfig.getString("verification.checks.valid-name-regex"));
 
     verification.checkGeyser = generalConfig.getBoolean("verification.check-geyser-players");
+    verification.checkEagler = generalConfig.getBoolean("verification.check-eagler-players");
     verification.logConnections = generalConfig.getBoolean("verification.log-connections");
     verification.logDuringAttack = generalConfig.getBoolean("verification.log-during-attack");
     verification.debugXYZPositions = generalConfig.getBoolean("verification.debug-xyz-positions");
@@ -415,6 +416,7 @@ public final class SonarConfiguration {
 
     private int timeOfDay;
     private boolean checkGeyser;
+    private boolean checkEagler;
     private boolean logConnections;
     private boolean logDuringAttack;
     private boolean debugXYZPositions;

build.gradle.kts

@@ -11,7 +11,7 @@ allprojects {
   repositories {
     mavenCentral()
     maven(url = "https://repo.jonesdev.xyz/releases/") // Bungee & Velocity proxy module
-    maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots/") // libby
+    maven(url = "https://repo.alessiodp.com/snapshots/") // libby
   }
 
   apply(plugin = "java")

common/src/main/java/xyz/jonesdev/sonar/common/InboundHandlerAdapter.java

@@ -121,8 +121,7 @@ public abstract class InboundHandlerAdapter extends ChannelInboundHandlerAdapter
     }
 
     // Don't continue the verification process if the verification is disabled
-    if (!Sonar.get0().getAntiBot().shouldVerifyNewPlayers()
-      || EaglerUtil.isEaglerConnection(ctx.channel())) {
+    if (!Sonar.get0().getAntiBot().shouldVerifyNewPlayers()) {
       initialLogin(ctx.channel(), inetAddress, initialLoginAction);
       return;
     }
@@ -134,6 +133,13 @@ public abstract class InboundHandlerAdapter extends ChannelInboundHandlerAdapter
       return;
     }
 
+    // Completely skip EaglercraftX connections if configured
+    if (EaglerUtil.isEaglerConnection(ctx.channel())
+      && !Sonar.get0().getConfig().getVerification().isCheckEagler()) {
+      initialLogin(ctx.channel(), inetAddress, initialLoginAction);
+      return;
+    }
+
     // Make sure we actually have to verify the player
     final String fingerprint = FingerprintingUtil.getFingerprint(username, hostAddress);
     if (Sonar.get0().getVerifiedPlayerController().getCache().contains(fingerprint)) {
@@ -193,6 +199,7 @@ public abstract class InboundHandlerAdapter extends ChannelInboundHandlerAdapter
         // Don't remove floodgate's pipelines
         || entry.getKey().startsWith("geyser")
         || entry.getKey().startsWith("floodgate")
+        || entry.getKey().startsWith("eagler")
         || entry.getKey().equals("DefaultChannelPipeline$TailContext#0")) {
         continue;
       }

common/src/main/java/xyz/jonesdev/sonar/common/boot/LibraryLoader.java

@@ -47,7 +47,7 @@ class LibraryLoader {
       Library.builder()
         .groupId("com{}github{}ben-manes{}caffeine")
         .artifactId("caffeine")
-        .version("3.2.0")
+        .version("3.2.3")
         .relocate("com{}github{}benmanes{}caffeine", "xyz{}jonesdev{}sonar{}libs{}caffeine")
         .build(),
       // ORMLite

common/src/main/java/xyz/jonesdev/sonar/common/util/EaglerUtil.java

@@ -18,18 +18,17 @@
 package xyz.jonesdev.sonar.common.util;
 
 import io.netty.channel.Channel;
-import io.netty.util.AttributeKey;
 import lombok.experimental.UtilityClass;
 import org.jetbrains.annotations.NotNull;
 
 @UtilityClass
 public class EaglerUtil {
-  // https://github.com/lax1dude/eaglerxserver/blob/main/core/src/main/java/net/lax1dude/eaglercraft/backend/server/adapter/PipelineAttributes.java
-  public static final AttributeKey<Object> EAGLER_LISTENER_DATA = AttributeKey.valueOf("$eagler0");
-  public static final AttributeKey<Object> EAGLER_PIPELINE_DATA = AttributeKey.valueOf("$eagler1");
+  // Detect EaglerXServer WebSocket connections by checking for Eagler-specific pipeline handlers.
+  private static final String H_EAGLER_HANDSHAKE = "eagler-handshake";
+  private static final String H_EAGLER_FRAME_CODEC = "eagler-frame-codec";
 
   public boolean isEaglerConnection(final @NotNull Channel channel) {
-    return channel.attr(EAGLER_LISTENER_DATA).get() != null
-      || channel.attr(EAGLER_PIPELINE_DATA).get() != null;
+    return channel.pipeline().get(H_EAGLER_HANDSHAKE) != null
+      || channel.pipeline().get(H_EAGLER_FRAME_CODEC) != null;
   }
 }

common/src/main/resources/assets/config/cs.yml

@@ -187,6 +187,9 @@ verification:
   # Tato funkce je experimentální a může způsobit problémy
   # Pokud je toto zakázáno, hráči Bedrock budou přeskočeni
   check-geyser-players: false
+  # Měl by Sonar kontrolovat také hráče EaglercraftX?
+  # Tato funkce je experimentální a může způsobit problémy.
+  check-eagler-players: false
   # Doba, za kterou hráč přestal odesílat pakety před odpojením
   # (Hodnota udávaná v milisekundách: 1 sekunda = 1000 milisekund)
   read-timeout: 8000

common/src/main/resources/assets/config/de.yml

@@ -184,6 +184,9 @@ verification:
   # Diese Funktion ist experimentell und kann Probleme verursachen
   # Wenn dies deaktiviert ist, werden Bedrock-Spieler übersprungen
   check-geyser-players: false
+  # Sollte Sonar auch EaglercraftX-Spieler überprüfen?
+  # Diese Funktion ist experimentell und kann zu Problemen führen.
+  check-eagler-players: false
   # Die Zeit, seit der der Spieler keine Pakete mehr sendet, bevor er die Verbindung trennt
   # (Dieser Wert stellt die Zeit in Millisekunden dar: 1 Sekunde = 1000 Millisekunden)
   read-timeout: 8000

common/src/main/resources/assets/config/en.yml

@@ -187,6 +187,9 @@ verification:
   # This feature is experimental and might cause issues
   # If this is disabled, Bedrock players will be skipped
   check-geyser-players: false
+  # Should Sonar also check EaglercraftX players?
+  # This feature is experimental and might cause issues
+  check-eagler-players: false
   # The time since the player stopped sending packets before disconnecting
   # (This value represents the time in milliseconds: 1 second = 1000 milliseconds)
   read-timeout: 8000

common/src/main/resources/assets/config/fr.yml

@@ -186,6 +186,9 @@ verification:
   # Cette fonctionnalité est expérimentale et peut causer des problèmes
   # Si cela est désactivé, les joueurs Bedrock seront ignorés
   check-geyser-players: false
+  # Sonar devrait-il également vérifier les joueurs EaglercraftX ?
+  # Cette fonctionnalité est expérimentale et peut causer des problèmes.
+  check-eagler-players: false
   # Temps écoulé depuis que le joueur a cessé d'envoyer des paquets avant de se déconnecter
   # (Cette valeur représente le temps en millisecondes : 1 seconde = 1000 millisecondes)
   read-timeout: 8000

common/src/main/resources/assets/config/ka.yml

@@ -185,6 +185,9 @@ verification:
   # ეს ფუნქცია ექსპერიმენტულია და შეიძლება გამოიწვიოს პრობლემები
   # თუ ეს გამორთულია, Bedrock მოთამაშეები გამოვლენილი იქნება
   check-geyser-players: false
+  # უნდა შეამოწმოს Sonar-მა EaglercraftX-ის მოთამაშეებიც?
+  # ეს ფუნქცია ექსპერიმენტულია და შესაძლოა პრობლემები გამოიწვიოს
+  check-eagler-players: false
   # დროის ოდენობა, რომელიც უნდა გავიდეს, სერვერთან კავშირის გარეშე, სანამ მოთამაშე დროებით გავარდება სერვერიდან.
   # (ეს არის ნაჩვენები მილიწამებში: 1 წამი = 1000 მილიწამი)
   read-timeout: 8000

common/src/main/resources/assets/config/nl.yml

@@ -182,6 +182,9 @@ verification:
   # Moet Sonar elke beweging/positieverandering tijdens de verificatie registreren?
   # Dit wordt niet aanbevolen voor productieservers, maar kan nuttig zijn bij het opsporen van fouten.
   debug-xyz-positions: false
+  # Moet Sonar ook EaglercraftX-spelers controleren?
+  # Deze functie is experimenteel en kan problemen veroorzaken.
+  check-eagler-players: false
   # Moet Sonar ook Geyser (Bedrock) spelers controleren?
   # Deze functie is experimenteel en kan problemen veroorzaken
   # Als dit is uitgeschakeld, worden Bedrock-spelers overgeslagen

common/src/main/resources/assets/config/pl.yml

@@ -186,6 +186,9 @@ verification:
   # Ta funkcja jest eksperymentalna i może powodować problemy
   # Jeśli ta opcja jest wyłączona, gracze Bedrock będą pomijani
   check-geyser-players: false
+  # Czy Sonar powinien również sprawdzać graczy EaglercraftX?
+  # Ta funkcja jest eksperymentalna i może powodować problemy.
+  check-eagler-players: false
   # Czas, jaki ma upłynąć od zatrzymania wysyłania pakietów przez gracza do wyrzucenia.
   # (Wartość ta reprezentuje czas w milisekundach: 1 sekunda = 1000 milisekund)
   read-timeout: 8000

common/src/main/resources/assets/config/pt-br.yml

@@ -186,6 +186,9 @@ verification:
   # Este recurso é experimental e pode causar problemas
   # Se isso estiver desativado, jogadores Bedrock serão ignorados
   check-geyser-players: false
+  # O Sonar também deve verificar os jogadores do EaglercraftX?
+  # Este recurso é experimental e pode causar problemas.
+  check-eagler-players: false
   # O tempo desde que o jogador parou de enviar pacotes antes de desconectar
   # (Este valor representa o tempo em milissegundos: 1 segundo = 1000 milissegundos)
   read-timeout: 8000

common/src/main/resources/assets/config/ru.yml

@@ -185,6 +185,9 @@ verification:
   # Эта функция экспериментальна и может вызывать проблемы
   # Если это отключено, игроки Bedrock будут пропущены
   check-geyser-players: false
+  # Должен ли Sonar также проверять игроков EaglercraftX?
+  # Эта функция является экспериментальной и может вызывать проблемы.
+  check-eagler-players: false
   # Время, прошедшее с момента прекращения отправки пакетов игроком до отключения.
   # (Это значение представляет время в миллисекундах: 1 секунда = 1000 миллисекунд)
   read-timeout: 8000

common/src/main/resources/assets/config/zh.yml

@@ -108,9 +108,9 @@ verification:
       # 如果未找到指定的图片, 则自动通过噪音生成一个随机的背景图片.
       # 如果图片在该插件的配置文件夹下, 则可以简单地输入图片的文件名.
       background: ''
-      # 地图验证码的风格（默认：'modern'）.
+      # 地图验证码的风格（默认: 'modern'）.
       # 要使用旧设计, 请将其设置为 'legacy'.
-      # To use an experimental design, set this to 'complex'.
+      # 要使用实验设计, 请将此项设置为 'complex'.
       style: 'modern'
       # Sonar 应该一次准备多少个验证码?
       precompute: 500
@@ -182,6 +182,9 @@ verification:
   # 此功能是实验性的. 请报告任何因为误判而导致无法通过检查的问题
   # 如果关闭该选项 Sonar 将不检查这些玩家以便直接连接到服务器.
   check-geyser-players: false
+  # 声纳是否也应检测 EaglercraftX 玩家?
+  # 此功能尚在试验阶段, 可能引发问题
+  check-eagler-players: false
   # 播放器断开连接前停止发送数据包的时间
   # (该值为毫秒. 1秒等于1000毫秒.)
   read-timeout: 8000

gradle.properties

@@ -1,3 +1,3 @@
 group=xyz.jonesdev
-version=2.1.44
+version=2.1.45
 description=A lightweight, effective, and easy-to-use anti-bot plugin for Velocity, BungeeCord, and Bukkit.

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ pluginyml = "0.6.0"
 [plugins]
 indra-git = "net.kyori.indra.git:3.2.0"
 shadow = "com.gradleup.shadow:8.3.8"
-spotless = "com.diffplug.spotless:7.2.1"
+spotless = "com.diffplug.spotless:8.2.1"
 pluginyml-bungee = { id = "net.minecrell.plugin-yml.bungee", version.ref = "pluginyml" }
 pluginyml-bukkit = { id = "net.minecrell.plugin-yml.bukkit", version.ref = "pluginyml" }
 pluginyml-paper = { id = "net.minecrell.plugin-yml.paper", version.ref = "pluginyml" }
@@ -30,13 +30,13 @@ bstats-bungee = { module = "org.bstats:bstats-bungeecord", version.ref = "bstats
 bstats-bukkit = { module = "org.bstats:bstats-bukkit", version.ref = "bstats" }
 bstats-velocity = { module = "org.bstats:bstats-velocity", version.ref = "bstats" }
 imagefilters = "com.jhlabs:filters:2.0.235-1"
-caffeine = "com.github.ben-manes.caffeine:caffeine:3.2.2"
+caffeine = "com.github.ben-manes.caffeine:caffeine:3.2.3"
 annotations = "org.jetbrains:annotations:26.0.2"
 simpleyaml = "com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4"
 ormlite = "com.j256.ormlite:ormlite-jdbc:6.1"
 lombok = "org.projectlombok:lombok:1.18.42"
 bungeecord = "net.md-5:bungeecord-proxy:1.21-SNAPSHOT"
-velocity = "io.papermc.velocity:velocity-proxy:3.4.0-SNAPSHOT"
+velocity = "io.papermc.velocity:velocity-proxy:3.5.0-SNAPSHOT"
 paper = "io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT"
 # We have to use 1.16.5 for backwards compatibility
 spigot = "org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT"

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 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.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # 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" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -1,94 +1,93 @@
-@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
+@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
+
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -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