Merge branch 'master' into feature/optional-papi

Author: Jakubk15

.github/renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "local>EternalCodeTeam/.github:renovate-config"
+  ]
+}

.github/workflows/gradle.yml

@@ -15,14 +15,14 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'temurin'
       - name: Cache Gradle
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v5.0.3
         with:
           path: ~/.gradle/caches
           key: >-
@@ -32,11 +32,11 @@ jobs:
       - name: Make gradlew executable
         run: chmod +x gradlew
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@fe59895742b4f984530980e4f693943577526b61
+        uses: gradle/gradle-build-action@093dfe9d598ec5a42246855d09b49dc76803c005
         with:
-          arguments: shadowAll
+          arguments: shadowChatFormatter
       - name: Upload a ChatFormatter Artifact
-        uses: actions/upload-artifact@v4.3.1
+        uses: actions/upload-artifact@v6.0.0
         with:
           name: 'Successfully build ChatFormatter'
           path: build/libs/ChatFormatter v*.jar

.gitignore

@@ -4,11 +4,10 @@
 *.iws
 .idea/
 .gradle/
-out/
 build/
-node_modules/
 dist/
 run/
+.kotlin
 
 .DS_Store
 [Dd]esktop.ini

.whitesource

@@ -1,91 +1,132 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import java.io.FileOutputStream
 import java.io.IOException
 import java.util.jar.JarEntry
 import java.util.jar.JarFile
 import java.util.jar.JarOutputStream
 
