fix/InvModule/SearchCmd

src/main/kotlin/org/xodium/vanillaplus/data/BookData.kt

@@ -2,21 +2,23 @@ package org.xodium.vanillaplus.data
 
 import net.kyori.adventure.inventory.Book
 import org.bukkit.permissions.PermissionDefault
+import org.xodium.vanillaplus.VanillaPlus.Companion.instance
 import org.xodium.vanillaplus.utils.ExtUtils.mm
+import org.xodium.vanillaplus.utils.FmtUtils.fireFmt
 
 /**
  * Represents the data structure for a book in the game.
  * @property cmd The command associated with the book.
  * @property permission The default permission level for this book's command (defaults to TRUE).
- * @property title The [title] of the book.
- * @property author The [author] of the book.
+ * @property title The [title] of the book. Defaults to the command name with the first letter capitalized and formatted.
+ * @property author The [author] of the book. Defaults to the name of the main plugin instance class.
  * @property pages The content of the book, represented as a list of [pages], where each page is a list of lines.
  */
 internal data class BookData(
     val cmd: String,
     val permission: PermissionDefault = PermissionDefault.TRUE,
-    private val title: String,
-    private val author: String,
+    private val title: String = cmd.replaceFirstChar { it.uppercase() }.fireFmt(),
+    private val author: String = instance::class.simpleName.toString(),
     private val pages: List<List<String>>,
 ) {
     /**

src/main/kotlin/org/xodium/vanillaplus/interfaces/DataInterface.kt

@@ -12,7 +12,7 @@ import com.fasterxml.jackson.databind.json.JsonMapper
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.kotlin.KotlinModule
 import org.xodium.vanillaplus.VanillaPlus.Companion.instance
-import org.xodium.vanillaplus.utils.ExtUtils.toSnakeCase
+import org.xodium.vanillaplus.utils.ExtUtils.snakeCase
 import java.io.IOException
 import java.nio.file.Path
 import kotlin.io.path.createDirectories
@@ -24,7 +24,7 @@ interface DataInterface<K, T : Any> {
     val dataClass: KClass<T>
     val cache: MutableMap<K, T>
     val fileName: String
-        get() = "${dataClass.simpleName?.toSnakeCase()}.json"
+        get() = "${dataClass.simpleName?.snakeCase}.json"
     val filePath: Path
         get() = instance.dataFolder.toPath().resolve(fileName)
     val jsonMapper: ObjectMapper

src/main/kotlin/org/xodium/vanillaplus/managers/ConfigManager.kt

@@ -19,7 +19,7 @@ internal object ConfigManager : DataInterface<String, ModuleInterface.Config> {
      */
     fun update(modules: List<ModuleInterface<ModuleInterface.Config>>) {
         modules.forEach { module ->
-            val key = module.key()
+            val key = module.key
             val fileConfig = readFileConfig(key, module)
             val mergedConfig = fileConfig?.let { jsonMapper.updateValue(module.config, it) } ?: module.config
             set(key, mergedConfig)

src/main/kotlin/org/xodium/vanillaplus/modules/BooksModule.kt

@@ -3,13 +3,11 @@ package org.xodium.vanillaplus.modules
 import io.papermc.paper.command.brigadier.Commands
 import org.bukkit.entity.Player
 import org.bukkit.permissions.Permission
-import org.bukkit.permissions.PermissionDefault
 import org.xodium.vanillaplus.VanillaPlus.Companion.instance
 import org.xodium.vanillaplus.data.BookData
 import org.xodium.vanillaplus.data.CommandData
 import org.xodium.vanillaplus.interfaces.ModuleInterface
 import org.xodium.vanillaplus.utils.ExtUtils.tryCatch
-import org.xodium.vanillaplus.utils.FmtUtils.fireFmt
 
 /** Represents a module handling book mechanics within the system. */
 internal class BooksModule : ModuleInterface<BooksModule.Config> {
@@ -49,9 +47,6 @@ internal class BooksModule : ModuleInterface<BooksModule.Config> {
             listOf(
                 BookData(
                     cmd = "rules",
-                    permission = PermissionDefault.TRUE,
-                    title = "Rules".fireFmt(),
-                    author = instance::class.simpleName.toString(),
                     pages =
                         listOf(
                             // Page 1: Player Rules (1-7)

src/main/kotlin/org/xodium/vanillaplus/modules/ChatModule.kt

@@ -5,6 +5,7 @@ import com.mojang.brigadier.arguments.StringArgumentType
 import io.papermc.paper.chat.ChatRenderer
 import io.papermc.paper.command.brigadier.Commands
 import io.papermc.paper.event.player.AsyncChatEvent
+import net.kyori.adventure.chat.SignedMessage
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.event.ClickEvent
 import net.kyori.adventure.text.event.HoverEvent
@@ -18,7 +19,9 @@ import org.bukkit.permissions.PermissionDefault
 import org.xodium.vanillaplus.VanillaPlus.Companion.instance
 import org.xodium.vanillaplus.data.CommandData
 import org.xodium.vanillaplus.interfaces.ModuleInterface
+import org.xodium.vanillaplus.utils.ExtUtils.clickOpenUrl
 import org.xodium.vanillaplus.utils.ExtUtils.clickRunCmd
+import org.xodium.vanillaplus.utils.ExtUtils.clickSuggestCmd
 import org.xodium.vanillaplus.utils.ExtUtils.face
 import org.xodium.vanillaplus.utils.ExtUtils.mm
 import org.xodium.vanillaplus.utils.ExtUtils.prefix
@@ -70,25 +73,6 @@ internal class ChatModule : ModuleInterface<ChatModule.Config> {
                 "This command allows you to whisper to players",
                 listOf("w", "msg", "tell", "tellraw"),
             ),
-            CommandData(
-                Commands
-                    .literal("guide")
-                    .requires { it.sender.hasPermission(perms()[1]) }
-                    .executes { ctx ->
-                        ctx.tryCatch {
-                            if (it.sender !is Player) instance.logger.warning("Command can only be executed by a Player!")
-                            val sender = it.sender as Player
-                            sender.sendMessage(
-                                instance.prefix +
-                                    "Click me to open url!".mangoFmt(true).mm().clickEvent(
-                                        ClickEvent.openUrl("https://illyria.fandom.com/"),
-                                    ),
-                            )
-                        }
-                    },
-                "This command redirects you to the wiki",
-                emptyList(),
-            ),
         )
     }
 
@@ -99,11 +83,6 @@ internal class ChatModule : ModuleInterface<ChatModule.Config> {
                 "Allows use of the whisper command",
                 PermissionDefault.TRUE,
             ),
-            Permission(
-                "${instance::class.simpleName}.guide".lowercase(),
-                "Allows use of the guide command",
-                PermissionDefault.TRUE,
-            ),
         )
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
@@ -122,9 +101,9 @@ internal class ChatModule : ModuleInterface<ChatModule.Config> {
                             .clickEvent(ClickEvent.suggestCommand("/w ${player.name} "))
                             .hoverEvent(HoverEvent.showText(config.i18n.clickToWhisper.mm())),
                     ),
-                    Placeholder.component("message", message.pt().mm()),
+                    Placeholder.component("message", message),
                 )
-            if (audience == player) base = base.appendSpace().append(createDeleteCross(event))
+            if (audience == player) base = base.appendSpace().append(createDeleteCross(event.signedMessage()))
             base
         }
     }
@@ -139,13 +118,7 @@ internal class ChatModule : ModuleInterface<ChatModule.Config> {
             Regex("<image>")
                 .replace(config.welcomeText.joinToString("\n")) { "<image${++imageIndex}>" }
                 .mm(
-                    Placeholder.component(
-                        "player",
-                        player
-                            .displayName()
-                            .clickEvent(ClickEvent.suggestCommand("/nickname ${player.name}"))
-                            .hoverEvent(HoverEvent.showText(config.i18n.clickMe.mm())),
-                    ),
+                    Placeholder.component("player", player.displayName()),
                     *player
                         .face()
                         .lines()
@@ -203,14 +176,14 @@ internal class ChatModule : ModuleInterface<ChatModule.Config> {
 
     /**
      * Creates to delete cross-component for message deletion.
-     * @param event The [AsyncChatEvent] containing the message to be deleted.
+     * @param signedMessage The signed message to be deleted.
      * @return A [Component] representing the delete cross with hover text and click action.
      */
-    private fun createDeleteCross(event: AsyncChatEvent): Component =
+    private fun createDeleteCross(signedMessage: SignedMessage): Component =
         config.deleteCross
             .mm()
             .hoverEvent(config.i18n.deleteMessage.mm())
-            .clickEvent(ClickEvent.callback { instance.server.deleteMessage(event.signedMessage()) })
+            .clickEvent(ClickEvent.callback { instance.server.deleteMessage(signedMessage) })
 
     data class Config(
         override var enabled: Boolean = true,
@@ -220,15 +193,26 @@ internal class ChatModule : ModuleInterface<ChatModule.Config> {
                 "]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[".mangoFmt(true),
                 "<image>${"⯈".mangoFmt(true)}",
                 "<image>${"⯈".mangoFmt(true)}",
-                "<image>${"⯈".mangoFmt(true)} ${"Welcome".fireFmt()} <player>",
-                "<image>${"⯈".mangoFmt(true)}",
-                "<image>${"⯈".mangoFmt(true)}",
-                "<image>${"⯈".mangoFmt(true)} ${"Check out".fireFmt()}<gray>: ${
-                    "/rules".clickRunCmd("Click Me!".fireFmt()).skylineFmt()
-                } <gray>🟅 ${
-                    "/guide".clickRunCmd("Click Me!".fireFmt()).skylineFmt()
+                "<image>${"⯈".mangoFmt(true)} ${"Welcome".fireFmt()} <player> ${
+                    "<white><sprite:item/name_tag></white>".clickSuggestCmd(
+                        "/nickname ",
+                        "Set your nickname!".mangoFmt(),
+                    )
                 }",
                 "<image>${"⯈".mangoFmt(true)}",
+                "<image>${"⯈".mangoFmt(true)} ${"Check out".fireFmt()}<gray>:",
+                "<image>${"⯈".mangoFmt(true)} ${
+                    "<white><sprite:item/writable_book></white>".clickRunCmd(
+                        "/rules",
+                        "View the server /rules".mangoFmt(),
+                    )
+                }",
+                "<image>${"⯈".mangoFmt(true)} ${
+                    "<white><sprite:item/light></white>".clickOpenUrl(
+                        "https://illyria.fandom.com",
+                        "Visit the wiki!".mangoFmt(),
+                    )
+                }",
                 "<image>${"⯈".mangoFmt(true)}",
                 "]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[=]|[".mangoFmt(true),
             ),
@@ -240,11 +224,11 @@ internal class ChatModule : ModuleInterface<ChatModule.Config> {
         var i18n: I18n = I18n(),
     ) : ModuleInterface.Config {
         data class I18n(
-            var clickMe: String = "Click Me!".fireFmt(),
-            var clickToWhisper: String = "Click to Whisper".fireFmt(),
+            var clickMe: String = "Click me!".mangoFmt(),
+            var clickToWhisper: String = "Click to Whisper".mangoFmt(),
             var playerIsNotOnline: String = "${instance.prefix} Player is not Online!".fireFmt(),
-            var deleteMessage: String = "Click to delete your message".fireFmt(),
-            var clickToClipboard: String = "Click to copy position to clipboard".fireFmt(),
+            var deleteMessage: String = "Click to delete your message".mangoFmt(),
+            var clickToClipboard: String = "Click to copy position to clipboard".mangoFmt(),
             var playerSetSpawn: String = "${"❗".fireFmt()} ${"›".mangoFmt(true)} <notification>",
         )
     }