From 594562f590ee1c955214cf18bbefaeaa0cb5077f Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Mon, 13 Nov 2023 15:08:02 +0800
Subject: [PATCH] Revert "Set up Shadow for bundling DFU"

This reverts commit 2bb816674403d3d989dc1dba5db40e85d9a96649.
---
 build.gradle              | 31 ++++++++-----------------------
 gradle/libs.versions.toml |  2 --
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/build.gradle b/build.gradle
index 31a17eb04..7c8175ddc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,6 @@ plugins {
 	alias(libs.plugins.kotlin) apply false // Delay this so we can perform magic 🪄 first.
 	alias(libs.plugins.spotless)
 	alias(libs.plugins.retry)
-	alias(libs.plugins.shadow)
 }
 
 /**
@@ -92,13 +91,6 @@ configurations {
 	compileClasspath.extendsFrom bootstrap
 	runtimeClasspath.extendsFrom bootstrap
 	testRuntimeClasspath.extendsFrom bootstrap
-	bundled {
-		transitive = false
-	}
-	compileClasspath.extendsFrom bundled
-	runtimeClasspath.extendsFrom bundled
-	testCompileClasspath.extendsFrom bundled
-	testRuntimeClasspath.extendsFrom bundled
 }
 
 configurations.all {
@@ -195,7 +187,7 @@ dependencies {
 	implementation libs.mcinjector
 	implementation libs.opencsv
 	implementation libs.forge.diffpatch
-	bundled libs.datafixerupper
+	implementation libs.datafixerupper
 
 	// Forge mods.toml parsing
 	implementation libs.night.config.toml
@@ -231,13 +223,6 @@ jar {
 	from sourceSets.cfr.output.classesDirs
 	from sourceSets.fernflower.output.classesDirs
 	from sourceSets.vineflower.output.classesDirs
-	archiveClassifier = "slim"
-}
-
-shadowJar {
-	archiveClassifier = ""
-	configurations = [project.configurations.bundled]
-	relocate 'com.mojang', 'dev.architectury.loom.relocated.com.mojang'
 }
 
 base {
@@ -349,14 +334,14 @@ publishing {
 	publications {
 		if (isSnapshot) return
 
-		// Also publish a snapshot so people can use the latest version if they wish
-		snapshot(MavenPublication) { publication ->
-			groupId project.group
-			artifactId project.base.archivesName.get()
-			version baseVersion + '-SNAPSHOT'
+			// Also publish a snapshot so people can use the latest version if they wish
+			snapshot(MavenPublication) { publication ->
+				groupId project.group
+				artifactId project.base.archivesName.get()
+				version baseVersion + '-SNAPSHOT'
 
-			shadow.component(publication)
-		}
+				from components.java
+			}
 
 		// Manually crate the plugin marker for snapshot versions
 		snapshotPlugin(MavenPublication) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dd9fe50d6..8030d689b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -20,7 +20,6 @@ test-retry = "1.5.4"
 checkstyle = "10.12.2"
 codenarc = "3.3.0"
 jacoco = "0.8.10"
-shadow = "8.1.1"
 
 # Forge libraries
 forge-installer-tools = "1.2.0"
@@ -68,7 +67,6 @@ datafixerupper = { module = "com.mojang:datafixerupper", version.ref = "datafixe
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 retry = { id = "org.gradle.test-retry", version.ref = "test-retry" }
-shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
 
 [bundles]
 asm = ["asm", "asm-analysis", "asm-commons", "asm-tree", "asm-util"]