Merge branch 'development' into master

.github/workflows/hangar.yml

@@ -20,6 +20,8 @@ jobs:
           java-version: 17
       - name: Change wrapper permissions
         run: chmod +x ./gradlew
+      - name: Generate NMS Components
+        run: ./gradlew generateNmsComponents
       - name: Cache Gradle dependencies
         uses: actions/cache@v2
         with:
@@ -31,6 +33,6 @@ jobs:
         run: ./gradlew build
       - name: Publish
         env:
-          HANGAR_TOKEN: ${{ secrets.HANGAR_API_TOKEN }}
+          HANGAR_API_TOKEN: ${{ secrets.HANGAR_API_TOKEN }}
           HANGAR_BUILD_CHANNEL: Snapshot
         run: ./gradlew build publishPluginPublicationToHangar --stacktrace

build.gradle.kts

@@ -1,4 +1,3 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
 import io.papermc.hangarpublishplugin.model.Platforms
 import org.jetbrains.gradle.ext.settings
 import org.jetbrains.gradle.ext.taskTriggers
@@ -8,10 +7,10 @@ import java.util.concurrent.Executors
 import java.io.ByteArrayOutputStream
 
 plugins {
-    kotlin("jvm") version "1.9.0"
+    kotlin("jvm") version "1.9.10"
     id("maven-publish")
     id("java")
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
     id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.7"
     id("org.screamingsandals.nms-mapper") version "1.4.5"
     id("xyz.jpenilla.run-paper") version "2.1.0"
@@ -96,6 +95,8 @@ dependencies {
 
     implementation("com.jeff_media:SpigotUpdateChecker:3.0.3")
 
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+
     annotationProcessor("com.velocitypowered:velocity-api:3.1.1")
 }
 
@@ -129,6 +130,7 @@ publishing {
 val extraDependencies = mapOf(
     "CMI.jar" to "https://www.zrips.net/wp-content/uploads/2021/09/CMI9.0.0.0API.jar",
     "NexEngine.jar" to "https://github.com/nulli0n/NexEngine-spigot/releases/download/v2.2.11/NexEngine.jar",
+    "SunLight.jar" to "https://www.dropbox.com/scl/fi/mmu7g32vj6oitkja65cws/SunLight-3.9.4.jar?rlkey=tqxgcy80yccxh80yzl24ubs7b&dl=1",
     "ServerListPlus.jar" to "https://ci.codemc.io/job/Minecrell/job/ServerListPlus/lastSuccessfulBuild/artifact/Velocity/build/libs/ServerListPlus-3.5.1-SNAPSHOT-Velocity.jar",
 )
 
@@ -141,20 +143,6 @@ tasks {
         folia.registerTask()
     }
 
-    val relocate = task<ConfigureShadowRelocation>("relocateShadowJar") {
-        target = shadowJar.get()
-        prefix = "ir.syrent.velocityvanish"
-        this.target.apply {
-            relocate("net.kyori.", "net.kyori.")
-        }
-    }
-
-    shadowJar {
-        dependsOn(relocate)
-        exclude("META-INF/**")
-        minimize()
-    }
-
     compileJava {
         options.encoding = Charsets.UTF_8.name()
     }
@@ -189,16 +177,37 @@ tasks {
         ex.awaitTermination(10, TimeUnit.SECONDS)
     }
 
-    /*build {
+    shadowJar {
         dependsOn(extraDeps)
+        archiveClassifier.set("")
+        exclude("META-INF/**")
+        from("LICENSE")
+        minimize()
+
+        relocate("io.papermc.lib", "ir.syrent.velocityvanish.dependencies.io.papermc.lib")
+        relocate("io.leangen", "ir.syrent.velocityvanish.dependencies.io.leangen")
+        relocate("org.bstats", "ir.syrent.velocityvanish.dependencies.org.bstats")
+        relocate("com.google.code.gson", "ir.syrent.velocityvanish.dependencies.com.google.code.gson")
+        relocate("com.cryptomorin", "ir.syrent.velocityvanish.dependencies.com.github.cryptomorin")
+        relocate("cloud.commandframework", "ir.syrent.velocityvanish.dependencies.cloud.commandframework")
+        relocate("kotlin", "ir.syrent.velocityvanish.dependencies.kotlin")
+        relocate("com.jeff_media", "ir.syrent.velocityvanish.dependencies.com.jeff_media")
+        relocate("org.jetbrains", "ir.syrent.velocityvanish.dependencies.org.jetbrains")
+        relocate("org.intellij", "ir.syrent.velocityvanish.dependencies.org.intellij")
+    }
+
+    build {
         dependsOn(shadowJar)
-    }*/
+    }
 }
 
+
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 }
 
