Add support for VelociTab and fix an NSME error for potions on 1.8

Syrent · Nov 17, 2023 · 9f1394e · 9f1394e
1 parent 5cb1b8e
commit 9f1394e
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -86,6 +86,9 @@ repositories {
 
     // Cloud SNAPSHOT (Dev repository)
     maven("https://repo.masmc05.dev/repository/maven-snapshots/")
+
+    // Velocitab
+    maven("https://repo.william278.net/releases")
 }
 
 dependencies {
@@ -100,6 +103,7 @@ dependencies {
     compileOnly("com.discordsrv:discordsrv:1.26.2")
     compileOnly("com.mojang:authlib:1.11")
     compileOnly("io.netty:netty-all:4.1.99.Final")
+    compileOnly("net.william278:velocitab:1.5.1")
 
     // SayanChat 2.8.1
     // ProCosmetics

diff --git a/common/build.gradle b/common/build.gradle
@@ -0,0 +1,22 @@
+plugins {
+    id 'maven-publish'
+}
+
+version = '1.0.0'
+group = 'ir.syrent'
+
+repositories {
+}
+
+dependencies {
+}
+
+def targetJavaVersion = 17
+tasks.withType(JavaCompile).configureEach {
+    // ensure that the encoding is set to UTF-8, no matter what the system default is
+    // this fixes some edge cases with special characters not displaying correctly
+    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    // If Javadoc is generated, this must be specified in that task too.
+    it.options.encoding = "UTF-8"
+    it.options.release = 17
+}
diff --git a/common/gradle.properties b/common/gradle.properties
diff --git a/common/settings.gradle b/common/settings.gradle
diff --git a/src/main/java/ir/syrent/velocityvanish/spigot/core/VanishManager.kt b/src/main/java/ir/syrent/velocityvanish/spigot/core/VanishManager.kt
@@ -10,7 +10,6 @@ import com.comphenix.protocol.wrappers.PlayerInfoData
 import com.comphenix.protocol.wrappers.WrappedChatComponent
 import com.comphenix.protocol.wrappers.WrappedGameProfile
 import com.mojang.authlib.GameProfile
-import io.papermc.paper.threadedregions.scheduler.EntityScheduler
 import ir.syrent.nms.accessors.*
 import ir.syrent.velocityvanish.spigot.VelocityVanishSpigot
 import ir.syrent.velocityvanish.spigot.event.PostUnVanishEvent
@@ -136,7 +135,9 @@ class VanishManager(
     fun removePotionEffects(player: Player) {
         Ruom.runSync({
             for (potionEffect in potions) {
-                if (player.getPotionEffect(potionEffect.type)?.amplifier != potionEffect.amplifier) continue
+                if (ServerVersion.supports(10)) {
+                    if (player.getPotionEffect(potionEffect.type)?.amplifier != potionEffect.amplifier) continue
+                }
                 try {
                     @Suppress("DEPRECATION") NMSUtils.sendPacket(player, ClientboundRemoveMobEffectPacketAccessor.getConstructor0().newInstance(player.entityId, MobEffectAccessor.getMethodById1().invoke(null, potionEffect.type.id)))
                 } catch (e: Exception) {

diff --git a/src/main/java/ir/syrent/velocityvanish/spigot/listener/PlayerJoinListener.kt b/src/main/java/ir/syrent/velocityvanish/spigot/listener/PlayerJoinListener.kt
@@ -26,18 +26,13 @@ class PlayerJoinListener(
     @EventHandler(priority = EventPriority.LOWEST)
     private fun onPlayerJoin(event: PlayerJoinEvent) {
         handleVanishOnJoin(event)
-        Ruom.runSync({
+        /*Ruom.runSync({
             handleVanishOnJoin(event)
-        }, 15)
+        }, 15)*/
     }
 
     fun handleVanishOnJoin(event: PlayerJoinEvent) {
-        val oldPlayer = event.player
-        /*
-        * Velocity plugin message problem on 1.20.2 (1.20.2 is not yet supported offically)
-        * https://github.com/PaperMC/Velocity/pull/1088#issuecomment-1744385241
-        * */
-        val player = Bukkit.getPlayer(oldPlayer.uniqueId) ?: return
+        val player = event.player
 
         // Note: DiscordSRV support
         player.setMetadata("vanished", FixedMetadataValue(plugin, true))

diff --git a/src/main/java/ir/syrent/velocityvanish/velocity/bridge/VelocityBridgeManager.kt b/src/main/java/ir/syrent/velocityvanish/velocity/bridge/VelocityBridgeManager.kt
@@ -8,6 +8,7 @@ import ir.syrent.velocityvanish.velocity.event.VelocityUnVanishEvent
 import ir.syrent.velocityvanish.velocity.event.VelocityVanishEvent
 import ir.syrent.velocityvanish.velocity.vruom.VRuom
 import ir.syrent.velocityvanish.velocity.vruom.utils.GsonUtils
+import net.william278.velocitab.api.VelocitabAPI
 
 @Suppress("UnstableApiUsage")
 class VelocityBridgeManager(
@@ -61,9 +62,17 @@ class VelocityBridgeManager(
 
                 if (vanished) {
                     plugin.vanishedPlayers.add(name)
-                    VRuom.getServer().eventManager.fire(VelocityVanishEvent(VRuom.getPlayer(name).orElse(null), name))
+                    val player = VRuom.getPlayer(name).orElse(null)
+                    if (player != null) {
+                        VelocitabAPI.getInstance().vanishPlayer(player)
+                    }
+                    VRuom.getServer().eventManager.fire(VelocityVanishEvent(player, name))
                 } else {
                     plugin.vanishedPlayers.remove(name)
+                    val player = VRuom.getPlayer(name).orElse(null)
+                    if (player != null) {
+                        VelocitabAPI.getInstance().unVanishPlayer(player)
+                    }
                     VRuom.getServer().eventManager.fire(VelocityUnVanishEvent(VRuom.getPlayer(name).orElse(null), name))
                 }
             }