diff --git a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java index 0b3ad90b8..1c40363d2 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java @@ -609,7 +609,7 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event) { - final String cmd = event.getMessage().toLowerCase(Locale.ENGLISH).split(" ")[0].replace("/", "").toLowerCase(Locale.ENGLISH); + final String cmd = event.getMessage().split(" ")[0].replace("/", "").toLowerCase(Locale.ENGLISH); final int argStartIndex = event.getMessage().indexOf(" "); final String args = argStartIndex == -1 ? "" // No arguments present : event.getMessage().substring(argStartIndex); // arguments start at argStartIndex; substring from there. @@ -632,7 +632,7 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor { public void handlePlayerCommandPreprocess(final PlayerCommandPreprocessEvent event, final String effectiveCommand) { final Player player = event.getPlayer(); - final String cmd = effectiveCommand.toLowerCase(Locale.ENGLISH).split(" ")[0].replace("/", "").toLowerCase(Locale.ENGLISH); + final String cmd = effectiveCommand.split(" ")[0].replace("/", "").toLowerCase(Locale.ENGLISH); final PluginCommand pluginCommand = ess.getServer().getPluginCommand(cmd); if (ess.getSettings().getSocialSpyCommands().contains(cmd) || ess.getSettings().getSocialSpyCommands().contains("*")) { diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 383b8c309..cf08d3dac 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -8,6 +8,6 @@ repositories { dependencies { implementation("net.kyori", "indra-common", "3.1.3") - implementation("com.github.johnrengelman", "shadow", "8.1.1") - implementation("xyz.jpenilla", "run-task", "2.3.0") + implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.3") + implementation("xyz.jpenilla", "run-task", "2.3.1") } diff --git a/build-logic/src/main/kotlin/essentials.shadow-module.gradle.kts b/build-logic/src/main/kotlin/essentials.shadow-module.gradle.kts index 9ebe51ea4..d54c0fae2 100644 --- a/build-logic/src/main/kotlin/essentials.shadow-module.gradle.kts +++ b/build-logic/src/main/kotlin/essentials.shadow-module.gradle.kts @@ -1,6 +1,6 @@ plugins { id("essentials.module-conventions") - id("com.github.johnrengelman.shadow") + id("com.gradleup.shadow") } tasks { @@ -8,7 +8,8 @@ tasks { archiveClassifier.set("unshaded") } shadowJar { - archiveClassifier.set(null) + @Suppress("CAST_NEVER_SUCCEEDS") + archiveClassifier.set(null as? String) } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22ce5..df97d72b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/providers/PaperProvider/build.gradle b/providers/PaperProvider/build.gradle index b66ffd77c..8a764dff0 100644 --- a/providers/PaperProvider/build.gradle +++ b/providers/PaperProvider/build.gradle @@ -1,6 +1,6 @@ plugins { id("essentials.base-conventions") - id("com.github.johnrengelman.shadow") + id("com.gradleup.shadow") } java {