From 06a04e4375473ea93b403d14dcff3f4c619f2395 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 17 Jan 2023 12:19:59 +0000 Subject: [PATCH] Fixed spelling inconsistency --- eco-api/src/main/java/com/willfp/eco/core/Eco.java | 2 +- .../com/willfp/eco/core/command/CommandBase.java | 14 +++++++------- .../willfp/eco/core/command/impl/Subcommand.java | 2 +- .../com/willfp/eco/core/commands/CommandHelpers.kt | 12 ++++++------ .../eco/internal/command/EcoPluginCommand.kt | 6 +++--- .../{EcoHandledCommand.kt => HandledCommand.kt} | 10 +++++----- .../com/willfp/eco/internal/spigot/EcoImpl.kt | 6 +++--- 7 files changed, 26 insertions(+), 26 deletions(-) rename eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/{EcoHandledCommand.kt => HandledCommand.kt} (95%) diff --git a/eco-api/src/main/java/com/willfp/eco/core/Eco.java b/eco-api/src/main/java/com/willfp/eco/core/Eco.java index d6a58d2d..464de76f 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/Eco.java +++ b/eco-api/src/main/java/com/willfp/eco/core/Eco.java @@ -187,7 +187,7 @@ public interface Eco { * @return The CommandBase implementation */ @NotNull - CommandBase createSubCommand(@NotNull CommandBase parentDelegate, + CommandBase createSubcommand(@NotNull CommandBase parentDelegate, @NotNull EcoPlugin plugin, @NotNull String name, @NotNull String permission, diff --git a/eco-api/src/main/java/com/willfp/eco/core/command/CommandBase.java b/eco-api/src/main/java/com/willfp/eco/core/command/CommandBase.java index 7d724152..12dd8604 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/command/CommandBase.java +++ b/eco-api/src/main/java/com/willfp/eco/core/command/CommandBase.java @@ -111,7 +111,7 @@ public interface CommandBase { /** * Throws an exception containing a langYml key. - *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and SubCommand + *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and Subcommand * automatically handles sending the message to the sender.

*
* Works with any CommandBase implementation: @@ -130,7 +130,7 @@ public interface CommandBase { /** * Throws an exception containing a langYml key if obj is null. - *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and SubCommand + *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and Subcommand * automatically handles sending the message to the sender.

*
* Works with any CommandBase implementation: @@ -155,7 +155,7 @@ public interface CommandBase { /** * Throws an exception containing a langYml key if predicate tests false - *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and SubCommand + *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and Subcommand * automatically handles sending the message to the sender.

*
* Works with any CommandBase implementation: @@ -179,7 +179,7 @@ public interface CommandBase { /** * Throws an exception containing a langYml key if condition is false. - *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and SubCommand + *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and Subcommand * automatically handles sending the message to the sender.

*
* Works with any CommandBase implementation: @@ -203,7 +203,7 @@ public interface CommandBase { /** * Throws an exception containing a langYml key if Bukkit.getPlayer(playerName) is null. - *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and SubCommand + *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and Subcommand * automatically handles sending the message to the sender.

*
* Works with any CommandBase implementation: @@ -227,7 +227,7 @@ public interface CommandBase { /** * Throws an exception containing a langYml key if Bukkit.getPlayer(playerName) is null. - *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and SubCommand + *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and Subcommand * automatically handles sending the message to the sender.

*
* Works with any CommandBase implementation: @@ -253,7 +253,7 @@ public interface CommandBase { /** * Throws an exception containing a langYml key if player doesn't have permission. - *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and SubCommand + *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and Subcommand * automatically handles sending the message to the sender.

*
* Works with any CommandBase implementation: diff --git a/eco-api/src/main/java/com/willfp/eco/core/command/impl/Subcommand.java b/eco-api/src/main/java/com/willfp/eco/core/command/impl/Subcommand.java index 9788e146..2f07f384 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/command/impl/Subcommand.java +++ b/eco-api/src/main/java/com/willfp/eco/core/command/impl/Subcommand.java @@ -28,7 +28,7 @@ public abstract class Subcommand implements CommandBase { @NotNull final String name, @NotNull final String permission, final boolean playersOnly) { - this.delegate = Eco.get().createSubCommand(this, plugin, name, permission, playersOnly); + this.delegate = Eco.get().createSubcommand(this, plugin, name, permission, playersOnly); } /** diff --git a/eco-api/src/main/kotlin/com/willfp/eco/core/commands/CommandHelpers.kt b/eco-api/src/main/kotlin/com/willfp/eco/core/commands/CommandHelpers.kt index 71ec8224..21710217 100644 --- a/eco-api/src/main/kotlin/com/willfp/eco/core/commands/CommandHelpers.kt +++ b/eco-api/src/main/kotlin/com/willfp/eco/core/commands/CommandHelpers.kt @@ -148,7 +148,7 @@ fun CommandBase.addSubcommand( /** * Throws an exception containing a langYml key if obj is null. - *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and SubCommand + *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and Subcommand * automatically handles sending the message to the sender.

*
* @param key key of notification message in langYml @@ -161,7 +161,7 @@ fun T?.notifyNull(key: String): T { /** * Throws an exception containing a langYml key if predicate tests false - *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and SubCommand + *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and Subcommand * automatically handles sending the message to the sender.

*
* @param predicate predicate to test @@ -176,7 +176,7 @@ fun T.notifyFalse(predicate: Predicate, key: String): T { /** * Throws an exception containing a langYml key if condition is false. - *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and SubCommand + *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and Subcommand * automatically handles sending the message to the sender.

*
* @param key value in the langYml @@ -189,7 +189,7 @@ fun Boolean.notifyFalse(key: String): Boolean { /** * Throws an exception containing a langYml key if Bukkit.getPlayer(playerName) is null. - *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and SubCommand + *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and Subcommand * automatically handles sending the message to the sender.

*
* @param key value in the langYml @@ -202,7 +202,7 @@ fun String?.notifyPlayerRequired(key: String): Player { /** * Throws an exception containing a langYml key if Bukkit.getPlayer(playerName) is null. - *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and SubCommand + *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and Subcommand * automatically handles sending the message to the sender.

*
* @param key value in the langYml @@ -222,7 +222,7 @@ fun String?.notifyOfflinePlayerRequired(key: String): OfflinePlayer { /** * Throws an exception containing a langYml key if player doesn't have permission. - *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and SubCommand + *

The {@link CommandBase#onExecute(CommandSender, List) onExecute } in PluginCommand and Subcommand * automatically handles sending the message to the sender.

*
* @param permission the permission diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/EcoPluginCommand.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/EcoPluginCommand.kt index b42cc8ef..f6b8fade 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/EcoPluginCommand.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/EcoPluginCommand.kt @@ -12,7 +12,7 @@ class EcoPluginCommand( name: String, permission: String, playersOnly: Boolean -) : EcoHandledCommand(parentDelegate, plugin, name, permission, playersOnly), +) : HandledCommand(parentDelegate, plugin, name, permission, playersOnly), PluginCommandBase { override fun register() { val command = Bukkit.getPluginCommand(name) @@ -46,10 +46,10 @@ class EcoPluginCommand( } } -class EcoSubCommand( +class EcoSubcommand( parentDelegate: CommandBase, plugin: EcoPlugin, name: String, permission: String, playersOnly: Boolean -) : EcoHandledCommand(parentDelegate, plugin, name, permission, playersOnly) +) : HandledCommand(parentDelegate, plugin, name, permission, playersOnly) diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/EcoHandledCommand.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/HandledCommand.kt similarity index 95% rename from eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/EcoHandledCommand.kt rename to eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/HandledCommand.kt index 9d5399a0..465f574b 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/EcoHandledCommand.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/HandledCommand.kt @@ -18,7 +18,7 @@ import org.bukkit.util.StringUtil * Handled commands have a method to pass in raw input from bukkit commands * in order to execute the command-specific code. */ -abstract class EcoHandledCommand( +abstract class HandledCommand( private val parentDelegate: CommandBase, private val plugin: EcoPlugin, private val name: String, @@ -92,13 +92,13 @@ abstract class EcoHandledCommand( } if (args.isNotEmpty()) { - for (subCommand in subcommands) { - if (subCommand.name.equals(args[0], true)) { - if (!canExecute(sender, subCommand, plugin)) { + for (subcommand in subcommands) { + if (subcommand.name.equals(args[0], true)) { + if (!canExecute(sender, subcommand, plugin)) { return } - subCommand.handleExecution(sender, args.subList(1, args.size)) + subcommand.handleExecution(sender, args.subList(1, args.size)) return } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt index 2e72bbc0..122e8b0b 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt @@ -16,7 +16,7 @@ import com.willfp.eco.core.items.Items import com.willfp.eco.core.math.MathContext import com.willfp.eco.internal.EcoPropsParser import com.willfp.eco.internal.command.EcoPluginCommand -import com.willfp.eco.internal.command.EcoSubCommand +import com.willfp.eco.internal.command.EcoSubcommand import com.willfp.eco.internal.config.* import com.willfp.eco.internal.drops.EcoDropQueue import com.willfp.eco.internal.drops.EcoFastCollatedDropQueue @@ -181,13 +181,13 @@ class EcoImpl : EcoSpigotPlugin(), Eco { playersOnly ) - override fun createSubCommand( + override fun createSubcommand( parentDelegate: CommandBase, plugin: EcoPlugin, name: String, permission: String, playersOnly: Boolean - ) = EcoSubCommand( + ) = EcoSubcommand( parentDelegate, plugin, name,