Migrate UtilCommandsModule to EssentialCommandsModule

Author: Rothes

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/EsuPluginBukkit.kt

@@ -115,7 +115,6 @@ class EsuPluginBukkit(
         ModuleManager.addModule(NewsModule)
         ModuleManager.addModule(OptimizationsModule)
         ModuleManager.addModule(SpoofServerSettingsModule)
-        ModuleManager.addModule(UtilCommandsModule)
         ModuleManager.addModule(AutoReloadExtensionPluginsModule)
 
         // Register commands

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/EssentialCommandsModule.kt

@@ -1,13 +1,15 @@
 package io.github.rothes.esu.bukkit.module
 
-import io.github.rothes.esu.bukkit.module.essencialcommands.Heal
+import io.github.rothes.esu.bukkit.module.essencialcommands.*
 import io.github.rothes.esu.core.configuration.ConfigurationPart
 import io.github.rothes.esu.core.module.configuration.BaseModuleConfiguration
 
 object EssentialCommandsModule: BukkitModule<BaseModuleConfiguration, EssentialCommandsModule.ModuleLang>() {
 
     init {
-        registerFeature(Heal)
+        listOf(
+            ClientLocale, Heal, Ip, IpGroup, Ping, PlayerChunkTickets, TpChunk
+        ).forEach { cmd -> registerFeature(cmd) }
     }
 
     override fun onEnable() {}

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/UtilCommandsModule.kt

@@ -0,0 +1,29 @@
+package io.github.rothes.esu.bukkit.module.essencialcommands
+
+import io.github.rothes.esu.bukkit.util.ComponentBukkitUtils.user
+import io.github.rothes.esu.core.command.annotation.ShortPerm
+import io.github.rothes.esu.core.configuration.data.MessageData
+import io.github.rothes.esu.core.configuration.data.MessageData.Companion.message
+import io.github.rothes.esu.core.module.CommonFeature
+import io.github.rothes.esu.core.module.configuration.FeatureToggle
+import io.github.rothes.esu.core.user.User
+import io.github.rothes.esu.core.util.ComponentUtils.unparsed
+import org.incendo.cloud.annotations.Command
+
+object ClientLocale : CommonFeature<FeatureToggle.DefaultTrue, ClientLocale.Lang>() {
+
+    override fun onEnable() {
+        registerCommands(object {
+            @Command("clientLocale [player]")
+            @ShortPerm
+            fun clientLocale(sender: User, player: User = sender) {
+                sender.message(lang, { message }, user(player), unparsed("locale", player.clientLocale))
+            }
+        })
+    }
+
+    data class Lang(
+        val message: MessageData = "<pdc><player><pc>'s client locale is <sdc><locale>".message,
+    )
+
+}

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/essencialcommands/ClientLocale.kt

@@ -31,14 +31,14 @@ object Heal : CommonFeature<FeatureToggle.DefaultTrue, Heal.Lang>() {
                 player.heal(player.getAttribute(AttributeAdapter.MAX_HEALTH)!!.value)
                 sender.message(lang, { healedPlayer }, player(player))
                 if (!silent) {
-                    player.user.message(lang, { healed })
+                    player.user.message(lang, { healedSelf })
                 }
             }
         })
     }
 
     data class Lang(
-        val healed: MessageData = "<pc>You have been healed.".message,
+        val healedSelf: MessageData = "<pc>You have been healed.".message,
         val healedPlayer: MessageData = "<pc>Healed <pdc><player></pc>.".message,
     )
 }

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/essencialcommands/Heal.kt

@@ -0,0 +1,31 @@
+package io.github.rothes.esu.bukkit.module.essencialcommands
+
+import io.github.rothes.esu.bukkit.user.PlayerUser
+import io.github.rothes.esu.bukkit.util.ComponentBukkitUtils.player
+import io.github.rothes.esu.core.command.annotation.ShortPerm
+import io.github.rothes.esu.core.configuration.data.MessageData
+import io.github.rothes.esu.core.configuration.data.MessageData.Companion.message
+import io.github.rothes.esu.core.module.CommonFeature
+import io.github.rothes.esu.core.module.configuration.FeatureToggle
+import io.github.rothes.esu.core.user.User
+import io.github.rothes.esu.core.util.ComponentUtils.unparsed
+import org.bukkit.entity.Player
+import org.incendo.cloud.annotations.Command
+
+object Ip : CommonFeature<FeatureToggle.DefaultTrue, Ip.Lang>() {
+
+    override fun onEnable() {
+        registerCommands(object {
+            @Command("ip [player]")
+            @ShortPerm
+            fun ip(sender: User, player: Player = (sender as PlayerUser).player) {
+                sender.message(lang, { message }, player(player), unparsed("address", player.address!!.hostString))
+            }
+        })
+    }
+
+    data class Lang(
+        val message: MessageData = "<pdc><player><pc>'s ip is <sdc><address>".message,
+    )
+
+}