feat: add legacy format support to fake_message feature

Syrent · Syrent · commit c293a5d03708 · 2025-01-10T13:34:32.000+03:30
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ import java.net.URL
 
 plugins {
     java
-    kotlin("jvm") version "2.0.21"
+    kotlin("jvm") version "2.1.0"
     `maven-publish`
     id("io.papermc.hangar-publish-plugin") version "0.1.2"
     id("com.modrinth.minotaur") version "2.8.7"
@@ -70,7 +70,7 @@ allprojects {
     group = findProperty("group")!! as String
     version = findProperty("version")!! as String
 
-    plugins.apply("java-library")
+    plugins.apply("java")
     plugins.apply("maven-publish")
     plugins.apply("kotlin")
     plugins.apply("org.sayandev.stickynote.project")
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sayanvanish-bukkit/build.gradle.kts b/sayanvanish-bukkit/build.gradle.kts
@@ -57,6 +57,7 @@ tasks {
             hangar("ViaVersion", "5.0.4-SNAPSHOT+548")
             hangar("PlaceholderAPI", "2.11.6")
             url("https://cdn.modrinth.com/data/qvdtDX3s/versions/TD9kTO2n/multiverse-inventories-4.2.7-pre.jar")
+            url("https://github.com/SkinsRestorer/SkinsRestorer/releases/download/15.5.1/SkinsRestorer.jar")
             url("https://cdn.modrinth.com/data/3wmN97b8/versions/ehwU9G3y/multiverse-core-4.3.15-pre.2.jar")
             url("https://cdn.modrinth.com/data/16vhQOQN/versions/g55TGTXG/minimotd-bukkit-2.1.4.jar")
 //            url("https://github.com/NEZNAMY/TAB/releases/download/4.1.6/TAB.v4.1.6.jar")
diff --git a/sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/feature/features/FeatureFakeMessage.kt b/sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/feature/features/FeatureFakeMessage.kt
@@ -1,6 +1,7 @@
 package org.sayandev.sayanvanish.bukkit.feature.features
 
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer
 import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
 import org.bukkit.event.player.PlayerJoinEvent
@@ -14,7 +15,9 @@ import org.sayandev.sayanvanish.bukkit.api.event.BukkitUserVanishEvent
 import org.sayandev.sayanvanish.bukkit.feature.ListenedFeature
 import org.sayandev.sayanvanish.bukkit.utils.PlayerUtils.sendComponent
 import org.sayandev.sayanvanish.bukkit.utils.PlayerUtils.sendRawComponent
+import org.sayandev.stickynote.bukkit.hook.PlaceholderAPIHook
 import org.sayandev.stickynote.bukkit.onlinePlayers
+import org.sayandev.stickynote.bukkit.utils.AdventureUtils
 import org.sayandev.stickynote.bukkit.utils.AdventureUtils.sendComponent
 import org.spongepowered.configurate.objectmapping.ConfigSerializable
 
@@ -25,6 +28,7 @@ class FeatureFakeMessage(
     @Configurable val sendFakeQuitMessage: Boolean = false,
     @Configurable val fakeJoinMessage: String = "<yellow><player> joined the game",
     @Configurable val fakeQuitMessage: String = "<yellow><player> left the game",
+    @Configurable val useLegacyFormatter: Boolean = false,
     @Configurable val disableJoinMessageIfVanished: Boolean = true,
     @Configurable val disableQuitMessageIfVanished: Boolean = true,
 ) : ListenedFeature("fake_message") {
@@ -76,20 +80,38 @@ class FeatureFakeMessage(
         if (!event.options.sendMessage) return
         if (sendFakeQuitMessage && !event.options.isOnJoin && !event.options.isOnQuit) {
             for (player in onlinePlayers) {
-                player.sendRawComponent(fakeQuitMessage, Placeholder.unparsed("player", user.username))
+                if (useLegacyFormatter) {
+                    AdventureUtils.audience.player(player).sendMessage(
+                        LegacyComponentSerializer.legacyAmpersand().deserialize(
+                            PlaceholderAPIHook.injectPlaceholders(player, fakeQuitMessage)
+                                .replace("<player>", user.username)
+                        )
+                    )
+                } else {
+                    player.sendRawComponent(fakeQuitMessage, Placeholder.unparsed("player", user.username))
+                }
             }
         }
     }
 
     @EventHandler
     private fun onUnVanish(event: BukkitUserUnVanishEvent) {
+        val user = event.user
         if (!event.options.sendMessage) return
-        if (!isActive(event.user)) return
+        if (!isActive(user)) return
         if (sendFakeJoinMessage && !event.options.isOnJoin && !event.options.isOnQuit) {
             for (player in onlinePlayers) {
-                player.sendRawComponent(fakeJoinMessage, Placeholder.unparsed("player", event.user.username))
+                if (useLegacyFormatter) {
+                    AdventureUtils.audience.player(player).sendMessage(
+                        LegacyComponentSerializer.legacyAmpersand().deserialize(
+                            PlaceholderAPIHook.injectPlaceholders(player, fakeJoinMessage)
+                                .replace("<player>", user.username)
+                        )
+                    )
+                } else {
+                    player.sendRawComponent(fakeJoinMessage, Placeholder.unparsed("player", user.username))
+                }
             }
         }
     }
-
 }
diff --git a/sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/feature/features/FeatureSilentContainer.kt b/sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/feature/features/FeatureSilentContainer.kt
@@ -11,15 +11,13 @@ import org.bukkit.event.player.PlayerInteractEvent
 import org.bukkit.event.player.PlayerQuitEvent
 import org.bukkit.event.player.PlayerTeleportEvent
 import org.bukkit.inventory.CraftingInventory
-import org.bukkit.inventory.PlayerInventory
 import org.bukkit.util.Vector
 import org.sayandev.sayanvanish.api.feature.RegisteredFeature
 import org.sayandev.sayanvanish.bukkit.api.SayanVanishBukkitAPI.Companion.user
 import org.sayandev.sayanvanish.bukkit.api.event.BukkitUserUnVanishEvent
 import org.sayandev.sayanvanish.bukkit.feature.ListenedFeature
 import org.sayandev.stickynote.bukkit.runSync
 import org.sayandev.stickynote.bukkit.utils.ServerVersion
-import org.sayandev.stickynote.bukkit.warn
 import org.spongepowered.configurate.objectmapping.ConfigSerializable
 import java.util.*
 
@@ -30,6 +28,16 @@ class FeatureSilentContainer: ListenedFeature("silent_container") {
     override var condition: Boolean = ServerVersion.supports(13)
     @Transient private val containerPlayersData = mutableMapOf<UUID, ContainerPlayerData>()
 
+    /*override fun enable() {
+        // https://github.com/Syrent/SayanVanish/issues/356
+        if (hasPlugin("Multiverse-Inventories")) {
+            warn("`silent_container` feature is not compatible with Multiverse-Inventories. Disabling the feature.")
+            return
+        }
+
+        super.enable()
+    }*/
+
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private fun onPlayerInteract(event: PlayerInteractEvent) {
         val player = event.player
diff --git a/sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/feature/features/FeatureState.kt b/sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/feature/features/FeatureState.kt
@@ -1,5 +1,6 @@
 package org.sayandev.sayanvanish.bukkit.feature.features
 
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder
 import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
 import org.bukkit.event.player.PlayerJoinEvent
@@ -13,8 +14,6 @@ import org.sayandev.sayanvanish.bukkit.api.SayanVanishBukkitAPI.Companion.getOrC
 import org.sayandev.sayanvanish.bukkit.api.SayanVanishBukkitAPI.Companion.user
 import org.sayandev.sayanvanish.bukkit.config.language
 import org.sayandev.sayanvanish.bukkit.feature.ListenedFeature
-import org.sayandev.stickynote.bukkit.utils.AdventureUtils.component
-import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder
 import org.spongepowered.configurate.objectmapping.ConfigSerializable
 
 @RegisteredFeature
diff --git a/sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/feature/features/FeatureUpdate.kt b/sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/feature/features/FeatureUpdate.kt
@@ -26,7 +26,7 @@ import java.util.concurrent.CompletableFuture
 @ConfigSerializable
 class FeatureUpdate(
     @Configurable val checkEveryXMinutes: Int = 60 * 24,
-    @Configurable val notifyPermission: String = "sayanvanish.feature.update.notify",
+    @Configurable val notifyPermission: String = "${plugin.name.lowercase()}.feature.update.notify",
     @Configurable val notifyOnJoin: Boolean = true,
     @Configurable val notifyForSnapshotBuilds: Boolean = true,
     @Configurable val autoUpdateNotification: Boolean = true,
diff --git a/sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/feature/features/hook/FeatureHookTAB.kt b/sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/feature/features/hook/FeatureHookTAB.kt
@@ -26,7 +26,7 @@ class FeatureHookTAB: HookFeature("hook_tab", "TAB") {
     }
 }
 
-class VanishIntegrationTAB: VanishIntegration(plugin.name) {
+private class VanishIntegrationTAB: VanishIntegration(plugin.name) {
     override fun isVanished(player: TabPlayer): Boolean {
         return SayanVanishBukkitAPI.getInstance().isVanished(player.uniqueId)
     }
diff --git a/sayanvanish-proxy/sayanvanish-proxy-velocity/src/main/kotlin/org/sayandev/sayanvanish/velocity/feature/features/hook/FeatureHookVelocitab.kt b/sayanvanish-proxy/sayanvanish-proxy-velocity/src/main/kotlin/org/sayandev/sayanvanish/velocity/feature/features/hook/FeatureHookVelocitab.kt
@@ -16,7 +16,6 @@ import org.sayandev.sayanvanish.velocity.event.VelocityUserVanishEvent
 import org.sayandev.sayanvanish.velocity.feature.HookFeature
 import org.sayandev.stickynote.velocity.StickyNote
 import org.sayandev.stickynote.velocity.registerListener
-import org.sayandev.stickynote.velocity.warn
 import org.spongepowered.configurate.objectmapping.ConfigSerializable
 import java.util.concurrent.TimeUnit
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,7 +8,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.sayandev.stickynote.settings") version "1.7.131"
+    id("org.sayandev.stickynote.settings") version "1.8.6"
 }
 
 rootProject.name = "SayanVanish"

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class FeatureHookTAB: HookFeature("hook_tab", "TAB") {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`-class VanishIntegrationTAB: VanishIntegration(plugin.name) {`
	`29`	`+private class VanishIntegrationTAB: VanishIntegration(plugin.name) {`
`30`	`30`	`override fun isVanished(player: TabPlayer): Boolean {`
`31`	`31`	`return SayanVanishBukkitAPI.getInstance().isVanished(player.uniqueId)`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ pluginManagement {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`plugins {`
`11`		`- id("org.sayandev.stickynote.settings") version "1.7.131"`
	`11`	`+ id("org.sayandev.stickynote.settings") version "1.8.6"`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`rootProject.name = "SayanVanish"`