diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index cc85910..5888e90 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -12,16 +12,16 @@ jobs: steps: - uses: actions/checkout@main - - name: Set up Java 20 + - name: Set up Java 21 uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '20' + java-version: '21' - name: Setup Gradle uses: gradle/gradle-build-action@v2 with: - gradle-version: 8.4 + gradle-version: 8.8 - uses: actions/cache@main with: diff --git a/build.gradle b/build.gradle index 51dd176..8b2507c 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ subprojects { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -53,7 +53,7 @@ subprojects { implementation 'com.google.inject:guice:5.1.0' implementation 'com.google.guava:guava:30.1-jre' - compileOnly 'org.projectlombok:lombok:1.18.22' - annotationProcessor 'org.projectlombok:lombok:1.18.22' + compileOnly 'org.projectlombok:lombok:1.18.30' + annotationProcessor 'org.projectlombok:lombok:1.18.30' } } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..7f93135 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e411586..a441313 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index c53aefa..1aa94a4 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# 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. @@ -32,10 +32,10 @@ # 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». +# * 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: # @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# 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"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + 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 @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# 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, 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" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# 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. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/spigot/build.gradle b/spigot/build.gradle index 3cd67ed..122aea8 100644 --- a/spigot/build.gradle +++ b/spigot/build.gradle @@ -1,6 +1,6 @@ plugins { id 'com.github.johnrengelman.shadow' version '8.1.1' - id 'xyz.jpenilla.run-paper' version '2.2.2' + id 'xyz.jpenilla.run-paper' version '2.3.0' } tasks { @@ -15,7 +15,8 @@ tasks { 'cloud.commandframework', // 'eu.okaeri', 'com.zaxxer', - 'net.kyori'] +// 'net.kyori' + ] relocations.forEach { relocate it, "ru.brikster.chatty.shaded.${it}" } @@ -29,7 +30,7 @@ tasks { } runServer { - minecraftVersion('1.20.4') + minecraftVersion('1.21') } } @@ -44,9 +45,11 @@ processResources { repositories { maven { url = 'https://jitpack.io' } + maven { url = 'https://repo.papermc.io/repository/maven-public/' } maven { url = "https://storehouse.okaeri.eu/repository/maven-public/" } maven { url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/' } maven { url = 'https://repo.codemc.org/repository/maven-public' } + } def okaeriVersion = '5a33076d8c' diff --git a/spigot/src/main/java/ru/brikster/chatty/Chatty.java b/spigot/src/main/java/ru/brikster/chatty/Chatty.java index 8e8052b..3be99ee 100644 --- a/spigot/src/main/java/ru/brikster/chatty/Chatty.java +++ b/spigot/src/main/java/ru/brikster/chatty/Chatty.java @@ -29,6 +29,9 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.plugin.java.JavaPlugin; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import ru.brikster.chatty.adventure.NativeBukkitAudienceProvider; import ru.brikster.chatty.api.ChattyApiImpl; import ru.brikster.chatty.api.event.ChattyInitEvent; import ru.brikster.chatty.chat.executor.LegacyEventExecutor; @@ -55,6 +58,7 @@ import ru.brikster.chatty.repository.player.PlayerDataRepository; import ru.brikster.chatty.util.AdventureUtil; import ru.brikster.chatty.util.ListenerUtil; +import ru.brikster.chatty.util.PaperUtil; import java.io.IOException; import java.nio.file.Files; @@ -66,6 +70,7 @@ public final class Chatty extends JavaPlugin { + private static final Logger log = LoggerFactory.getLogger(Chatty.class); private final Map> proxyingCommandHandlerMap = new ConcurrentHashMap<>(); private Injector injector; @@ -134,7 +139,16 @@ private void registerChattyCommand() throws Exception { } private void initialize() throws Exception { - ChattyInitEvent initEvent = new ChattyInitEvent(BukkitAudiences.create(this)); + BukkitAudiences audiences; + if (PaperUtil.isPaper() && PaperUtil.isSupportAdventure()) { + getLogger().log(Level.INFO, "Using native Adventure audience provider"); + audiences = new NativeBukkitAudienceProvider(); + } else { + getLogger().log(Level.INFO, "Using bundled Adventure audience provider"); + audiences = BukkitAudiences.create(this); + } + + ChattyInitEvent initEvent = new ChattyInitEvent(audiences); getServer().getPluginManager().callEvent(initEvent); this.injector = Guice.createInjector(new GeneralGuiceModule( diff --git a/spigot/src/main/java/ru/brikster/chatty/adventure/NativeBukkitAudienceProvider.java b/spigot/src/main/java/ru/brikster/chatty/adventure/NativeBukkitAudienceProvider.java new file mode 100644 index 0000000..f8e3af4 --- /dev/null +++ b/spigot/src/main/java/ru/brikster/chatty/adventure/NativeBukkitAudienceProvider.java @@ -0,0 +1,99 @@ +package ru.brikster.chatty.adventure; + +import net.kyori.adventure.audience.Audience; +import net.kyori.adventure.key.Key; +import net.kyori.adventure.platform.bukkit.BukkitAudiences; +import net.kyori.adventure.text.flattener.ComponentFlattener; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +import java.util.*; +import java.util.function.Predicate; + +@SuppressWarnings("rawtypes") +public final class NativeBukkitAudienceProvider implements BukkitAudiences { + + @Override + public @NotNull Audience all() { + //noinspection unchecked + List audienceList = new ArrayList<>( + (Collection) Bukkit.getOnlinePlayers()); + audienceList.add((Audience) Bukkit.getConsoleSender()); + return Audience.audience(audienceList); + } + + @Override + public @NotNull Audience console() { + return (Audience) Bukkit.getConsoleSender(); + } + + @Override + public @NotNull Audience players() { + //noinspection unchecked + return Audience.audience( + (Collection) Bukkit.getOnlinePlayers()); + } + + @Override + public @NotNull Audience player(@NotNull UUID playerId) { + return Audience.audience((Audience) Objects.requireNonNull(Bukkit.getPlayer(playerId), + "Cannot find player")); + } + + @Override + public @NotNull Audience permission(@NotNull String permission) { + List audienceList = new ArrayList<>( + Bukkit.getOnlinePlayers()); + audienceList.add(Bukkit.getConsoleSender()); + audienceList.removeIf(sender -> !sender.hasPermission(permission)); + //noinspection unchecked + return Audience.audience((Collection) audienceList); + } + + @Override + public @NotNull Audience world(@NotNull Key world) { + List audienceList = new ArrayList<>( + Bukkit.getOnlinePlayers()); + audienceList.removeIf(player -> !player.getWorld().getName().equals(world.asString())); + //noinspection unchecked + return Audience.audience((Collection) audienceList); + } + + @Override + public @NotNull Audience server(@NotNull String serverName) { + return Audience.empty(); + } + + @Override + public @NotNull ComponentFlattener flattener() { + return ComponentFlattener.basic(); + } + + @Override + public void close() { + + } + + @Override + public @NotNull Audience sender(@NotNull CommandSender sender) { + return Audience.audience((Audience) sender); + } + + @Override + public @NotNull Audience player(@NotNull Player player) { + return sender(player); + } + + @Override + public @NotNull Audience filter(@NotNull Predicate filter) { + List audienceList = new ArrayList<>( + Bukkit.getOnlinePlayers()); + audienceList.add(Bukkit.getConsoleSender()); + audienceList.removeIf(sender -> !filter.test(sender)); + //noinspection unchecked + return Audience.audience((Collection) audienceList); + } + +} diff --git a/spigot/src/main/java/ru/brikster/chatty/util/PaperUtil.java b/spigot/src/main/java/ru/brikster/chatty/util/PaperUtil.java new file mode 100644 index 0000000..aca6673 --- /dev/null +++ b/spigot/src/main/java/ru/brikster/chatty/util/PaperUtil.java @@ -0,0 +1,32 @@ +package ru.brikster.chatty.util; + +import lombok.experimental.UtilityClass; +import org.bukkit.entity.Player; + +@UtilityClass +public class PaperUtil { + + private static Boolean IS_PAPER; + + public boolean isPaper() { + if (IS_PAPER != null) return IS_PAPER; + try { + Class.forName("com.destroystokyo.paper.PaperConfig"); + IS_PAPER = true; + } catch (Throwable t) { + IS_PAPER = false; + } + return IS_PAPER; + } + + public boolean isSupportAdventure() { + try { + //noinspection JavaReflectionMemberAccess + Player.class.getMethod("sendMessage", Class.forName("net.kyori.adventure.text.Component")); + return true; + } catch (NoSuchMethodException | ClassNotFoundException e) { + return false; + } + } + +}