diff --git a/.github/workflows/publish_to_nexus.yml b/.github/workflows/publish_to_nexus.yml index 178ff487..6575dd88 100644 --- a/.github/workflows/publish_to_nexus.yml +++ b/.github/workflows/publish_to_nexus.yml @@ -14,9 +14,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index f6caae5f..2233c1b9 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -7,9 +7,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 diff --git a/build.gradle.kts b/build.gradle.kts index 7c06da4f..3042b29a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,11 +4,11 @@ plugins { java `maven-publish` `java-library` - id("de.chojo.publishdata") version "1.2.4" + id("de.chojo.publishdata") version "1.4.0" } group = "de.eldoria" -version = "2.5.2" +version = "2.5.3" var mainPackage = "bigdoorsopener" val shadebade = group as String? + "." + mainPackage + "." val name = "BigDoorsOpener" @@ -22,19 +22,20 @@ repositories { } dependencies { - implementation("de.eldoria", "eldo-util", "1.14.4") - implementation("net.kyori", "adventure-api", "4.14.0") - implementation("net.kyori", "adventure-platform-bukkit", "4.3.0") + implementation("de.eldoria", "eldo-util", "1.14.5") + implementation("net.kyori", "adventure-api", "4.17.0") + implementation("net.kyori", "adventure-platform-bukkit", "4.3.4") compileOnly("org.spigotmc", "spigot-api", "1.13.2-R0.1-SNAPSHOT") - compileOnly("org.jetbrains", "annotations", "24.0.1") - compileOnly("com.sk89q.worldguard", "worldguard-bukkit", "7.0.8") { + compileOnly("org.jetbrains", "annotations", "24.1.0") + compileOnly("com.sk89q.worldguard", "worldguard-bukkit", "7.0.9") { exclude("org.spigotmc", "spigot-api") + exclude("com.sk89q.worldedit.worldedit-libs", "core") } - compileOnly("me.clip", "placeholderapi", "2.11.3") + compileOnly("me.clip", "placeholderapi", "2.11.6") compileOnly("nl.pim16aap2", "BigDoors", "0.1.8.46") - compileOnly("io.lumine", "Mythic-Dist", "5.3.0") - testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.9.3") + compileOnly("io.lumine", "Mythic-Dist", "5.6.2") + testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.0") } license { @@ -45,12 +46,12 @@ license { java { withSourcesJar() withJavadocJar() - toolchain{ + toolchain { languageVersion.set(JavaLanguageVersion.of(17)) } } -publishData{ +publishData { addBuildData() useEldoNexusRepos() publishComponent("java") @@ -120,7 +121,7 @@ tasks { destinationDir = File(path.toString()) } - build{ + build { dependsOn(shadowJar) } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a79..a4b76b95 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 37aef8d3..9355b415 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cbb..f5feea6d 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# 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/. @@ -83,7 +85,9 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# 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 +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -130,10 +134,13 @@ 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. @@ -141,7 +148,7 @@ 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=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -149,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -198,11 +205,11 @@ 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 $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. +# 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" \ diff --git a/gradlew.bat b/gradlew.bat index 6689b85b..9b42019c 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @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 ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 diff --git a/src/main/java/de/eldoria/bigdoorsopener/commands/bdosubcommands/Reload.java b/src/main/java/de/eldoria/bigdoorsopener/commands/bdosubcommands/Reload.java index 280a2e03..cdf0df94 100644 --- a/src/main/java/de/eldoria/bigdoorsopener/commands/bdosubcommands/Reload.java +++ b/src/main/java/de/eldoria/bigdoorsopener/commands/bdosubcommands/Reload.java @@ -1,14 +1,16 @@ -/* - * SPDX-License-Identifier: AGPL-3.0-only - * - * Copyright (C) 2021 EldoriaRPG Team and Contributor - */ - -package de.eldoria.bigdoorsopener.commands.bdosubcommands; +/* + * SPDX-License-Identifier: AGPL-3.0-only + * + * Copyright (C) 2021 EldoriaRPG Team and Contributor + */ + +package de.eldoria.bigdoorsopener.commands.bdosubcommands; import de.eldoria.bigdoorsopener.config.Config; +import de.eldoria.bigdoorsopener.core.BigDoorsOpener; import de.eldoria.bigdoorsopener.core.scheduler.DoorChecker; import de.eldoria.bigdoorsopener.util.Permissions; +import de.eldoria.eldoutilities.plugin.EldoPlugin; import de.eldoria.eldoutilities.simplecommands.EldoCommand; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -22,9 +24,9 @@ public class Reload extends EldoCommand { private final Config config; private final DoorChecker doorChecker; - private final Plugin plugin; + private final BigDoorsOpener plugin; - public Reload(Config config, DoorChecker doorChecker, Plugin plugin) { + public Reload(Config config, DoorChecker doorChecker, BigDoorsOpener plugin) { super(plugin); this.config = config; this.doorChecker = doorChecker; @@ -37,9 +39,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command return true; } - config.reloadConfig(); - doorChecker.reload(); - plugin.onEnable(); + plugin.reload(); messageSender().sendLocalizedMessage(sender, "reload.completed"); return true; diff --git a/src/main/java/de/eldoria/bigdoorsopener/conditions/item/Item.java b/src/main/java/de/eldoria/bigdoorsopener/conditions/item/Item.java index f86a766e..cf1ce449 100644 --- a/src/main/java/de/eldoria/bigdoorsopener/conditions/item/Item.java +++ b/src/main/java/de/eldoria/bigdoorsopener/conditions/item/Item.java @@ -9,9 +9,6 @@ import de.eldoria.bigdoorsopener.conditions.DoorCondition; import de.eldoria.bigdoorsopener.door.ConditionalDoor; import de.eldoria.bigdoorsopener.util.C; -import de.eldoria.eldoutilities.crossversion.ServerVersion; -import de.eldoria.eldoutilities.crossversion.builder.VersionFunctionBuilder; -import de.eldoria.eldoutilities.crossversion.function.VersionFunction; import de.eldoria.eldoutilities.localization.ILocalizer; import de.eldoria.eldoutilities.serialization.SerializationUtil; import de.eldoria.eldoutilities.utils.ObjUtil; @@ -37,42 +34,6 @@ public abstract class Item implements DoorCondition { private final ItemStack item; private final boolean consumed; - private final VersionFunction handCheck = VersionFunctionBuilder.functionBuilder(Player.class, Boolean.class) - .addVersionFunctionBetween( - ServerVersion.MC_1_9, ServerVersion.MC_1_20, - p -> hasPlayerItemInMainHand(p) || hasPlayerItemInOffHand(p)) - .addVersionFunction((p) -> { - ItemStack item = p.getItemInHand(); - if (item.getAmount() < item().getAmount()) { - return false; - } - return item.isSimilar(item()); - }, ServerVersion.MC_1_8).build(); - - private final VersionFunction takeFromHand = VersionFunctionBuilder.functionBuilder(Player.class, Boolean.class) - .addVersionFunctionBetween( - ServerVersion.MC_1_9, ServerVersion.MC_1_20, - (p) -> { - if (hasPlayerItemInMainHand(p)) { - takeFromMainHand(p); - return true; - } else if (hasPlayerItemInOffHand(p)) { - takeFromOffHand(p); - return true; - } - return false; - }).addVersionFunction( - p -> { - if (handCheck.apply(p)) { - ItemStack item = p.getItemInHand(); - item.setAmount(item.getAmount() - item().getAmount()); - p.setItemInHand(item); - p.updateInventory(); - return true; - } - return false; - }, ServerVersion.MC_1_8).build(); - /** * Creates a new item key * @@ -112,7 +73,7 @@ public static List onTabComplete(CommandSender sender, ILocalizer locali * @return true if the player has the item in one of his hands. */ protected boolean hasPlayerItemInHand(Player player) { - return handCheck.apply(player); + return hasPlayerItemInMainHand(player) || hasPlayerItemInOffHand(player); } /** @@ -194,7 +155,14 @@ protected void takeFromInventory(Player player) { * @param player player to take items from */ protected boolean tryTakeFromHands(Player player) { - return takeFromHand.apply(player); + if (hasPlayerItemInMainHand(player)) { + takeFromMainHand(player); + return true; + } else if (hasPlayerItemInOffHand(player)) { + takeFromOffHand(player); + return true; + } + return false; } @Override @@ -220,7 +188,7 @@ public Component getDescription(ILocalizer localizer) { for (Map.Entry entry : meta.getEnchants().entrySet()) { builder.append(Component.newline()) .append(Component.text(entry.getKey().getKey().getKey() + " " - + entry.getValue().toString(), NamedTextColor.GRAY)); + + entry.getValue().toString(), NamedTextColor.GRAY)); } } diff --git a/src/main/java/de/eldoria/bigdoorsopener/core/BigDoorsOpener.java b/src/main/java/de/eldoria/bigdoorsopener/core/BigDoorsOpener.java index e396373f..82552b6c 100644 --- a/src/main/java/de/eldoria/bigdoorsopener/core/BigDoorsOpener.java +++ b/src/main/java/de/eldoria/bigdoorsopener/core/BigDoorsOpener.java @@ -9,11 +9,11 @@ import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.protection.regions.RegionContainer; import de.eldoria.bigdoorsopener.commands.BDOCommand; -import de.eldoria.bigdoorsopener.conditions.item.interacting.ItemConditionListener; import de.eldoria.bigdoorsopener.conditions.item.ItemHolding; import de.eldoria.bigdoorsopener.conditions.item.ItemOwning; import de.eldoria.bigdoorsopener.conditions.item.interacting.ItemBlock; import de.eldoria.bigdoorsopener.conditions.item.interacting.ItemClick; +import de.eldoria.bigdoorsopener.conditions.item.interacting.ItemConditionListener; import de.eldoria.bigdoorsopener.conditions.location.Proximity; import de.eldoria.bigdoorsopener.conditions.location.Region; import de.eldoria.bigdoorsopener.conditions.location.SimpleRegion; @@ -45,12 +45,10 @@ import de.eldoria.eldoutilities.bstats.charts.DrilldownPie; import de.eldoria.eldoutilities.bstats.charts.SimplePie; import de.eldoria.eldoutilities.container.Pair; -import de.eldoria.eldoutilities.crossversion.ServerVersion; import de.eldoria.eldoutilities.localization.ILocalizer; import de.eldoria.eldoutilities.messages.MessageSender; import de.eldoria.eldoutilities.plugin.EldoPlugin; import de.eldoria.eldoutilities.updater.Updater; -import de.eldoria.eldoutilities.updater.butlerupdater.ButlerUpdateData; import de.eldoria.eldoutilities.updater.lynaupdater.LynaUpdateData; import nl.pim16aap2.bigDoors.BigDoors; import nl.pim16aap2.bigDoors.Commander; @@ -66,6 +64,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -127,8 +126,6 @@ public static BigDoorsOpener instance() { @Override public void onPluginEnable(boolean reload) { - ServerVersion.forceVersion(ServerVersion.MC_1_13, ServerVersion.MC_1_20); - if (!initialized) { BigDoorsOpener.instance = this; buildSerializer(); @@ -155,7 +152,7 @@ public void onPostStart(boolean reload) { // Check for updates if (config.isCheckUpdates()) { - Updater.lyna(LynaUpdateData.builder(this,3 ) + Updater.lyna(LynaUpdateData.builder(this, 3) .notifyPermission("bdo.command.reload") .updateUrl("https://discord.gg/JJdx3xe") .build()) @@ -341,4 +338,24 @@ private Pair getDoorsVersion(String ver) { } return new Pair<>(versionString, buildString); } + + /** + * Returns the configuration for the doors. + *

+ * The config is loaded after the server ticked for the first time. + * + * @return The configuration + */ + @NotNull + public Config getDoorsConfig() { + return Objects.requireNonNull(config, "Do not call before server is fully initialized."); + } + + /** + * Reloads the configuration and door checker. + */ + public void reload() { + config.reloadConfig(); + doorChecker.reload(); + } } diff --git a/src/main/java/de/eldoria/bigdoorsopener/util/CachingJSEngine.java b/src/main/java/de/eldoria/bigdoorsopener/util/CachingJSEngine.java index 8fe5aa28..0b2b8bfc 100644 --- a/src/main/java/de/eldoria/bigdoorsopener/util/CachingJSEngine.java +++ b/src/main/java/de/eldoria/bigdoorsopener/util/CachingJSEngine.java @@ -15,6 +15,7 @@ import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; import javax.script.ScriptException; +import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.logging.Level; @@ -47,8 +48,16 @@ public CachingJSEngine(int cacheSize) { BigDoorsOpener.logger().info("Java 15 or newer detected. Searching for external Engine."); RegisteredServiceProvider registration = Bukkit.getServer().getServicesManager().getRegistration(ScriptEngineManager.class); if (registration != null) { - engine = registration.getProvider().getEngineByName("js"); - } else { + for (String currentEngine : List.of("js", "JavaScript", "nashornjs", "nashorn")) { + try { + engine = registration.getProvider().getEngineByName(currentEngine); + } catch (Exception e) { + continue; + } + break; + } + } + if (engine == null) { BigDoorsOpener.logger().severe("--------------------------------------------------------------------------"); BigDoorsOpener.logger().severe("-> No script engine found. <-"); BigDoorsOpener.logger().severe("-> Custom evaluator and placeholder will not work. <-"); @@ -67,8 +76,7 @@ public CachingJSEngine(int cacheSize) { } catch (ScriptException ex) { BigDoorsOpener.logger().log(Level.WARNING, "Could not start script engine. Custom evaluator will not work.", e); } - } catch (NullPointerException e) { - } catch (RuntimeException e) { + } catch (Exception e) { BigDoorsOpener.logger().log(Level.WARNING, "Could not start script engine. Custom evaluator will not work.", e); }