From 5f1d325dd96137b514d112b8e0c041685e6906dd Mon Sep 17 00:00:00 2001
From: Big-Iron-Cheems <52252627+Big-Iron-Cheems@users.noreply.github.com>
Date: Mon, 14 Apr 2025 18:56:12 +0200
Subject: [PATCH 1/4] Remove Shadow JAR dependency

---
 build.gradle.kts        | 28 +++++-----------------------
 launch/build.gradle.kts |  2 +-
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 72b64de9f2..7f98d27218 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("fabric-loom") version "1.10-SNAPSHOT"
     id("maven-publish")
-    id("com.gradleup.shadow") version "9.0.0-beta11"
 }
 
 base {
@@ -65,7 +64,7 @@ configurations {
     implementation.configure {
         extendsFrom(library)
     }
-    shadow.configure {
+    include.configure {
         extendsFrom(library)
     }
 }
@@ -102,7 +101,7 @@ dependencies {
     library("de.florianmichael:WaybackAuthLib:${properties["waybackauthlib_version"] as String}")
 
     // Launch sub project
-    shadow(project(":launch"))
+    include(project(":launch"))
 }
 
 loom {
@@ -140,6 +139,9 @@ tasks {
             rename { "${it}_${licenseSuffix}" }
         }
 
+        dependsOn(":launch:compileJava")
+        from(project(":launch").layout.buildDirectory.dir("classes/java/main"))
+
         manifest {
             attributes["Main-Class"] = "meteordevelopment.meteorclient.Main"
         }
@@ -161,26 +163,6 @@ tasks {
         options.compilerArgs.add("-Xlint:unchecked")
     }
 
-    shadowJar {
-        configurations = listOf(project.configurations.shadow.get())
-
-        val licenseSuffix = project.base.archivesName.get()
-        from("LICENSE") {
-            rename { "${it}_${licenseSuffix}" }
-        }
-
-        dependencies {
-            exclude {
-                it.moduleGroup == "org.slf4j"
-            }
-        }
-    }
-
-    remapJar {
-        dependsOn(shadowJar)
-        inputFile.set(shadowJar.get().archiveFile)
-    }
-
     javadoc {
         with(options as StandardJavadocDocletOptions) {
             addStringOption("Xdoclint:none", "-quiet")
diff --git a/launch/build.gradle.kts b/launch/build.gradle.kts
index 27b1651a09..e9ae62714c 100644
--- a/launch/build.gradle.kts
+++ b/launch/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("java")
+    id("java-library")
 }
 
 group = "meteordevelopment"

From 3470f05cf6b68b12dbfaf1bd4d0f4465fb93b58d Mon Sep 17 00:00:00 2001
From: Big-Iron-Cheems <52252627+Big-Iron-Cheems@users.noreply.github.com>
Date: Wed, 16 Apr 2025 15:52:55 +0200
Subject: [PATCH 2/4] Remove subproject include

---
 build.gradle.kts        | 4 +---
 launch/build.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7f98d27218..62a4e2afc2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -99,9 +99,6 @@ dependencies {
     library("io.netty:netty-handler-proxy:${properties["netty_version"] as String}") { isTransitive = false }
     library("io.netty:netty-codec-socks:${properties["netty_version"] as String}") { isTransitive = false }
     library("de.florianmichael:WaybackAuthLib:${properties["waybackauthlib_version"] as String}")
-
-    // Launch sub project
-    include(project(":launch"))
 }
 
 loom {
@@ -139,6 +136,7 @@ tasks {
             rename { "${it}_${licenseSuffix}" }
         }
 
+        // Launch sub project
         dependsOn(":launch:compileJava")
         from(project(":launch").layout.buildDirectory.dir("classes/java/main"))
 
diff --git a/launch/build.gradle.kts b/launch/build.gradle.kts
index e9ae62714c..27b1651a09 100644
--- a/launch/build.gradle.kts
+++ b/launch/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("java-library")
+    id("java")
 }
 
 group = "meteordevelopment"

From f3e7e7017b5d6250f32a14bf60103dd5a2c6ef6f Mon Sep 17 00:00:00 2001
From: Big-Iron-Cheems <52252627+Big-Iron-Cheems@users.noreply.github.com>
Date: Wed, 16 Apr 2025 15:59:07 +0200
Subject: [PATCH 3/4] Remove now unused include config

---
 build.gradle.kts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 62a4e2afc2..a0bee700e2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -56,17 +56,11 @@ configurations {
     modImplementation.configure {
         extendsFrom(modInclude)
     }
-    include.configure {
-        extendsFrom(modInclude)
-    }
 
     // include libraries
     implementation.configure {
         extendsFrom(library)
     }
-    include.configure {
-        extendsFrom(library)
-    }
 }
 
 dependencies {

From a5d933f17887467bac9996b43e12d10c14ec530b Mon Sep 17 00:00:00 2001
From: Big-Iron-Cheems <52252627+Big-Iron-Cheems@users.noreply.github.com>
Date: Fri, 18 Apr 2025 15:08:33 +0200
Subject: [PATCH 4/4] Revert "Remove now unused include config"

This reverts commit f3e7e7017b5d6250f32a14bf60103dd5a2c6ef6f.
---
 build.gradle.kts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index a0bee700e2..62a4e2afc2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -56,11 +56,17 @@ configurations {
     modImplementation.configure {
         extendsFrom(modInclude)
     }
+    include.configure {
+        extendsFrom(modInclude)
+    }
 
     // include libraries
     implementation.configure {
         extendsFrom(library)
     }
+    include.configure {
+        extendsFrom(library)
+    }
 }
 
 dependencies {