+artifacts.archives(tasks.shadowJar)
+
 fun executeGitCommand(vararg command: String): String {
     val byteOut = ByteArrayOutputStream()
     exec {
@@ -227,7 +236,7 @@ hangarPublish {
     publications.register("plugin") {
         version.set(suffixedVersion)
         channel.set(System.getenv("HANGAR_BUILD_CHANNEL") ?: "Snapshot")
-        changelog.set(changelogContent)
+        changelog.set(System.getenv("HANGAR_CHANGELOG") ?: changelogContent)
         id.set(slug)
         apiKey.set(System.getenv("HANGAR_API_TOKEN"))
 

gradle.properties

@@ -4,4 +4,7 @@ plugin-name=VelocityVanish
 # Hangar properties
 paperVersion=1.8.9-1.20.1
 foliaVersion=1.19.4-1.20.1
-velocityVersion=3.2
+velocityVersion=3.2
+
+# Gradle options
+org.gradle.jvmargs=-XX\:MaxHeapSize\=2048m -Xmx2048m

gradle/wrapper/gradle-wrapper.properties

@@ -2,6 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -200,7 +200,7 @@ fi
 
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS='"-Xmx1024m" "-Xms1024m"'
 
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of

gradlew.bat

@@ -34,7 +34,7 @@ set APP_HOME=%DIRNAME%
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS="-Xmx1024m" "-Xms1024m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

src/generated/java/ir/syrent/nms/accessors/MobEffectAccessor.java

@@ -8,7 +8,7 @@
  * <p>
  * This class is a reflection accessor for net.minecraft.world.effect.MobEffect
  *
- * @since 2023-06-27 17:01:01
+ * @since 2023-08-30 15:38:06
  */
 public class MobEffectAccessor {
   /**

src/generated/java/ir/syrent/nms/accessors/MobEffectInstanceAccessor.java

@@ -9,7 +9,7 @@
  * <p>
  * This class is a reflection accessor for net.minecraft.world.effect.MobEffectInstance
  *
- * @since 2023-06-27 17:01:01
+ * @since 2023-08-30 15:38:06
  */
 public class MobEffectInstanceAccessor {
   /**

src/main/java/ir/syrent/velocityvanish/spigot/VelocityVanishSpigot.kt

@@ -166,8 +166,8 @@ class VelocityVanishSpigot : RUoMPlugin() {
         BlockPlaceListener(this)
         PlayerGameModeChangeListener(this)
         if (DependencyManager.sayanChatHook.exists) {
-            PlayerMentionListener(this)
-            if (!velocitySupport) PrivateMessageListener(this)
+//            PlayerMentionListener(this)
+//            if (!velocitySupport) PrivateMessageListener(this)
         }
         if (ServerVersion.supports(12)) {
             TabCompleteListener(this)

src/main/java/ir/syrent/velocityvanish/spigot/core/VanishManager.kt

@@ -233,15 +233,15 @@ class VanishManager(
             denyPush(player)
         }
 
-        if (DependencyManager.proCosmeticsHook.exists) {
+        /*if (DependencyManager.proCosmeticsHook.exists) {
             Ruom.runSync({
                 try {
                     DependencyManager.proCosmeticsHook.proCosmetics.userManager?.getUser(player.uniqueId)?.unequipCosmetics(true)
                 } catch (e: Exception) {
                     Ruom.warn("Failed to un-equip cosmetics for player ${player.name}, is ProCosmetics up to date?")
                 }
             }, 20)
-        }
+        }*/
 
         if (DependencyManager.squareMapHook.exists) {
             DependencyManager.squareMapHook.squareMap.playerManager().hide(player.uniqueId, true)
@@ -344,13 +344,13 @@ class VanishManager(
             allowPush(player)
         }
 
-        if (DependencyManager.proCosmeticsHook.exists) {
+        /*if (DependencyManager.proCosmeticsHook.exists) {
             try {
                 DependencyManager.proCosmeticsHook.proCosmetics.userManager?.getUser(player.uniqueId)?.equipLastCosmetics(true)
             } catch (e: Exception) {
                 Ruom.warn("Failed to equip cosmetics for player ${player.name}, is ProCosmetics up to date?")
             }
-        }
+        }*/
 
         if (DependencyManager.squareMapHook.exists) {
             DependencyManager.squareMapHook.squareMap.playerManager().show(player.uniqueId, true)

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

@@ -7,8 +7,8 @@ object DependencyManager {
 
     var protocolLibHook: ProtocolLibHook
         private set
-    var proCosmeticsHook: ProCosmeticsHook
-        private set
+    /*var proCosmeticsHook: ProCosmeticsHook
+        private set*/
     var placeholderAPIHook: PlaceholderAPIHook
         private set
     var sayanChatHook: SayanChatHook
@@ -46,10 +46,10 @@ object DependencyManager {
                 this.register()
             }
         }
-        ProCosmeticsHook("ProCosmetics").apply {
+        /*ProCosmeticsHook("ProCosmetics").apply {
             this.register()
             proCosmeticsHook = this
-        }
+        }*/
         PlaceholderAPIHook(VelocityVanishSpigot.instance, "PlaceholderAPI").apply {
             this.register()
             placeholderAPIHook = this

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

@@ -1,3 +1,4 @@
+/*
 package ir.syrent.velocityvanish.spigot.hook
 
 import se.file14.procosmetics.ProCosmetics
@@ -21,4 +22,4 @@ class ProCosmeticsHook constructor(name: String) : Dependency(name) {
         )
     }
 
-}
+}*/

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

@@ -1,6 +1,5 @@
 package ir.syrent.velocityvanish.spigot.hook
 
-import se.file14.procosmetics.api.ProCosmeticsProvider
 import xyz.jpenilla.squaremap.api.Squaremap
 import xyz.jpenilla.squaremap.api.SquaremapProvider
 

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

@@ -1,3 +1,4 @@
+/*
 package ir.syrent.velocityvanish.spigot.listener
 
 import ir.syrent.velocityvanish.spigot.VelocityVanishSpigot
@@ -22,4 +23,4 @@ class PlayerMentionListener(
             event.isCancelled = true
         }
     }
-}
+}*/

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

@@ -1,3 +1,4 @@
+/*
 package ir.syrent.velocityvanish.spigot.listener
 
 import ir.syrent.velocityvanish.spigot.VelocityVanishSpigot
@@ -22,4 +23,4 @@ class PrivateMessageListener(
             event.isCancelled = true
         }
     }
-}
+}*/