Merge pull request #21

Add PlaceholderAPI support.

build.gradle

@@ -54,12 +54,18 @@ repositories {
     maven {
         url "https://repo.dmulloy2.net/repository/public/"
     }
+
+    // PlaceholderAPI
+    maven {
+        url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/'
+    }
 }
 
 dependencies {
     compileOnly 'com.velocitypowered:velocity-api:3.1.1'
     compileOnly 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT'
     compileOnly 'com.comphenix.protocol:ProtocolLib:4.7.0'
+    compileOnly 'me.clip:placeholderapi:2.11.2'
 
     compileOnly files("libs/SayanChat-2.8.3.jar")
     compileOnly files('libs/ProCosmetics-13.7.jar')

gradle.properties

@@ -1,2 +1,2 @@
-version=3.3.1
+version=3.4.0
 plugin-name=VelocityVanish

src/main/java/ir/syrent/velocityvanish/spigot/command/vanish/VanishCommand.kt

@@ -14,8 +14,8 @@ class VanishCommand(
 ) : PluginCommand("vanish", "velocityvanish.command.vanish", true) {
 
     init {
-        addSubcommand(ReloadSubcommand())
         this.register()
+        addSubcommand(ReloadSubcommand())
     }
 
     override fun onExecute(sender: CommandSender, args: List<String>) {

src/main/java/ir/syrent/velocityvanish/spigot/hook/DependencyManager.kt

@@ -8,6 +8,8 @@ object DependencyManager {
         private set
     var proCosmeticsHook: ProCosmeticsHook
         private set
+    var placeholderAPIHook: PlaceholderAPIHook
+        private set
 
     init {
         ProtocolLibHook("ProtocolLib").apply {
@@ -26,6 +28,10 @@ object DependencyManager {
             this.register()
             proCosmeticsHook = this
         }
+        PlaceholderAPIHook("PlaceholderAPI").apply {
+            this.register()
+            placeholderAPIHook = this
+        }
     }
 
 }

src/main/java/ir/syrent/velocityvanish/spigot/hook/PlaceholderAPIHook.kt

@@ -0,0 +1,11 @@
+package ir.syrent.velocityvanish.spigot.hook
+
+class PlaceholderAPIHook constructor(name: String) : Dependency(name) {
+
+    override fun features(): List<String> {
+        return mutableListOf(
+            "Access to all placeholders in all plugin messages."
+        )
+    }
+
+}

src/main/java/ir/syrent/velocityvanish/spigot/listener/PostUnVanishListener.kt

@@ -27,7 +27,7 @@ class PostUnVanishListener(
         plugin.vanishedNames.remove(player.name)
         plugin.bridgeManager?.updateVanishedPlayersRequest(player, false)
 
-        val joinMessage = Settings.formatMessage(Message.JOIN_MESSAGE, TextReplacement("player", player.name), TextReplacement("play_displayname", player.displayName))
+        val joinMessage = Settings.formatMessage(player, Message.JOIN_MESSAGE, TextReplacement("player", player.name), TextReplacement("play_displayname", player.displayName))
         if (joinMessage.isNotBlank() && joinMessage.isNotEmpty() && event.sendJoinMessage) {
             Ruom.broadcast(joinMessage.component())
         }

src/main/java/ir/syrent/velocityvanish/spigot/listener/PostVanishListener.kt

@@ -27,7 +27,7 @@ class PostVanishListener(
         plugin.vanishedNames.add(player.name)
         plugin.bridgeManager?.updateVanishedPlayersRequest(player, true)
 
-        val quitMessage = Settings.formatMessage(Message.QUIT_MESSAGE, TextReplacement("player", player.name), TextReplacement("play_displayname", player.displayName))
+        val quitMessage = Settings.formatMessage(player, Message.QUIT_MESSAGE, TextReplacement("player", player.name), TextReplacement("play_displayname", player.displayName))
         if (quitMessage.isNotBlank() && quitMessage.isNotEmpty() && event.sendQuitMessage) {
             Ruom.broadcast(quitMessage.component())
         }

src/main/java/ir/syrent/velocityvanish/spigot/storage/Settings.kt

@@ -2,12 +2,16 @@ package ir.syrent.velocityvanish.spigot.storage
 
 import com.cryptomorin.xseries.XSound
 import ir.syrent.velocityvanish.spigot.configuration.YamlConfig
+import ir.syrent.velocityvanish.spigot.hook.DependencyManager
+import ir.syrent.velocityvanish.spigot.hook.PlaceholderAPIHook
 import ir.syrent.velocityvanish.spigot.ruom.Ruom
 import ir.syrent.velocityvanish.spigot.ruom.adventure.AdventureApi
 import ir.syrent.velocityvanish.utils.TextReplacement
 import ir.syrent.velocityvanish.utils.component
+import me.clip.placeholderapi.PlaceholderAPI
 import org.bukkit.Sound
 import org.bukkit.configuration.file.FileConfiguration
+import org.bukkit.entity.Player
 import java.io.File
 import java.nio.file.Files
 import java.time.LocalDate
@@ -95,6 +99,15 @@ object Settings {
     }
 
 
+    fun formatMessage(player: Player, message: String, vararg replacements: TextReplacement): String {
+        var formattedMessage = formatMessage(message, *replacements)
+        if (DependencyManager.placeholderAPIHook.exists) {
+            formattedMessage = PlaceholderAPI.setPlaceholders(player, formattedMessage)
+        }
+        return formattedMessage
+    }
+
+
     fun formatMessage(message: String, vararg replacements: TextReplacement): String {
         var formattedMessage = message
             .replace("\$prefix", getMessage(Message.PREFIX))
@@ -107,6 +120,10 @@ object Settings {
         return formattedMessage
     }
 
+    fun formatMessage(player: Player, message: Message, vararg replacements: TextReplacement): String {
+        return formatMessage(player, getMessage(message), *replacements)
+    }
+
     fun formatMessage(message: Message, vararg replacements: TextReplacement): String {
         return formatMessage(getMessage(message), *replacements)
     }

src/main/java/ir/syrent/velocityvanish/spigot/utils/PlayerUtils.kt

@@ -13,17 +13,17 @@ fun CommandSender.sendMessage(message: Message, vararg replacements: TextReplace
 }
 
 fun Player.sendMessage(message: Message, vararg replacements: TextReplacement) {
-    val formattedMessage = Settings.formatMessage(message, *replacements)
+    val formattedMessage = Settings.formatMessage(this, message, *replacements)
     if (formattedMessage.isBlank()) return
 
     this.playSound(this.location, Settings.commandSound, 1f, 1f)
     AdventureApi.get().sender(this).sendMessage(formattedMessage.component())
 }
 
 fun Player.sendMessageOnly(message: Message, vararg replacements: TextReplacement) {
-    AdventureApi.get().sender(this).sendMessage(Settings.formatMessage(message, *replacements).component())
+    AdventureApi.get().sender(this).sendMessage(Settings.formatMessage(this, message, *replacements).component())
 }
 
 fun Player.sendActionbar(message: Message, vararg replacements: TextReplacement) {
-    AdventureApi.get().sender(this).sendActionBar(Settings.formatMessage(message, *replacements).component())
+    AdventureApi.get().sender(this).sendActionBar(Settings.formatMessage(this, message, *replacements).component())
 }

src/main/resources/plugin.yml

@@ -10,6 +10,7 @@ softdepend:
   - 'ProtocolLib'
   - 'ProCosmetics'
   - 'SayanChat'
+  - 'PlaceholderAPI'
 commands:
   vanish:
     aliases:

src/main/resources/velocity-plugin.json

@@ -1 +1 @@
-{"id":"velocityvanish","name":"VelocityVanish","version":"3.3.1","description":"Vanish plugin for velocity servers","url":"syrent.ir","authors":["Syrent"],"dependencies":[],"main":"ir.syrent.velocityvanish.velocity.VelocityVanish"}
+{"id":"velocityvanish","name":"VelocityVanish","version":"3.4.0","description":"Vanish plugin for velocity servers","url":"syrent.ir","authors":["Syrent"],"dependencies":[],"main":"ir.syrent.velocityvanish.velocity.VelocityVanish"}