diff --git a/build.gradle.kts b/build.gradle.kts index 6d6659f..23d3faf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,13 +16,13 @@ repositories { } dependencies { - compileOnly("org.projectlombok:lombok:1.18.28") - annotationProcessor("org.projectlombok:lombok:1.18.28") - compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT") - implementation("org.apache.commons:commons-lang3:3.12.0") + compileOnly("org.projectlombok:lombok:1.18.30") + annotationProcessor("org.projectlombok:lombok:1.18.30") + compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT") + implementation("org.apache.commons:commons-lang3:3.14.0") compileOnly("dev.plex:server:1.4-SNAPSHOT") - compileOnly("org.json:json:20230618") - implementation("org.jetbrains:annotations:24.0.1") + compileOnly("org.json:json:20231013") + implementation("org.jetbrains:annotations:24.1.0") } group = "dev.plex" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 033e24c..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 ac72c34..1af9e09 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.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index fcb6fca..0adc8e1 100755 --- a/gradlew +++ b/gradlew @@ -83,7 +83,8 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/src/main/java/dev/plex/command/GuildCommand.java b/src/main/java/dev/plex/command/GuildCommand.java index 4bd492b..d5035d9 100644 --- a/src/main/java/dev/plex/command/GuildCommand.java +++ b/src/main/java/dev/plex/command/GuildCommand.java @@ -119,7 +119,7 @@ public class GuildCommand extends PlexCommand } @Override - public @NotNull List tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException + public @NotNull List smartTabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException { if (args.length == 1) { diff --git a/src/main/java/dev/plex/command/sub/ChatSubCommand.java b/src/main/java/dev/plex/command/sub/ChatSubCommand.java index 46ee597..428773c 100644 --- a/src/main/java/dev/plex/command/sub/ChatSubCommand.java +++ b/src/main/java/dev/plex/command/sub/ChatSubCommand.java @@ -6,6 +6,9 @@ import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.source.RequiredCommandSource; import dev.plex.guild.data.Member; +import java.util.Collections; +import java.util.List; +import java.util.Objects; import net.kyori.adventure.text.Component; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; @@ -15,8 +18,6 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Objects; - @CommandParameters(name = "chat", usage = "/guild [message]", description = "Toggles guild chat or sends a guild chat message") @CommandPermissions(source = RequiredCommandSource.IN_GAME, permission = "plex.guilds.chat") public class ChatSubCommand extends PlexCommand @@ -50,4 +51,10 @@ public class ChatSubCommand extends PlexCommand }, () -> send(player, messageComponent("guildNotFound"))); return null; } + + @Override + public @NotNull List smartTabComplete(@NotNull CommandSender commandSender, @NotNull String s, @NotNull String[] strings) throws IllegalArgumentException + { + return Collections.emptyList(); + } } diff --git a/src/main/java/dev/plex/command/sub/CreateSubCommand.java b/src/main/java/dev/plex/command/sub/CreateSubCommand.java index a11cac0..ee0598a 100644 --- a/src/main/java/dev/plex/command/sub/CreateSubCommand.java +++ b/src/main/java/dev/plex/command/sub/CreateSubCommand.java @@ -6,6 +6,8 @@ import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.source.RequiredCommandSource; import dev.plex.guild.Guild; +import java.util.Collections; +import java.util.List; import net.kyori.adventure.text.Component; import org.apache.commons.lang3.StringUtils; import org.bukkit.command.CommandSender; @@ -41,4 +43,10 @@ public class CreateSubCommand extends PlexCommand }); return null; } + + @Override + public @NotNull List smartTabComplete(@NotNull CommandSender commandSender, @NotNull String s, @NotNull String[] strings) throws IllegalArgumentException + { + return Collections.emptyList(); + } } diff --git a/src/main/java/dev/plex/command/sub/HomeSubCommand.java b/src/main/java/dev/plex/command/sub/HomeSubCommand.java index fca8e9f..a4a7691 100644 --- a/src/main/java/dev/plex/command/sub/HomeSubCommand.java +++ b/src/main/java/dev/plex/command/sub/HomeSubCommand.java @@ -5,6 +5,8 @@ import dev.plex.command.PlexCommand; import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.source.RequiredCommandSource; +import java.util.Collections; +import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -35,4 +37,10 @@ public class HomeSubCommand extends PlexCommand }, () -> send(player, messageComponent("guildNotFound"))); return null; } + + @Override + public @NotNull List smartTabComplete(@NotNull CommandSender commandSender, @NotNull String s, @NotNull String[] strings) throws IllegalArgumentException + { + return Collections.emptyList(); + } } diff --git a/src/main/java/dev/plex/command/sub/InfoSubCommand.java b/src/main/java/dev/plex/command/sub/InfoSubCommand.java index 50c5439..9481422 100644 --- a/src/main/java/dev/plex/command/sub/InfoSubCommand.java +++ b/src/main/java/dev/plex/command/sub/InfoSubCommand.java @@ -6,6 +6,10 @@ import dev.plex.command.PlexCommand; import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.source.RequiredCommandSource; +import java.time.format.DateTimeFormatter; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CompletableFuture; import net.kyori.adventure.text.Component; import org.apache.commons.lang3.StringUtils; import org.bukkit.command.CommandSender; @@ -13,10 +17,6 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.time.format.DateTimeFormatter; -import java.util.List; -import java.util.concurrent.CompletableFuture; - @CommandParameters(name = "info", aliases = "information", usage = "/guild ", description = "Shows the guild's information") @CommandPermissions(source = RequiredCommandSource.IN_GAME, permission = "plex.guilds.info") public class InfoSubCommand extends PlexCommand @@ -55,4 +55,10 @@ public class InfoSubCommand extends PlexCommand }); return null; } + + @Override + public @NotNull List smartTabComplete(@NotNull CommandSender commandSender, @NotNull String s, @NotNull String[] strings) throws IllegalArgumentException + { + return Collections.emptyList(); + } } diff --git a/src/main/java/dev/plex/command/sub/InviteSubCommand.java b/src/main/java/dev/plex/command/sub/InviteSubCommand.java index c7b5be0..fb3d303 100644 --- a/src/main/java/dev/plex/command/sub/InviteSubCommand.java +++ b/src/main/java/dev/plex/command/sub/InviteSubCommand.java @@ -116,7 +116,7 @@ public class InviteSubCommand extends PlexCommand } @Override - public @NotNull List tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException + public @NotNull List smartTabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException { if (!(sender instanceof Player player)) { diff --git a/src/main/java/dev/plex/command/sub/OwnerSubCommand.java b/src/main/java/dev/plex/command/sub/OwnerSubCommand.java index 598bd70..c9ee507 100644 --- a/src/main/java/dev/plex/command/sub/OwnerSubCommand.java +++ b/src/main/java/dev/plex/command/sub/OwnerSubCommand.java @@ -8,6 +8,8 @@ import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.source.RequiredCommandSource; import dev.plex.guild.data.Member; import dev.plex.player.PlexPlayer; +import java.util.Collections; +import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -58,4 +60,10 @@ public class OwnerSubCommand extends PlexCommand }, () -> send(player, messageComponent("guildNotFound"))); return null; } + + @Override + public @NotNull List smartTabComplete(@NotNull CommandSender commandSender, @NotNull String s, @NotNull String[] strings) throws IllegalArgumentException + { + return Collections.emptyList(); + } } diff --git a/src/main/java/dev/plex/command/sub/PrefixSubCommand.java b/src/main/java/dev/plex/command/sub/PrefixSubCommand.java index e139878..d6e308e 100644 --- a/src/main/java/dev/plex/command/sub/PrefixSubCommand.java +++ b/src/main/java/dev/plex/command/sub/PrefixSubCommand.java @@ -6,6 +6,8 @@ import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.source.RequiredCommandSource; import dev.plex.util.minimessage.SafeMiniMessage; +import java.util.Collections; +import java.util.List; import net.kyori.adventure.text.Component; import org.apache.commons.lang3.StringUtils; import org.bukkit.command.CommandSender; @@ -48,4 +50,10 @@ public class PrefixSubCommand extends PlexCommand }, () -> send(player, messageComponent("guildNotFound"))); return null; } + + @Override + public @NotNull List smartTabComplete(@NotNull CommandSender commandSender, @NotNull String s, @NotNull String[] strings) throws IllegalArgumentException + { + return Collections.emptyList(); + } } diff --git a/src/main/java/dev/plex/command/sub/SetHomeSubCommand.java b/src/main/java/dev/plex/command/sub/SetHomeSubCommand.java index 0fff11b..83028c0 100644 --- a/src/main/java/dev/plex/command/sub/SetHomeSubCommand.java +++ b/src/main/java/dev/plex/command/sub/SetHomeSubCommand.java @@ -6,6 +6,8 @@ import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.source.RequiredCommandSource; import dev.plex.util.CustomLocation; +import java.util.Collections; +import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -48,4 +50,10 @@ public class SetHomeSubCommand extends PlexCommand }, () -> send(player, messageComponent("guildNotFound"))); return null; } + + @Override + public @NotNull List smartTabComplete(@NotNull CommandSender commandSender, @NotNull String s, @NotNull String[] strings) throws IllegalArgumentException + { + return Collections.emptyList(); + } } diff --git a/src/main/java/dev/plex/command/sub/SetWarpSubCommand.java b/src/main/java/dev/plex/command/sub/SetWarpSubCommand.java index 39b89ea..3550140 100644 --- a/src/main/java/dev/plex/command/sub/SetWarpSubCommand.java +++ b/src/main/java/dev/plex/command/sub/SetWarpSubCommand.java @@ -6,6 +6,9 @@ import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.source.RequiredCommandSource; import dev.plex.util.CustomLocation; +import java.util.Collections; +import java.util.List; +import java.util.Locale; import net.kyori.adventure.text.Component; import org.apache.commons.lang3.StringUtils; import org.bukkit.command.CommandSender; @@ -13,8 +16,6 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Locale; - @CommandParameters(name = "setwarp", aliases = "makewarp,createwarp", usage = "/guild ", description = "Creates a new warp at player's location with a specified name") @CommandPermissions(source = RequiredCommandSource.IN_GAME, permission = "plex.guilds.setwarp") public class SetWarpSubCommand extends PlexCommand @@ -60,4 +61,10 @@ public class SetWarpSubCommand extends PlexCommand }, () -> send(player, messageComponent("guildNotFound"))); return null; } + + @Override + public @NotNull List smartTabComplete(@NotNull CommandSender commandSender, @NotNull String s, @NotNull String[] strings) throws IllegalArgumentException + { + return Collections.emptyList(); + } } diff --git a/src/main/java/dev/plex/command/sub/WarpListSubCommand.java b/src/main/java/dev/plex/command/sub/WarpListSubCommand.java index ba54903..4c50f25 100644 --- a/src/main/java/dev/plex/command/sub/WarpListSubCommand.java +++ b/src/main/java/dev/plex/command/sub/WarpListSubCommand.java @@ -7,15 +7,15 @@ import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.source.RequiredCommandSource; import dev.plex.guild.Guild; +import java.util.Collections; +import java.util.List; +import java.util.Set; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.List; -import java.util.Set; - @CommandParameters(name = "warps", aliases = "listwarps", usage = "/guild ", description = "Displays a clickable list of warps") @CommandPermissions(source = RequiredCommandSource.IN_GAME, permission = "plex.guilds.warps") public class WarpListSubCommand extends PlexCommand @@ -53,4 +53,10 @@ public class WarpListSubCommand extends PlexCommand } return parent; } + + @Override + public @NotNull List smartTabComplete(@NotNull CommandSender commandSender, @NotNull String s, @NotNull String[] strings) throws IllegalArgumentException + { + return Collections.emptyList(); + } } diff --git a/src/main/java/dev/plex/command/sub/WarpSubCommand.java b/src/main/java/dev/plex/command/sub/WarpSubCommand.java index c206785..7be37f3 100644 --- a/src/main/java/dev/plex/command/sub/WarpSubCommand.java +++ b/src/main/java/dev/plex/command/sub/WarpSubCommand.java @@ -5,6 +5,8 @@ import dev.plex.command.PlexCommand; import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.source.RequiredCommandSource; +import java.util.Collections; +import java.util.List; import net.kyori.adventure.text.Component; import org.apache.commons.lang3.StringUtils; import org.bukkit.command.CommandSender; @@ -41,4 +43,10 @@ public class WarpSubCommand extends PlexCommand }, () -> send(player, messageComponent("guildNotFound"))); return null; } + + @Override + public @NotNull List smartTabComplete(@NotNull CommandSender commandSender, @NotNull String s, @NotNull String[] strings) throws IllegalArgumentException + { + return Collections.emptyList(); + } }