Pull upstream

README.md

@@ -126,10 +126,6 @@ fun onItemSpawn(event: ItemSpawnEvent) = event.apply {
 
 ## Roadmap
 
-- `/feat/rel_placeholders`
-    Currently the plugin does not support PlaceholderAPI's
-    relational placeholders.
-
 - `/feat/customization`
     Extension plugin to give players ability to customize their own
     name tags by using a command and customizable GUI interface.

build.gradle.kts

@@ -3,47 +3,72 @@ import java.io.InputStreamReader
 
 plugins {
     id("java")
-    alias(libs.plugins.runPaper)
-    alias(libs.plugins.paperweight) apply false
-    alias(libs.plugins.shadow) apply true
+    alias(libs.plugins.run.paper)
+    alias(libs.plugins.shadow)
 
     `maven-publish`
 }
 
-runPaper.folia.registerTask()
-
 val id = findProperty("id").toString()
 val pluginName = findProperty("plugin_name")
 
 repositories {
-    mavenLocal()
-    mavenCentral()
-    maven("https://repo.papermc.io/repository/maven-public/")
     maven("https://maven.pvphub.me/releases")
-    maven("https://repo.dmulloy2.net/repository/public/")
-    maven("https://jitpack.io")
-    maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
-    maven("https://repo.codemc.io/repository/maven-releases/")
-    maven("https://maven.evokegames.gg/snapshots")
     maven("https://repo.viaversion.com")
     maven("https://repo.codemc.org/repository/maven-public/") {
         name = "codemc"
     }
+    maven("https://repo.papermc.io/repository/maven-public/")
+    maven("https://repo.dmulloy2.net/repository/public/")
+    maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
+    maven("https://repo.codemc.io/repository/maven-releases/")
+    maven("https://maven.evokegames.gg/snapshots")
+
+    mavenLocal()
+    mavenCentral()
+    // Always make sure to put JitPack at the end of the list for performance reasons
+    maven("https://jitpack.io")
 }
 
 dependencies {
-//    paperweight.paperDevBundle(libs.versions.paperApi.get())
-    compileOnly(libs.paper.api)
-
-    compileOnly(libs.placeholder.api)
-    compileOnly(libs.tab.api)
-    compileOnly(libs.packet.events)
-    implementation(libs.entity.lib)
-    testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
-    compileOnly("net.skinsrestorer:skinsrestorer-api:15.5.1")
+    // Provided
+    compileOnly(libs.paper)
+    compileOnly(libs.placeholderapi)
+    compileOnly(libs.tab)
+    compileOnly(libs.packetevents)
+    compileOnly(libs.skinsrestorer)
+
+    // Downloaded during runtime
+    compileOnly(libs.caffeine)
+
+    // Shaded
+    implementation(libs.entitylib)
+    implementation(libs.bstats)
+
+    testImplementation(libs.junit.jupiter)
 }
 
 tasks {
+    jar {
+        enabled = false
+    }
+
+    shadowJar {
+        archiveFileName = "${rootProject.name}-${version}.jar"
+        archiveClassifier = null
+
+        mergeServiceFiles()
+        manifest {
+            attributes["paperweight-mappings-namespace"] = "mojang"
+        }
+
+        relocate("me.tofaa.entitylib", "com.mattmx.nametags.shaded.entitylib")
+        relocate("org.bstats", "com.mattmx.nametags.shaded.bstats")
+    }
+
+    assemble {
+        dependsOn(shadowJar)
+    }
 
     withType<ProcessResources> {
         val props = mapOf(
@@ -66,30 +91,35 @@ tasks {
         mergeServiceFiles()
     }
 
+    build {
+        dependsOn(shadowJar)
+    }
+
     test {
         useJUnitPlatform()
     }
 
-//    assemble {
-//        dependsOn(reobfJar)
-//    }
-
     runServer {
-        val mcVersion = libs.versions.paperApi.get().split("-")[0]
+        val mcVersion = libs.versions.paper.get().split("-")[0]
         minecraftVersion(mcVersion)
 
         downloadPlugins {
             hangar("ViaVersion", "5.3.2")
             hangar("ViaBackwards", "5.3.2")
+            modrinth("packetevents","2HJtPM2W")
 
             // For testing groups in config.yml
             modrinth("luckperms", "v5.4.145-bukkit")
         }
+
+        jvmArgs("-Dcom.mojang.eula.agree=true")
     }
+
+    runPaper.folia.registerTask()
 }
 
 java {
-//    withJavadocJar()
+    //withJavadocJar()
     withSourcesJar()
 
     toolchain {

gradle.properties

@@ -3,7 +3,7 @@ kotlin.code.style=official
 # Project configuration
 group_name = com.mattmx
 id = nametags
-version = 1.5.2
+version = 1.5.6
 
 plugin_name = NameTags
 plugin_main_class_name = NameTags

gradle/libs.versions.toml

@@ -1,35 +1,32 @@
 [versions]
+shadow = "8.3.6"
+runPaper = "2.3.1"
+
+paper = "1.21.5-R0.1-SNAPSHOT"
 
-paperweight = "1.7.1"
-kotlin = "2.0.0"
-updateVersions = "0.51.0"
-shadow = "8.1.8"
-paperApi = "1.21.5-R0.1-SNAPSHOT"
 placeholderapi = "2.11.6"
-ktgui = "2.4.2-alpha"
-runPaper = "2.2.4"
+packetevents = "2.8.0"
+tab = "5.2.0"
+skinsrestorer = "15.6.4"
+caffeine = "3.2.0"
+entitylib = "+1f4aeef-SNAPSHOT"
+bstats = "3.1.0"
 
-packetEvents = "2.7.0"
-entityLib = "3.0.3-SNAPSHOT"
-tab = "4.1.8"
-viaversion = "5.0.0"
+junit-jupiter = "5.13.0"
 
 [libraries]
+paper = { module = "io.papermc.paper:paper-api", version.ref = "paper" }
 
-kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
-paper-api = { module = "io.papermc.paper:paper-api", version.ref = "paperApi" }
-placeholder-api = { module = "me.clip:placeholderapi", version.ref = "placeholderapi" }
-ktgui = { module = "com.mattmx:ktgui", version.ref = "ktgui" }
-packet-events = { module = "com.github.retrooper:packetevents-spigot", version.ref = "packetEvents" }
-entity-lib = { module = "me.tofaa.entitylib:spigot", version.ref = "entityLib" }
-tab-api = { module = "com.github.NEZNAMY:TAB-API", version.ref = "tab" }
-via-version = { module = "com.viaversion:viaversion-api", version.ref = "viaversion" }
+placeholderapi = { module = "me.clip:placeholderapi", version.ref = "placeholderapi" }
+packetevents = { module = "com.github.retrooper:packetevents-spigot", version.ref = "packetevents" }
+tab = { module = "com.github.NEZNAMY:TAB-API", version.ref = "tab" }
+skinsrestorer = { module = "net.skinsrestorer:skinsrestorer-api", version.ref = "skinsrestorer" }
+caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "caffeine" }
+entitylib = { module = "me.tofaa.entitylib:spigot", version.ref = "entitylib" }
+bstats = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" }
 
-[plugins]
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
 
-kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-updateDeps = { id = "com.github.ben-manes.versions", version.ref = "updateVersions" }
-shadow = { id = "io.github.goooler.shadow", version.ref = "shadow" }
-paperweight = { id = "io.papermc.paperweight.userdev", version.ref = "paperweight" }
-runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" }
+[plugins]
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
+run-paper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" }

gradle/wrapper/gradle-wrapper.properties

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