[FIX] Add JarJar

Author: makeevrserg

docker-compose.yml

@@ -1,8 +1,8 @@
 services:
-  # For command call use `docker exec mc_docker_mbridge rcon-cli <your_command>`
-  mc_docker_mbridge:
+  # For command call use `docker exec mc_docker_soulkeeper rcon-cli <your_command>`
+  mc_docker_soulkeeper:
     restart: no
-    container_name: mc_docker_mbridge
+    container_name: mc_docker_soulkeeper
     image: itzg/minecraft-server # https://github.com/itzg/docker-minecraft-server
     tty: true
     stdin_open: true
@@ -20,17 +20,17 @@ services:
       #      VERSION: "1.20.1"
       #      NEOFORGE_VERSION: "21.1.129"
       # Forge --------------------
-#      TYPE: FORGE
-#      VERSION: "1.20.1"
-#      FORGE_VERSION: "47.4.12"
+      TYPE: FORGE
+      VERSION: "1.20.1"
+      FORGE_VERSION: "47.4.12"
       # Paper --------------------
-      TYPE: PAPER
-      VERSION: 1.21.8
+#      TYPE: PAPER
+#      VERSION: 1.21.8
       # Custom -------------------
     #      CUSTOM_SERVER: https://api.papermc.io/v2/projects/paper/versions/1.21.1/builds/121/downloads/paper-1.21.1-121.jar
     volumes:
-#      - ./build/forge:/data # Forge
+      - ./build/forge:/data # Forge
 #      - ./build/neoforge:/data # NeoForge
-      - ./build/bukkit:/data # Bukkit/Paper/Spigot
+#      - ./build/bukkit:/data # Bukkit/Paper/Spigot
 #      - ./build/velocity:/data # Velocity
 #      - ./build/fabric:/data # Fabric

gradle.properties

@@ -13,7 +13,7 @@ klibs.java.ktarget=21
 # Project
 klibs.project.name=SoulKeeper
 klibs.project.group=ru.astrainteractive.soulkeeper
-klibs.project.version.string=1.8.2
+klibs.project.version.string=1.8.3
 klibs.project.description=Keep your items after death
 klibs.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
 klibs.project.url=https://github.com/Astra-Interactive/SoulKeeper

gradle/libs.versions.toml

@@ -41,6 +41,7 @@ minecraft-fabric-loom = "1.16.1"
 minecraft-fabric-yarn = "1.20.1+build.10"
 minecraft-forge-bus="6.0.5"
 minecraft-forgegradle = "7.0.25"
+minecraft-forge-jarjar = "0.2.3"
 minecraft-forgerenamer = "1.0.14"
 minecraft-forgeversion = "1.20.1-47.4.12"
 minecraft-kyori = "5.0.1"
@@ -159,6 +160,7 @@ tests-turbine = { module = "app.cash.turbine:turbine", version.ref = "tests-turb
 gradle-buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "gradle-buildconfig" }
 gradle-fabric-loom = { id = "fabric-loom", version.ref = "minecraft-fabric-loom" }
 gradle-forgegradle = { id = "net.minecraftforge.gradle", version.ref = "minecraft-forgegradle" }
+gradle-forge-jarjar = { id = "net.minecraftforge.jarjar", version.ref = "minecraft-forge-jarjar" }
 gradle-forgerenamer = { id = "net.minecraftforge.renamer", version.ref = "minecraft-forgerenamer" }
 gradle-ftp = { id = "ru.astrainteractive.ftpplugin.gradleftp", version.ref = "gradle-ftp" }
 gradle-neoforgegradle = { id = "net.neoforged.gradle.userdev", version.ref = "minecraft-neoforgegradle" }

instances/forge/build.gradle.kts

@@ -1,4 +1,6 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import net.minecraftforge.jarjar.gradle.JarJar
+import net.minecraftforge.jarjar.gradle.JarJarDependencyMethods
 import ru.astrainteractive.gradleplugin.property.util.requireProjectInfo
 
 plugins {
@@ -10,6 +12,7 @@ plugins {
     alias(libs.plugins.gradle.forgerenamer)
     alias(libs.plugins.gradle.shadow)
     alias(libs.plugins.klibs.minecraft.resource.processor)
+    alias(libs.plugins.gradle.forge.jarjar)
 }
 
 repositories {
@@ -31,7 +34,6 @@ dependencies {
     shadow(libs.klibs.mikro.core)
     shadow(libs.klibs.kstorage)
     shadow(libs.driver.h2)
-    shadow(libs.driver.jdbc)
     shadow(libs.minecraft.kyori.plain)
     shadow(libs.minecraft.kyori.legacy)
     shadow(libs.minecraft.kyori.gson)
@@ -55,9 +57,21 @@ minecraftProcessResource {
     )
 }
 
+jarJar {
+    register()
+}
+
 val shadowJar by tasks.getting(ShadowJar::class) {
     mergeServiceFiles()
     dependsOn(tasks.named<ProcessResources>("processResources"))
+    dependsOn(tasks.withType<JarJar>())
+    from(
+        tasks.withType<JarJar>()
+            .map { task -> task.archiveFile }
+            .map { archiveFile -> project.zipTree(archiveFile) },
+        { include("META-INF/jarjar/**") }
+    )
+
     configurations = listOf(project.configurations.shadow.get())
     isReproducibleFileOrder = true
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
@@ -85,10 +99,11 @@ val shadowJar by tasks.getting(ShadowJar::class) {
         exclude("org/jetbrains/annotations/**")
         exclude("org/slf4j/**")
         exclude("org/w3c/dom/**")
+        exclude("org/jspecify/annotations/**")
         // Root
         if (project.name == "forge" || project.name == "neoforge") {
             // Use kotlin-neoforge or kotlin-forge
-//            exclude("kotlin/**")
+            exclude("kotlin/**")
         }
         exclude("_COROUTINE/**")
         exclude("DebugProbesKt.bin")
@@ -124,6 +139,7 @@ val shadowJar by tasks.getting(ShadowJar::class) {
         exclude("org/slf4j/**")
         exclude("javax/xml/**")
         exclude("org/xml/**")
+        exclude("org/sqlite/**")
         // META
         exclude("META-INF/**.md")
         exclude("META-INF/**.MD")
@@ -209,11 +225,10 @@ val shadowJar by tasks.getting(ShadowJar::class) {
         }
         add("org.intellij")
         add("org.jetbrains.annotations")
-//        add("org.jetbrains.exposed") // Don't relocate on: [*]
+        add("org.jetbrains.exposed") // Don't relocate on: [*]
         add("org.jetbrains.kotlinx")
         add("org.json")
         add("org.json")
-//        add("org.sqlite")
         add("org.telegram")
         add("org.telegram.telegrambots")
         add("org.w3c.css")
@@ -231,6 +246,9 @@ minecraft {
 
 dependencies {
     compileOnly(minecraft.dependency(libs.minecraft.forgeversion.get()))
+    "jarJar"(libs.driver.jdbc) {
+        JarJarDependencyMethods.getJarJar(this).setVersion(libs.versions.driver.jdbc)
+    }
 }
 
 renamer {