From e06962c125a0d0413d76542dc656d6b78439659b Mon Sep 17 00:00:00 2001
From: Tschipp <11649893+Tschipp@users.noreply.github.com>
Date: Wed, 1 Feb 2023 18:28:10 +0100
Subject: [PATCH] Fixed MixinExtras by using JarJar

---
 Forge/build.gradle | 22 ++++++----------------
 gradle.properties  |  4 ++--
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/Forge/build.gradle b/Forge/build.gradle
index 31d86e5..e063339 100644
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -30,6 +30,8 @@ if (System.getenv('BUILD_NUMBER') != null) {
     version += "." + System.getenv('BUILD_NUMBER')
 }
 
+jarJar.enable()
+
 archivesBaseName = "${mod_id}-forge-${minecraft_version}"
 
 mixin {
@@ -100,11 +102,6 @@ minecraft {
 
 sourceSets.main.resources.srcDir 'src/generated/resources'
 
-configurations {
-    shade
-    implementation.extendsFrom shade
-}
-
 repositories {
     maven {
         url 'https://maven.blamejared.com'
@@ -121,7 +118,9 @@ dependencies {
     compileOnly project(":Common")
     implementation fg.deobf("net.darkhax.gamestages:GameStages-Forge-1.19.2:11.0.2")
     implementation fg.deobf("net.darkhax.bookshelf:Bookshelf-Forge-1.19.2:16.1.9")
-    minecraftLibrary(annotationProcessor(shade(("com.github.LlamaLad7:MixinExtras:${mixinextras_version}"))))
+    minecraftLibrary("com.github.LlamaLad7:MixinExtras:${mixinextras_version}")
+    jarJar(group: 'com.github.LlamaLad7', name: 'MixinExtras', version: "[${mixinextras_version},)")
+    annotationProcessor("com.github.LlamaLad7:MixinExtras:${mixinextras_version}")
     annotationProcessor 'org.spongepowered:mixin:0.8.4-SNAPSHOT:processor'
 
     fileTree("libs").matching {
@@ -135,17 +134,8 @@ dependencies {
     }
 }
 
-shadowJar {
-    configurations = [project.configurations.shade]
-    relocate 'com.llamalad7.mixinextras', 'tschipp.carryon.shaded.mixinextras'
-    finalizedBy 'reobfShadowJar'
-    archiveClassifier = ""
-}
-
-assemble.dependsOn shadowJar
-
 reobf {
-    shadowJar {}
+    jarJar {}
 }
 
 tasks.withType(JavaCompile) {
diff --git a/gradle.properties b/gradle.properties
index 2fc8cf4..79f74aa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 # Project
-version=2.0.4
+version=2.0.5
 group=tschipp.carryon
 
 # Common
@@ -30,4 +30,4 @@ mod_id=carryon
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-mixinextras_version=0.2.0-beta.1
\ No newline at end of file
+mixinextras_version=0.1.1
\ No newline at end of file