mirror of
https://github.com/alexcrea/CustomAnvil.git
synced 2026-08-28 08:25:56 +02:00
remove legacy command
This commit is contained in:
parent
2bf913293b
commit
26bba65a9d
8 changed files with 41 additions and 64 deletions
|
|
@ -142,7 +142,7 @@ open class CustomAnvil : JavaPlugin() {
|
||||||
|
|
||||||
// Add commands
|
// Add commands
|
||||||
try {
|
try {
|
||||||
prepareCommand()
|
CustomAnvilCommand(this)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
logger.log(Level.SEVERE, "error trying to register commands", e)
|
logger.log(Level.SEVERE, "error trying to register commands", e)
|
||||||
MetricsUtil.trackError(e)
|
MetricsUtil.trackError(e)
|
||||||
|
|
@ -326,14 +326,4 @@ open class CustomAnvil : JavaPlugin() {
|
||||||
return yamlConfig
|
return yamlConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
fun prepareCommand() {
|
|
||||||
var command = getCommand(commandReloadName)
|
|
||||||
command?.setExecutor(ReloadExecutor())
|
|
||||||
|
|
||||||
command = getCommand(commandConfigName)
|
|
||||||
command?.setExecutor(EditConfigExecutor())
|
|
||||||
|
|
||||||
CustomAnvilCommand(this)
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,50 +1,25 @@
|
||||||
package xyz.alexcrea.cuanvil.command
|
package xyz.alexcrea.cuanvil.command
|
||||||
|
|
||||||
import org.bukkit.ChatColor
|
|
||||||
import org.bukkit.command.Command
|
import org.bukkit.command.Command
|
||||||
import org.bukkit.command.CommandExecutor
|
|
||||||
import org.bukkit.command.CommandSender
|
import org.bukkit.command.CommandSender
|
||||||
|
|
||||||
abstract class CASubCommand : CommandExecutor {
|
interface CASubCommand {
|
||||||
|
|
||||||
private var alreadySaid = false;
|
fun executeCommand(
|
||||||
override fun onCommand(
|
|
||||||
sender: CommandSender,
|
|
||||||
cmd: Command,
|
|
||||||
cmdstr: String,
|
|
||||||
args: Array<out String>
|
|
||||||
): Boolean {
|
|
||||||
if (!alreadySaid) {
|
|
||||||
sender.sendMessage(
|
|
||||||
ChatColor.RED.toString() +
|
|
||||||
"Please not that this command will be replaced as a subcommand of `/customanvil` or `/ca`"
|
|
||||||
)
|
|
||||||
alreadySaid = true
|
|
||||||
}
|
|
||||||
|
|
||||||
return executeCommand(sender, cmd, cmdstr, args)
|
|
||||||
}
|
|
||||||
|
|
||||||
abstract fun executeCommand(
|
|
||||||
sender: CommandSender,
|
sender: CommandSender,
|
||||||
cmd: Command,
|
cmd: Command,
|
||||||
cmdstr: String,
|
cmdstr: String,
|
||||||
args: Array<out String>
|
args: Array<out String>
|
||||||
): Boolean
|
): Boolean
|
||||||
|
|
||||||
open fun allowed(sender: CommandSender): Boolean {
|
fun allowed(sender: CommandSender): Boolean
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
open fun tabCompleter(
|
fun tabCompleter(
|
||||||
sender: CommandSender,
|
sender: CommandSender,
|
||||||
args: Array<out String>,
|
args: Array<out String>,
|
||||||
list: MutableList<String>
|
list: MutableList<String>
|
||||||
) {
|
)
|
||||||
}
|
|
||||||
|
|
||||||
open fun description(): String {
|
fun description(): String
|
||||||
return "no description"
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -12,7 +12,7 @@ import org.bukkit.command.CommandSender
|
||||||
import org.bukkit.entity.Player
|
import org.bukkit.entity.Player
|
||||||
import xyz.alexcrea.cuanvil.command.DiagnosticExecutor.Companion.NO_DIAG_PERM
|
import xyz.alexcrea.cuanvil.command.DiagnosticExecutor.Companion.NO_DIAG_PERM
|
||||||
|
|
||||||
class DebugToggleExecutor : CASubCommand() {
|
class DebugToggleExecutor : CASubCommand {
|
||||||
|
|
||||||
override fun description(): String {
|
override fun description(): String {
|
||||||
return "Used to toggle debug logs and retrieve it"
|
return "Used to toggle debug logs and retrieve it"
|
||||||
|
|
|
||||||
|
|
@ -30,8 +30,7 @@ import xyz.alexcrea.cuanvil.util.MetricsUtil
|
||||||
import java.util.*
|
import java.util.*
|
||||||
import java.util.stream.Collectors
|
import java.util.stream.Collectors
|
||||||
|
|
||||||
|
class DiagnosticExecutor : CASubCommand {
|
||||||
class DiagnosticExecutor : CASubCommand() {
|
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
const val NO_DIAG_PERM = "You do not have permission to diagnostic this server"
|
const val NO_DIAG_PERM = "You do not have permission to diagnostic this server"
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil
|
||||||
import xyz.alexcrea.cuanvil.gui.config.MainConfigGui
|
import xyz.alexcrea.cuanvil.gui.config.MainConfigGui
|
||||||
import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions
|
import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions
|
||||||
|
|
||||||
class EditConfigExecutor : CASubCommand() {
|
class EditConfigExecutor : CASubCommand {
|
||||||
|
|
||||||
override fun executeCommand(
|
override fun executeCommand(
|
||||||
sender: CommandSender,
|
sender: CommandSender,
|
||||||
|
|
@ -40,6 +40,13 @@ class EditConfigExecutor : CASubCommand() {
|
||||||
return sender.hasPermission(CustomAnvil.editConfigPermission)
|
return sender.hasPermission(CustomAnvil.editConfigPermission)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun tabCompleter(
|
||||||
|
sender: CommandSender,
|
||||||
|
args: Array<out String>,
|
||||||
|
list: MutableList<String>
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
override fun description(): String {
|
override fun description(): String {
|
||||||
return "Gui to edit the plugin's config"
|
return "Gui to edit the plugin's config"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ import com.google.common.collect.ImmutableMap
|
||||||
import org.bukkit.command.Command
|
import org.bukkit.command.Command
|
||||||
import org.bukkit.command.CommandSender
|
import org.bukkit.command.CommandSender
|
||||||
|
|
||||||
class HelpExecutor : CASubCommand() {
|
class HelpExecutor : CASubCommand {
|
||||||
|
|
||||||
lateinit var commands: ImmutableMap<String, CASubCommand>
|
lateinit var commands: ImmutableMap<String, CASubCommand>
|
||||||
|
|
||||||
|
|
@ -27,6 +27,17 @@ class HelpExecutor : CASubCommand() {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun allowed(sender: CommandSender): Boolean {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun tabCompleter(
|
||||||
|
sender: CommandSender,
|
||||||
|
args: Array<out String>,
|
||||||
|
list: MutableList<String>
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
override fun description(): String {
|
override fun description(): String {
|
||||||
return "Help command"
|
return "Help command"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ import xyz.alexcrea.cuanvil.dependency.DependencyManager
|
||||||
import xyz.alexcrea.cuanvil.gui.config.global.*
|
import xyz.alexcrea.cuanvil.gui.config.global.*
|
||||||
import xyz.alexcrea.cuanvil.update.UpdateHandler
|
import xyz.alexcrea.cuanvil.update.UpdateHandler
|
||||||
|
|
||||||
class ReloadExecutor : CASubCommand() {
|
class ReloadExecutor : CASubCommand {
|
||||||
|
|
||||||
override fun executeCommand(
|
override fun executeCommand(
|
||||||
sender: CommandSender,
|
sender: CommandSender,
|
||||||
|
|
@ -40,6 +40,13 @@ class ReloadExecutor : CASubCommand() {
|
||||||
return sender.hasPermission(CustomAnvil.commandReloadPermission)
|
return sender.hasPermission(CustomAnvil.commandReloadPermission)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun tabCompleter(
|
||||||
|
sender: CommandSender,
|
||||||
|
args: Array<out String>,
|
||||||
|
list: MutableList<String>
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
override fun description(): String {
|
override fun description(): String {
|
||||||
return "Reload the configuration of this plugin"
|
return "Reload the configuration of this plugin"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,18 +14,6 @@ commands:
|
||||||
description: Generic command for custom anvil
|
description: Generic command for custom anvil
|
||||||
aliases:
|
aliases:
|
||||||
- ca
|
- ca
|
||||||
anvilconfigreload:
|
|
||||||
description: Reload every config of this plugin
|
|
||||||
permission: ca.command.reload
|
|
||||||
aliases:
|
|
||||||
#- acreload # anvil config reload
|
|
||||||
#- careload # custom anvil reload
|
|
||||||
- carl # custom anvil reload
|
|
||||||
customanvilconfig:
|
|
||||||
description: open a menu for administrator to edit plugin's config in game
|
|
||||||
permission: ca.config.edit
|
|
||||||
aliases:
|
|
||||||
- configanvil
|
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
ca.affected:
|
ca.affected:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue