Master

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "2.1.20-RC"
+    kotlin("jvm") version "2.1.20-Beta2"
     id("com.gradleup.shadow") version "9.0.0-beta8"
 }
 

src/main/kotlin/pl/syntaxdevteam/tagsx/TagsX.kt

@@ -1,22 +1,32 @@
 package pl.syntaxdevteam.tagsx
 
+import net.kyori.adventure.text.minimessage.MiniMessage
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer
+import org.bukkit.command.CommandSender
 import org.bukkit.plugin.java.JavaPlugin
 import pl.syntaxdevteam.tagsx.commands.CommandManager
+import pl.syntaxdevteam.tagsx.data.TagList
 import pl.syntaxdevteam.tagsx.gui.TagsGui
 import pl.syntaxdevteam.tagsx.listeners.PlayerJoinListener
 import pl.syntaxdevteam.tagsx.placeholders.TagPlaceholder
 import pl.syntaxdevteam.tagsx.storage.TagStorage
 
 class TagsX : JavaPlugin() {
+
     val tagStorage = TagStorage(this)
     private val commandManager = CommandManager(this)
 
+    val mm = MiniMessage.miniMessage()
+
+    companion object {
+        val PREFIX = MiniMessage.miniMessage().deserialize("<gradient:#ffcc66:#ff6600>[TagsX]</gradient> ")
+    }
+
     override fun onEnable() {
         saveDefaultConfig()
-
         tagStorage.loadTags()
-
-        commandManager.registerCommands(this)
+        TagList.loadTags(this)
+        commandManager.registerCommands()
 
         server.pluginManager.registerEvents(PlayerJoinListener(this), this)
         server.pluginManager.registerEvents(TagsGui(this), this)
@@ -32,4 +42,9 @@ class TagsX : JavaPlugin() {
         tagStorage.saveTags()
         logger.info("🛑 TagsX został wyłączony.")
     }
-}
+
+    fun sendMessageWithPrefix(receiver: CommandSender, message: String) {
+        val formattedMessage = LegacyComponentSerializer.legacySection().serialize(PREFIX) + message
+        receiver.sendMessage(formattedMessage)
+    }
+}

src/main/kotlin/pl/syntaxdevteam/tagsx/commands/CommandManager.kt

@@ -1,27 +1,63 @@
 package pl.syntaxdevteam.tagsx.commands
 
-import net.kyori.adventure.text.minimessage.MiniMessage
+import org.bukkit.command.Command
 import org.bukkit.command.CommandSender
