From 4c525cbedc1d6797fcd03e86bfe4d9bf8942884a Mon Sep 17 00:00:00 2001
From: DerToaster98 <38782719+DerToaster98@users.noreply.github.com>
Date: Tue, 7 Nov 2023 20:29:12 +0100
Subject: [PATCH] use JarJar instead of shadowing

---
 build.gradle      | 22 ++--------------------
 gradle.properties |  2 --
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6d1c0ca..5b19320 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,6 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'org.parchmentmc.librarian.forgegradle' version "${parchmentmc_version}"
-    id 'com.github.johnrengelman.shadow' version "${shadow_version}"
 }
 
 version = "${mc_version}-${mod_version}"
@@ -15,10 +14,6 @@ base {
     archivesName = modid
 }
 
-configurations {
-    shade
-}
-
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
@@ -117,7 +112,7 @@ dependencies {
     // Dependencies (Embedded)
     implementation fg.deobf("commoble.databuddy:${databuddy_branch}:${databuddy_version}")
 
-    shade fg.deobf("commoble.databuddy:${databuddy_branch}:${databuddy_version}")
+	jarJar(group: 'commoble.databuddy', name: "${databuddy_branch}", version: "[${databuddy_version},)")
 
     // Dependencies (Optional)
     implementation fg.deobf("software.bernie.geckolib:geckolib-forge-${geckolib_version}")
@@ -140,15 +135,7 @@ dependencies {
     runtimeOnly fg.deobf("squeek.appleskin:appleskin-forge:${appleskin_version}")
 }
 
-shadowJar {
-	archiveClassifier = ''
-	configurations = [project.configurations.shade]
-	relocate 'commoble.databuddy', "${mod_group}.shadow.commoble.databuddy"
-}
-
-reobf {
-    shadowJar { }
-}
+jarJar.enable()
 
 createMcpToSrg {
     outputs.upToDateWhen {false}
@@ -169,8 +156,6 @@ mixin {
     debug = true
 }
 
-tasks.build.dependsOn reobfShadowJar
-
 tasks.named('processResources', ProcessResources).configure {
     var replaceProperties = [
             mc_version: mc_version, mc_version_range: mc_version_range,
@@ -205,11 +190,8 @@ tasks.named('jar', Jar).configure {
                 'MixinConfigs'		  	  : "${modid}.mixins.json"
         ])
     }
-    finalizedBy('reobfJar')
 }
 
-jar.finalizedBy(reobfShadowJar)
-
 publishing {
     publications {
         mavenJava(MavenPublication) {
diff --git a/gradle.properties b/gradle.properties
index b342bb6..d87285a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,8 +30,6 @@ parchmentmc_version=1.+
 mixin_version=0.8.5
 mixingradle_version=0.7-SNAPSHOT
 
-shadow_version=7.1.2
-
 # Dependencies (Embedded)
 databuddy_branch=databuddy-1.20.1
 databuddy_version=4.0.0.0