-plugins{
+plugins {
     id("eternalcode.java")
-    id("com.github.johnrengelman.shadow")
-    id("xyz.jpenilla.run-paper") version "2.2.3"
+    id("com.gradleup.shadow")
+    id("xyz.jpenilla.run-paper") version "3.0.2"
 }
 
-tasks.create("shadowAll") {
-    group = "shadow"
+tasks.register<ShadowJar>("shadowChatFormatter") {
+    this.group = "build"
 
-    val projects = listOf(
+    val targetProjects = listOf(
         project(":chatformatter-core"),
         project(":chatformatter-paper-plugin")
     )
 
-    for (project in projects) {
-        dependsOn(project.name + ":shadowJar")
+    for (targetProject in targetProjects) {
+        this.dependsOn("${targetProject.name}:shadowJar")
     }
 
-    doLast {
-        merge("ChatFormatter v${project.version}.jar", projects)
+    this.doLast {
+        this@register.mergeJars(
+            "ChatFormatter v${project.version}.jar",
+            targetProjects
+        )
     }
 }
 
-fun merge(archiveFileName: String, projects: List<Project>) {
-    val outputFile = File(project.layout.buildDirectory.asFile.get(), "libs/${archiveFileName}")
-    val outputDir = outputFile.parentFile ?: throw RuntimeException("Could not get output directory")
+fun ShadowJar.mergeJars(archiveFileName: String, projects: List<Project>) {
+    val outputFile = File(
+        this.project.layout.buildDirectory.asFile.get(),
+        "libs/$archiveFileName"
+    )
+    val outputDir = outputFile.parentFile
+        ?: throw IllegalStateException("Cannot find output directory")
 
     if (!outputDir.exists() && !outputDir.mkdirs()) {
-        throw RuntimeException("Could not create output directory")
+        throw IllegalStateException("Failed to create directory: ${outputDir.absolutePath}")
     }
 
-    if (outputFile.exists()) {
-        outputFile.delete()
+    if (outputFile.exists() && !outputFile.delete()) {
+        throw IllegalStateException("Cannot delete existing file: ${outputFile.absolutePath}")
     }
 
     if (!outputFile.createNewFile()) {
-        throw RuntimeException("Could not find output file to merge")
+        throw IllegalStateException("Cannot create output file: ${outputFile.absolutePath}")
     }
 
+    mergeShadowJarsIntoOutput(outputFile, projects)
+}
+
+private fun mergeShadowJarsIntoOutput(
+    outputFile: File,
+    projects: List<Project>
+) {
     JarOutputStream(FileOutputStream(outputFile)).use { outputJar ->
-        for (project in projects) {
-            val shadowJar = project.tasks.shadowJar.get()
-
-            for (file in shadowJar.outputs.files.files) {
-                JarFile(file).use { jarFile ->
-                    for (entry in jarFile.entries()) {
-                        if (entry.isDirectory) {
-                            continue
-                        }
-
-                        val bytes = jarFile.getInputStream(entry).readBytes()
-                        val newEntry = JarEntry(entry.name)
-
-                        newEntry.setTime(System.currentTimeMillis())
-                        newEntry.setSize(bytes.size.toLong())
-
-                        try {
-                            outputJar.putNextEntry(newEntry)
-                            outputJar.write(bytes)
-                            outputJar.closeEntry()
-                        }
-                        catch (exception: IOException) {
-                            if (exception.message?.contains("duplicate entry: ") == true) {
-                                continue
-                            }
-
-                            exception.printStackTrace()
-                        }
-                    }
+        val processedEntries = mutableSetOf<String>()
+
+        for (targetProject in projects) {
+            val shadowJarTask = targetProject.tasks.named("shadowJar", ShadowJar::class.java).get()
+
+            for (jarFile in shadowJarTask.outputs.files.files) {
+                processJarFile(jarFile, outputJar, processedEntries)
+            }
+        }
+    }
+}
+
+private fun processJarFile(
+    jarFile: File,
+    outputJar: JarOutputStream,
+    processedEntries: MutableSet<String>
+) {
+    JarFile(jarFile).use { sourceJar ->
+        for (entry in sourceJar.entries()) {
+            if (entry.isDirectory || processedEntries.contains(entry.name)) {
+                continue
+            }
+
+            try {
+                copyJarEntry(sourceJar, entry, outputJar)
+                processedEntries.add(entry.name)
+            } catch (exception: IOException) {
+                if (exception.message?.contains("duplicate entry:") != true) {
+                    throw exception
                 }
             }
         }
     }
+}
 
+private fun copyJarEntry(
+    sourceJar: JarFile,
+    entry: JarEntry,
+    outputJar: JarOutputStream
+) {
+    val entryBytes = sourceJar.getInputStream(entry).use { it.readBytes() }
+    val newEntry = JarEntry(entry.name).apply {
+        this.time = System.currentTimeMillis()
+        this.size = entryBytes.size.toLong()
+    }
+
+    outputJar.putNextEntry(newEntry)
+    outputJar.write(entryBytes)
+    outputJar.closeEntry()
 }
 
 runPaper {
-    disablePluginJarDetection()
+    this.disablePluginJarDetection()
 }
 
 tasks.runServer {
-    minecraftVersion("1.20.1")
-    dependsOn("shadowAll")
-    pluginJars = files("/build/libs/ChatFormatter v${project.version}.jar")
-}
+    minecraftVersion("1.21.10")
+    dependsOn("shadowChatFormatter")
+    pluginJars.from(layout.buildDirectory.file("libs/ChatFormatter v${project.version}.jar"))
+
+    javaLauncher.set(
+        javaToolchains.launcherFor {
+            this.languageVersion.set(JavaLanguageVersion.of(21))
+        }
+    )
+
+    downloadPlugins {
+        this.modrinth("luckperms", "v5.5.0-bukkit")
+        this.modrinth("VaultUnlocked", "2.16.0")
+    }
+}

README.md

@@ -8,7 +8,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.23")
-    implementation("com.github.johnrengelman:shadow:8.1.1")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.10")
+    implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.3.1")
     implementation("net.minecrell:plugin-yml:0.6.0")
 }

build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = "com.eternalcode"
-version = "1.1.3"
+version = "1.3.5"
 
 repositories {
     mavenCentral()
@@ -13,6 +13,7 @@ repositories {
     maven { url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/") }
     maven { url = uri("https://jitpack.io") }
     maven { url = uri("https://repo.eternalcode.pl/releases") }
+    maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots/")
 }
 
 java {

buildSrc/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("eternalcode.java")
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
 }
 
 dependencies {
@@ -10,31 +10,40 @@ dependencies {
     testImplementation("org.spigotmc:spigot-api:$spigotApiVersion")
 
     // Kyori Adventure & MiniMessage
-    val adventureVersion = "4.3.2"
-    val miniMessageVersion = "4.16.0"
-    implementation("net.kyori:adventure-platform-bukkit:$adventureVersion")
+    val adventureVersion = "4.4.1"
+    val miniMessageVersion = "4.26.1"
+    implementation("net.kyori:adventure-api:$miniMessageVersion")
     implementation("net.kyori:adventure-text-minimessage:$miniMessageVersion")
+    implementation("net.kyori:adventure-platform-bukkit:$adventureVersion")
     testImplementation("net.kyori:adventure-platform-bukkit:$adventureVersion")
     testImplementation("net.kyori:adventure-text-minimessage:$miniMessageVersion")
 
     // CDN Configs
-    val cdnVersion = "1.14.4"
+    val cdnVersion = "1.14.9"
     implementation("net.dzikoysk:cdn:$cdnVersion")
     testImplementation("net.dzikoysk:cdn:$cdnVersion")
 
     // bStats
-    implementation("org.bstats:bstats-bukkit:3.0.2")
+    implementation("org.bstats:bstats-bukkit:3.1.0")
 
     // PlaceholderAPI & Vault
-    compileOnly("me.clip:placeholderapi:2.11.5")
+    compileOnly("me.clip:placeholderapi:2.12.2")
     compileOnly("com.github.MilkBowl:VaultAPI:1.7.1")
 
     // GitCheck
     implementation("com.eternalcode:gitcheck:1.0.0")
 
     // JUnit 5
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
+    testImplementation(platform("org.junit:junit-bom:6.0.3"))
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+
+    testImplementation("org.mockito:mockito-core:5.21.0")
+    testImplementation("org.mockito:mockito-junit-jupiter:5.21.0")
+    testImplementation("me.clip:placeholderapi:2.12.2")
+    testImplementation("org.assertj:assertj-core:3.27.7")
 }
 
 tasks {

buildSrc/src/main/kotlin/eternalcode.java.gradle.kts

@@ -19,5 +19,4 @@ public static ChatFormatterApi get() {
 
         return chatFormatterAPI;
     }
-
 }