feat: allow console to execute more admin commands

Author: darbyjack

build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
     id("net.kyori.indra.license-header") version "3.1.3"
     id("com.github.johnrengelman.shadow") version "8.1.1"
     id("io.github.slimjar") version "1.3.0"
-    id("xyz.jpenilla.run-paper") version "2.2.0"
+    id("xyz.jpenilla.run-paper") version "2.2.2"
     id("com.github.ben-manes.versions") version "0.48.0"
     id("org.jetbrains.dokka") version "1.9.10"
 }
@@ -58,7 +58,7 @@ dependencies {
     implementation("org.codemc.worldguardwrapper:worldguardwrapper:1.1.9-SNAPSHOT")
     implementation("ch.jalu:configme:1.3.0")
     implementation("com.dumptruckman.minecraft:JsonConfiguration:1.1")
-    implementation("com.github.cryptomorin:XSeries:9.8.1")
+    implementation("com.github.cryptomorin:XSeries:9.9.0")
     implementation("net.kyori:adventure-platform-bukkit:4.3.2")
     implementation("dev.triumphteam:triumph-gui:3.1.5")
     implementation("com.zaxxer:HikariCP:4.0.3")

src/main/kotlin/me/glaremasters/guilds/commands/admin/arena/CommandAdminArena.kt

@@ -25,6 +25,7 @@ package me.glaremasters.guilds.commands.admin.arena
 
 import co.aikar.commands.ACFBukkitUtil
 import co.aikar.commands.BaseCommand
+import co.aikar.commands.CommandIssuer
 import co.aikar.commands.annotation.CommandAlias
 import co.aikar.commands.annotation.CommandCompletion
 import co.aikar.commands.annotation.CommandPermission
@@ -64,7 +65,7 @@ internal class CommandAdminArena : BaseCommand() {
     @CommandPermission(Constants.ADMIN_PERM)
     @Description("{@@descriptions.arena-create}")
     @Syntax("%name")
-    fun create(player: Player, name: String) {
+    fun create(issuer: CommandIssuer, name: String) {
         val arena = Arena(UUID.randomUUID(), name, null, null, false)
         arenaHandler.addArena(arena)
         currentCommandIssuer.sendInfo(Messages.ARENA__CREATED, "{arena}", name)
@@ -85,7 +86,7 @@ internal class CommandAdminArena : BaseCommand() {
     @Description("{@@descriptions.arena-delete}")
     @CommandCompletion("@arenas")
     @Syntax("%name")
-    fun delete(player: Player, @Values("@arenas") arena: Arena) {
+    fun delete(issuer: CommandIssuer, @Values("@arenas") arena: Arena) {
         val name = arena.name
         arenaHandler.removeArena(arena)
         currentCommandIssuer.sendInfo(Messages.ARENA__DELETED, "{arena}", name)
@@ -94,7 +95,7 @@ internal class CommandAdminArena : BaseCommand() {
     @Subcommand("arena list")
     @CommandPermission(Constants.ADMIN_PERM)
     @Description("{@@descriptions.arena-list}")
-    fun list(player: Player) {
+    fun list(issuer: CommandIssuer) {
         val arenas = arenaHandler.getArenas()
 
         if (arenas.isEmpty()) {

src/main/kotlin/me/glaremasters/guilds/commands/admin/homes/CommandAdminHome.kt

@@ -25,6 +25,7 @@ package me.glaremasters.guilds.commands.admin.homes
 
 import ch.jalu.configme.SettingsManager
 import co.aikar.commands.BaseCommand
+import co.aikar.commands.CommandIssuer
 import co.aikar.commands.annotation.CommandAlias
 import co.aikar.commands.annotation.CommandCompletion
 import co.aikar.commands.annotation.CommandPermission
@@ -53,7 +54,7 @@ internal class CommandAdminHome : BaseCommand() {
     @CommandPermission(Constants.ADMIN_PERM)
     @CommandCompletion("@guilds")
     @Syntax("%guild")
-    fun delete(player: Player, @Flags("other") @Values("@guilds") guild: Guild) {
+    fun delete(issuer: CommandIssuer, @Flags("other") @Values("@guilds") guild: Guild) {
         guild.delHome()
         currentCommandIssuer.sendInfo(Messages.ADMIN__DELHOME, "{guild}", guild.name)
     }

src/main/kotlin/me/glaremasters/guilds/commands/admin/manage/CommandAdminPrefix.kt

@@ -24,6 +24,7 @@
 package me.glaremasters.guilds.commands.admin.manage
 
 import co.aikar.commands.BaseCommand
+import co.aikar.commands.CommandIssuer
 import co.aikar.commands.annotation.CommandAlias
 import co.aikar.commands.annotation.CommandCompletion
 import co.aikar.commands.annotation.CommandPermission
@@ -51,7 +52,7 @@ internal class CommandAdminPrefix : BaseCommand() {
     @CommandPermission(Constants.ADMIN_PERM)
     @CommandCompletion("@guilds")
     @Syntax("%guild %prefix")
-    fun prefix(player: Player, @Flags("other") @Values("@guilds") guild: Guild, prefix: String) {
+    fun prefix(issuer: CommandIssuer, @Flags("other") @Values("@guilds") guild: Guild, prefix: String) {
         guild.prefix = StringUtils.color(prefix)
         currentCommandIssuer.sendInfo(Messages.PREFIX__SUCCESSFUL, "{prefix}", guild.prefix)
     }

src/main/kotlin/me/glaremasters/guilds/commands/admin/manage/CommandAdminRename.kt

@@ -24,6 +24,7 @@
 package me.glaremasters.guilds.commands.admin.manage
 
 import co.aikar.commands.BaseCommand
+import co.aikar.commands.CommandIssuer
 import co.aikar.commands.annotation.CommandAlias
 import co.aikar.commands.annotation.CommandCompletion
 import co.aikar.commands.annotation.CommandPermission
@@ -52,7 +53,7 @@ internal class CommandAdminRename : BaseCommand() {
     @CommandPermission(Constants.ADMIN_PERM)
     @CommandCompletion("@guilds")
     @Syntax("%guild %new-name")
-    fun rename(player: Player, @Flags("other") @Values("@guilds") guild: Guild, @Single name: String) {
+    fun rename(issuer: CommandIssuer, @Flags("other") @Values("@guilds") guild: Guild, @Single name: String) {
         guild.name = StringUtils.color(name)
         currentCommandIssuer.sendInfo(Messages.RENAME__SUCCESSFUL, "{name}", guild.name)
     }

src/main/kotlin/me/glaremasters/guilds/commands/admin/manage/CommandAdminStatus.kt

@@ -24,6 +24,7 @@
 package me.glaremasters.guilds.commands.admin.manage
 
 import co.aikar.commands.BaseCommand
+import co.aikar.commands.CommandIssuer
 import co.aikar.commands.annotation.CommandAlias
 import co.aikar.commands.annotation.CommandCompletion
 import co.aikar.commands.annotation.CommandPermission
@@ -50,7 +51,7 @@ internal class CommandAdminStatus : BaseCommand() {
     @CommandPermission(Constants.ADMIN_PERM)
     @CommandCompletion("@guilds")
     @Syntax("%guild")
-    fun status(player: Player, @Flags("other") @Values("@guilds") guild: Guild) {
+    fun status(issuer: CommandIssuer, @Flags("other") @Values("@guilds") guild: Guild) {
         guild.toggleStatus()
         currentCommandIssuer.sendInfo(Messages.STATUS__SUCCESSFUL, "{status}", guild.status.name)
     }

src/main/kotlin/me/glaremasters/guilds/commands/admin/manage/CommandAdminTransfer.kt

@@ -25,6 +25,7 @@ package me.glaremasters.guilds.commands.admin.manage
 
 import ch.jalu.configme.SettingsManager
 import co.aikar.commands.BaseCommand
+import co.aikar.commands.CommandIssuer
 import co.aikar.commands.annotation.CommandAlias
 import co.aikar.commands.annotation.CommandCompletion
 import co.aikar.commands.annotation.CommandPermission
@@ -57,7 +58,7 @@ internal class CommandAdminTransfer : BaseCommand() {
     @Description("{@@descriptions.admin-transfer}")
     @CommandCompletion("@guilds @members-admin")
     @Syntax("%guild %new-master")
-    fun transfer(player: Player, @Flags("other") @Values("@guilds") guild: Guild, @Values("@members-admin") @Single master: String) {
+    fun transfer(issuer: CommandIssuer, @Flags("other") @Values("@guilds") guild: Guild, @Values("@members-admin") @Single master: String) {
         val transfer = Bukkit.getOfflinePlayer(master)
 
         if (guild.guildMaster.uuid == transfer.uniqueId) {