Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-22 00:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Update toolchain

Browse Source
This commit is contained in:
JRoy 2024-10-27 19:31:42 -04:00 committed by Josh Roy
parent f7a8f86850
commit cb15b467ab
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
View File

@ -609,7 +609,7 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event) { 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 int argStartIndex = event.getMessage().indexOf(" ");
final String args = argStartIndex == -1 ? "" // No arguments present final String args = argStartIndex == -1 ? "" // No arguments present
: event.getMessage().substring(argStartIndex); // arguments start at argStartIndex; substring from there. : 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) { public void handlePlayerCommandPreprocess(final PlayerCommandPreprocessEvent event, final String effectiveCommand) {
final Player player = event.getPlayer(); 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); final PluginCommand pluginCommand = ess.getServer().getPluginCommand(cmd);
if (ess.getSettings().getSocialSpyCommands().contains(cmd) || ess.getSettings().getSocialSpyCommands().contains("*")) { if (ess.getSettings().getSocialSpyCommands().contains(cmd) || ess.getSettings().getSocialSpyCommands().contains("*")) {

4
build-logic/build.gradle.kts
View File

@ -8,6 +8,6 @@ repositories {
dependencies { dependencies {
implementation("net.kyori", "indra-common", "3.1.3") implementation("net.kyori", "indra-common", "3.1.3")
implementation("com.github.johnrengelman", "shadow", "8.1.1") implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.3")
implementation("xyz.jpenilla", "run-task", "2.3.0") implementation("xyz.jpenilla", "run-task", "2.3.1")
} }

5
build-logic/src/main/kotlin/essentials.shadow-module.gradle.kts
View File

@ -1,6 +1,6 @@
plugins { plugins {
id("essentials.module-conventions") id("essentials.module-conventions")
id("com.github.johnrengelman.shadow") id("com.gradleup.shadow")
} }
tasks { tasks {
@ -8,7 +8,8 @@ tasks {
archiveClassifier.set("unshaded") archiveClassifier.set("unshaded")
} }
shadowJar { shadowJar {
archiveClassifier.set(null) @Suppress("CAST_NEVER_SUCCEEDS")
archiveClassifier.set(null as? String)
} }
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

2
providers/PaperProvider/build.gradle
View File

@ -1,6 +1,6 @@
plugins { plugins {
id("essentials.base-conventions") id("essentials.base-conventions")
id("com.github.johnrengelman.shadow") id("com.gradleup.shadow")
} }
java { java {