+import org.bukkit.command.TabCompleter
+import org.bukkit.command.defaults.BukkitCommand
 import org.bukkit.entity.Player
 import pl.syntaxdevteam.tagsx.TagsX
 import pl.syntaxdevteam.tagsx.gui.TagsGui
 
 class CommandManager(private val plugin: TagsX) {
 
-    private val mm = MiniMessage.miniMessage()
     private val gui = TagsGui(plugin)
 
-    fun registerCommands(plugin: TagsX) {
-        plugin.server.commandMap.register("tagsx", object : org.bukkit.command.Command("tags") {
+    fun registerCommands() {
+        val tagsCommand = object : BukkitCommand("tags") {
             override fun execute(sender: CommandSender, label: String, args: Array<out String>): Boolean {
-                if (sender is Player) {
-                    gui.open(sender) // ✅ Otwiera GUI
+                if (sender !is Player) {
+                    sender.sendMessage("§cTa komenda jest tylko dla graczy!")
+                    return false
+                }
+                gui.open(sender)
+                return true
+            }
+        }
+
+        val tagsxCommand = object : BukkitCommand("tagsx"), TabCompleter {
+            override fun execute(sender: CommandSender, label: String, args: Array<out String>): Boolean {
+                if (args.isEmpty() || args[0].lowercase() != "reload") {
+                    sender.sendMessage("§cUżycie: /tagsx reload")
+                    return true
+                }
+
+                if (!sender.hasPermission("tagsx.reload")) {
+                    if (sender is Player) {
+                        plugin.sendMessageWithPrefix(sender, "§cNie masz uprawnień do tej komendy!")
+                    } else {
+                        sender.sendMessage("§cNie masz uprawnień do tej komendy!")
+                    }
                     return true
                 }
 
-                sender.sendMessage(mm.deserialize("<red>Ta komenda jest tylko dla graczy!</red>"))
-                return false
+                plugin.reloadConfig()
+                plugin.sendMessageWithPrefix(sender, "§aPlugin TagsX został poprawnie przeładowany!")
+                return true
             }
-        })
+
+            override fun onTabComplete(
+                sender: CommandSender,
+                command: Command,
+                alias: String,
+                args: Array<out String>
+            ): MutableList<String> {
+                return if (args.size == 1) {
+                    mutableListOf("reload").filter { it.startsWith(args[0], ignoreCase = true) }.toMutableList()
+                } else mutableListOf()
+            }
+        }
+
+        plugin.server.commandMap.register("tags", tagsCommand)
+        plugin.server.commandMap.register("tagsx", tagsxCommand)
     }
 }

src/main/kotlin/pl/syntaxdevteam/tagsx/commands/ReloadCommand.kt

@@ -0,0 +1,23 @@
+package pl.syntaxdevteam.tagsx.commands
+
+import org.bukkit.command.Command
+import org.bukkit.command.CommandExecutor
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+import pl.syntaxdevteam.tagsx.TagsX
+
+class ReloadCommand(private val plugin: TagsX) : CommandExecutor {
+
+    override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array<out String>): Boolean {
+        if (sender is Player) {
+            plugin.sendMessageWithPrefix(sender, "§cNie masz dostępu do tej komendy!")
+        } else {
+            sender.sendMessage("§cTę komendę może wykonać tylko gracz!")
+        }
+
+
+        plugin.reloadConfig()
+        plugin.sendMessageWithPrefix(sender, "§aPlugin TagsX został poprawnie przeładowany!")
+        return true
+    }
+}

src/main/kotlin/pl/syntaxdevteam/tagsx/commands/TagsCommand.kt

@@ -11,15 +11,14 @@ import pl.syntaxdevteam.tagsx.gui.TagsGui
 class TagsCommand(private val plugin: TagsX) : CommandExecutor {
 
     private val gui = TagsGui(plugin)
-    private val mm = MiniMessage.miniMessage()
 
     override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array<out String>): Boolean {
         if (sender is Player) {
-            gui.open(sender) // ✅ Otwieranie GUI
+            gui.open(sender)
             return true
         }
 
-        sender.sendMessage(mm.deserialize("<red>Tę komendę może użyć tylko gracz!</red>"))
+        plugin.sendMessageWithPrefix(sender, "<red>Tę komendę może użyć tylko gracz!</red>")
         return false
     }
 }

src/main/kotlin/pl/syntaxdevteam/tagsx/data/TagList.kt

@@ -1,18 +1,25 @@
 package pl.syntaxdevteam.tagsx.data
 
 import org.bukkit.Material
+import pl.syntaxdevteam.tagsx.TagsX
 
 object TagList {
-    val tags = listOf(
-        TagItem(Material.RED_DYE, "§cWojownik§r"),
-        TagItem(Material.BLUE_DYE, "§dMag§r"),
-        TagItem(Material.BLACK_DYE, "§0Mroczny§r"),
-        TagItem(Material.YELLOW_DYE, "§bBłyskawica§r"),
-        TagItem(Material.PURPLE_DYE, "§6Król§r"),
-        TagItem(Material.GREEN_DYE, "§aSzczęściarz§r")
+    val tags = mutableListOf<TagItem>()
 
-    )
+    fun loadTags(plugin: TagsX) {
+        tags.clear()
+        val config = plugin.config.getConfigurationSection("tags") ?: return
+
+        for (key in config.getKeys(false)) {
+            val display = config.getString("tags.$key.display") ?: continue
+            val material = Material.matchMaterial(config.getString("tags.$key.material") ?: "NAME_TAG") ?: Material.NAME_TAG
+
+            tags.add(TagItem(material, display))
+        }
+        plugin.logger.info("✅ Załadowano ${tags.size} tagów z config.yml!")
+    }
 }
-// §§§
 
 data class TagItem(val material: Material, val name: String)
+
+// §§§