From 3fa2d6b17c8fca049c7eb3b07909b85212e82e0c Mon Sep 17 00:00:00 2001 From: tobias Date: Sat, 18 May 2024 21:13:22 +0200 Subject: [PATCH] Fixed message spam --- .../improvedfactions/commands/admin/ByPassCommand.kt | 2 +- .../improvedfactions/commands/claim/ClaimCommand.kt | 2 +- .../improvedfactions/commands/claim/UnclaimCommand.kt | 2 +- .../improvedfactions/commands/invite/InviteAcceptCommand.kt | 3 ++- .../improvedfactions/commands/invite/InviteCommand.kt | 2 +- .../commands/invite/InviteDiscardCommand.kt | 2 +- .../improvedfactions/commands/manage/CreateCommand.kt | 6 +++--- .../improvedfactions/commands/manage/IconCommand.kt | 2 +- .../improvedfactions/commands/manage/RenameCommand.kt | 4 ++-- .../improvedfactions/commands/member/JoinCommand.kt | 4 ++-- .../improvedfactions/commands/member/LeaveCommand.kt | 2 +- .../improvedfactions/commands/member/MembersCommand.kt | 4 ++-- .../modules/home/commands/HomeSetCommand.kt | 2 +- .../modules/home/commands/TeleportHomeCommand.kt | 2 +- .../modules/wilderness/commands/WildernessCommand.kt | 2 +- .../improvedfactions/utils/options/OptionPresets.kt | 6 +++--- 16 files changed, 24 insertions(+), 23 deletions(-) diff --git a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/admin/ByPassCommand.kt b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/admin/ByPassCommand.kt index 323a6905..adf46e9e 100644 --- a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/admin/ByPassCommand.kt +++ b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/admin/ByPassCommand.kt @@ -18,7 +18,7 @@ import org.bukkit.entity.Player ) class ByPassCommand(private val plugin: ImprovedFactionsPlugin) : PlayerSubCommand("bypass") { override fun options(): Options = Options.getFromConfig(plugin, label) { options, _ -> - options.opt(PlayerNameOption(0)) + options.cmdOpt(PlayerNameOption(0)) } override fun arguments(): Array> = arrayOf( diff --git a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/claim/ClaimCommand.kt b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/claim/ClaimCommand.kt index d02bd886..1775c204 100644 --- a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/claim/ClaimCommand.kt +++ b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/claim/ClaimCommand.kt @@ -23,7 +23,7 @@ import org.bukkit.entity.Player ) class ClaimCommand(private val plugin: ImprovedFactionsPlugin) : PlayerSubCommand("claim") { override fun options(): Options = Options.getFromConfig(plugin, "claim") { options, _ -> - options.opt(InFactionOption(true)) + options.cmdOpt(InFactionOption(true)) .cmdOpt(FactionPermissionOption(Permissions.MANAGE_CLAIMS)) } diff --git a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/claim/UnclaimCommand.kt b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/claim/UnclaimCommand.kt index 6d86c749..f4ae9222 100644 --- a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/claim/UnclaimCommand.kt +++ b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/claim/UnclaimCommand.kt @@ -23,7 +23,7 @@ import org.bukkit.entity.Player ) class UnclaimCommand(private val plugin: ImprovedFactionsPlugin) : PlayerSubCommand("unclaim") { override fun options(): Options = Options.getFromConfig(plugin, "unclaim") { options, _ -> - options.opt(InFactionOption(true)) + options.cmdOpt(InFactionOption(true)) .cmdOpt(FactionPermissionOption(Permissions.MANAGE_CLAIMS)) } diff --git a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/invite/InviteAcceptCommand.kt b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/invite/InviteAcceptCommand.kt index 9abdae93..4e21c9da 100644 --- a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/invite/InviteAcceptCommand.kt +++ b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/invite/InviteAcceptCommand.kt @@ -22,7 +22,8 @@ import org.bukkit.entity.Player ) class InviteAcceptCommand(private val plugin: ImprovedFactionsPlugin) : PlayerSubCommand("inviteaccept") { override fun options(): Options = Options.getFromConfig(plugin, "inviteaccept") { options, _ -> - options.opt(InFactionOption(false)).opt(ArgLengthOption(1)) + options.cmdOpt(InFactionOption(false)) + .cmdOpt(ArgLengthOption(1)) } override fun arguments(): Array> = arrayOf( diff --git a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/invite/InviteCommand.kt b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/invite/InviteCommand.kt index bbb07bef..529efd28 100644 --- a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/invite/InviteCommand.kt +++ b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/invite/InviteCommand.kt @@ -25,7 +25,7 @@ import org.bukkit.entity.Player class InviteCommand(private val plugin: ImprovedFactionsPlugin) : PlayerSubCommand("invite") { override fun options(): Options = Options.getFromConfig(plugin, "invite") { options, _ -> options.cmdOpt(InFactionOption(true)) - .opt(PlayerNameOption(0)) + .cmdOpt(PlayerNameOption(0)) .cmdOpt(RankNameOption(1)) .cmdOpt(CanManageRankOption(1)) .cmdOpt(ArgLengthOption(2)) diff --git a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/invite/InviteDiscardCommand.kt b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/invite/InviteDiscardCommand.kt index 8f8d375d..e7df08ce 100644 --- a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/invite/InviteDiscardCommand.kt +++ b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/invite/InviteDiscardCommand.kt @@ -20,7 +20,7 @@ import org.bukkit.entity.Player ) class InviteDiscardCommand(private val plugin: ImprovedFactionsPlugin) : PlayerSubCommand("invitediscard") { override fun options(): Options = Options.getFromConfig(plugin, "invitediscard") { options, _ -> - options.opt(ArgLengthOption(1)) + options.cmdOpt(ArgLengthOption(1)) } override fun arguments(): Array> = arrayOf( diff --git a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/manage/CreateCommand.kt b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/manage/CreateCommand.kt index c0ba11cb..a9ac6393 100644 --- a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/manage/CreateCommand.kt +++ b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/manage/CreateCommand.kt @@ -29,10 +29,10 @@ import org.bukkit.entity.Player class CreateCommand(private val plugin: ImprovedFactionsPlugin) : PlayerSubCommand("create") { override fun options(): Options = Options.getFromConfig(plugin, "create") { options, _ -> options - .opt(InFactionOption(false)) + .cmdOpt(InFactionOption(false)) .addFactionNameOption(0) - .opt(ArgLengthOption(1)) - .opt(FactionExistOption(0, false)) + .cmdOpt(ArgLengthOption(1)) + .cmdOpt(FactionExistOption(0, false)) } override fun arguments(): Array> = arrayOf( diff --git a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/manage/IconCommand.kt b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/manage/IconCommand.kt index 4424ed60..4812a159 100644 --- a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/manage/IconCommand.kt +++ b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/manage/IconCommand.kt @@ -23,7 +23,7 @@ import org.bukkit.entity.Player ) class IconCommand(private val plugin: ImprovedFactionsPlugin) : PlayerSubCommand("icon") { override fun options(): Options = Options.getFromConfig(plugin, "icon") { options, _ -> - options.opt(InFactionOption(true)).opt(IsFactionOwnerOption()) + options.cmdOpt(InFactionOption(true)).cmdOpt(IsFactionOwnerOption()) .cmdOpt(FactionPermissionOption(Permissions.SET_ICON)) } diff --git a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/manage/RenameCommand.kt b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/manage/RenameCommand.kt index 0ab7436b..bda4a5f2 100644 --- a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/manage/RenameCommand.kt +++ b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/manage/RenameCommand.kt @@ -23,8 +23,8 @@ import org.bukkit.entity.Player ) class RenameCommand(private val plugin: ImprovedFactionsPlugin) : PlayerSubCommand("rename") { override fun options(): Options = Options.getFromConfig(plugin, "rename") { options, _ -> - options.opt(InFactionOption(true)).opt(IsFactionOwnerOption()).addFactionNameOption(0).opt(ArgLengthOption(1)) - .opt(FactionExistOption(0, false)) + options.cmdOpt(InFactionOption(true)).cmdOpt(IsFactionOwnerOption()).addFactionNameOption(0).cmdOpt(ArgLengthOption(1)) + .cmdOpt(FactionExistOption(0, false)) .cmdOpt(FactionPermissionOption(Permissions.RENAME_FACTION)) } diff --git a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/member/JoinCommand.kt b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/member/JoinCommand.kt index 77ce5a22..593ededd 100644 --- a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/member/JoinCommand.kt +++ b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/member/JoinCommand.kt @@ -27,9 +27,9 @@ import org.bukkit.entity.Player ) class JoinCommand(private val plugin: ImprovedFactionsPlugin) : PlayerSubCommand("join") { override fun options(): Options = Options.getFromConfig(plugin, "join") { options, _ -> - options.opt(InFactionOption(false)) + options.cmdOpt(InFactionOption(false)) .addFactionNameOption(0) - .opt(ArgLengthOption(1)) + .cmdOpt(ArgLengthOption(1)) .cmdOpt(FactionExistOption(0, true)) } diff --git a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/member/LeaveCommand.kt b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/member/LeaveCommand.kt index 82ddf9e5..03e6f5c1 100644 --- a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/member/LeaveCommand.kt +++ b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/member/LeaveCommand.kt @@ -20,7 +20,7 @@ import org.bukkit.entity.Player ) class LeaveCommand(private val plugin: ImprovedFactionsPlugin) : PlayerSubCommand("leave") { override fun options(): Options = Options.getFromConfig(plugin, "leave") { options, _ -> - options.cmdOpt(ConfirmOption()).opt(InFactionOption(true)) + options.cmdOpt(ConfirmOption()).cmdOpt(InFactionOption(true)) } override fun arguments(): Array> = emptyArray() diff --git a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/member/MembersCommand.kt b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/member/MembersCommand.kt index 6613ad1c..a8137b8e 100644 --- a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/member/MembersCommand.kt +++ b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/commands/member/MembersCommand.kt @@ -24,8 +24,8 @@ class MembersCommand(private val plugin: ImprovedFactionsPlugin) : PlayerSubComm private val dateFormat = SimpleDateFormat("dd/MM/yyyy") override fun options(): Options = Options.getFromConfig(plugin, label) { options, _ -> - options.opt(InFactionOption(true)) - .opt(ArgLengthOption(0)) + options.cmdOpt(InFactionOption(true)) + .cmdOpt(ArgLengthOption(0)) } override fun arguments(): Array> = emptyArray() diff --git a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/modules/home/commands/HomeSetCommand.kt b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/modules/home/commands/HomeSetCommand.kt index d7c8ca51..d8c6fe42 100644 --- a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/modules/home/commands/HomeSetCommand.kt +++ b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/modules/home/commands/HomeSetCommand.kt @@ -23,7 +23,7 @@ import org.bukkit.entity.Player ) class HomeSetCommand(private val plugin: ImprovedFactionsPlugin) : PlayerSubCommand("sethome") { override fun options(): Options = Options.getFromConfig(plugin, label) { options, _ -> - options.opt(InFactionOption(true)) + options.cmdOpt(InFactionOption(true)) .cmdOpt(FactionPermissionOption(Permissions.SET_HOME)) } diff --git a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/modules/home/commands/TeleportHomeCommand.kt b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/modules/home/commands/TeleportHomeCommand.kt index 4813f4c9..fed8e48a 100644 --- a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/modules/home/commands/TeleportHomeCommand.kt +++ b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/modules/home/commands/TeleportHomeCommand.kt @@ -21,7 +21,7 @@ import org.bukkit.entity.Player ) class TeleportHomeCommand(private val plugin: ImprovedFactionsPlugin) : PlayerSubCommand("home") { override fun options(): Options = Options.getFromConfig(plugin, label) { options, _ -> - options.opt(InFactionOption(true)) + options.cmdOpt(InFactionOption(true)) .cmdOpt(FactionPermissionOption(Permissions.SET_HOME)) } diff --git a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/modules/wilderness/commands/WildernessCommand.kt b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/modules/wilderness/commands/WildernessCommand.kt index 9a5aebb1..557ae4ae 100644 --- a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/modules/wilderness/commands/WildernessCommand.kt +++ b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/modules/wilderness/commands/WildernessCommand.kt @@ -35,7 +35,7 @@ class WildernessCommand( override fun options() = Options.getFromConfig(plugin, label) { options, _ -> options.cmdOpt(CooldownOption(plugin, cooldownManager)) .tabOpt(CooldownTabOption(cooldownManager, false)) - .opt(UsageLimitOption(config.usageLimit, "wilderness")) + .cmdOpt(UsageLimitOption(config.usageLimit, "wilderness")) } override fun arguments() = arrayOf>() diff --git a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/utils/options/OptionPresets.kt b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/utils/options/OptionPresets.kt index 8e8963a0..9d21ab98 100644 --- a/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/utils/options/OptionPresets.kt +++ b/improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/utils/options/OptionPresets.kt @@ -5,8 +5,8 @@ import io.github.toberocat.toberocore.command.options.MaxArgLengthOption import io.github.toberocat.toberocore.command.options.Options fun Options.addFactionNameOption(index: Int): Options { - opt(JoinedTextOption(index, Factions.maxSpacesInName)) - opt(MaxArgLengthOption(index, Factions.maxNameLength)) - opt(ArgRegexMatcherOption(index, Factions.nameRegex)) + cmdOpt(JoinedTextOption(index, Factions.maxSpacesInName)) + cmdOpt(MaxArgLengthOption(index, Factions.maxNameLength)) + cmdOpt(ArgRegexMatcherOption(index, Factions.nameRegex)) return this } \ No newline at end of file