From 2409b246b3b86cf4545cb448525db87d03fa1873 Mon Sep 17 00:00:00 2001
From: makamys <makamys@outlook.com>
Date: Thu, 19 Oct 2023 06:34:39 +0200
Subject: [PATCH] Mixingasm seems to work now

---
 module-mixin/build.gradle                       | 17 +++++++++++++++++
 module-mixingasm/build.gradle                   | 13 ++++++++-----
 .../makamys/mixingasm/forge/MixingasmMod.java   |  5 +++--
 settings.gradle                                 |  2 +-
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/module-mixin/build.gradle b/module-mixin/build.gradle
index 3f999ee..383db16 100644
--- a/module-mixin/build.gradle
+++ b/module-mixin/build.gradle
@@ -282,6 +282,23 @@ flavors.each {
 	}
 }
 
+// Set outgoing artifact so Mixingasm module can depend on it
+configurations {
+	unimix {
+		canBeConsumed = true
+		canBeResolved = false
+
+		attributes {
+			// Needed to avoid an error
+			attribute(Attribute.of("unique.thingy", String), "unimix jar")
+		}
+	}
+}
+
+artifacts {
+	unimix(tasks."shadowJarUnimix")
+}
+
 // Obfuscation is useless because we're not compiling code referencing Minecraft classes
 reobfJar.enabled = false
 
diff --git a/module-mixingasm/build.gradle b/module-mixingasm/build.gradle
index 2b2a810..b9d5c51 100644
--- a/module-mixingasm/build.gradle
+++ b/module-mixingasm/build.gradle
@@ -1,6 +1,7 @@
+apply from: "${rootDir}/module-conventions.gradle"
+
 dependencies {
-	compile project(":module-mixin")
-	compile files(tasks.getByPath(":module-mixin:shadowJarUnimix").getOutputs().getFiles().getSingleFile())
+	implementation project(path: ":module-mixin", configuration: 'unimix')
 	shadow(project(":module-common")) {
 		transitive = false
 	}
@@ -11,7 +12,7 @@ archivesBaseName = archivesBaseName.replace("-1.7.10", "-mixingasm-1.7.10")
 apply plugin: "com.github.johnrengelman.shadow"
 
 shadowJar {
-	classifier = ''
+	archiveClassifier = ''
 	configurations = [project.configurations.shadow]
 
 	relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.mixingasm.repackage.common'
@@ -32,9 +33,11 @@ jar {
 	enabled = false
 }
 
+reobfJar.enabled = false
+
 ext.uniVersion = version
 version += "+" + ext.extraVersion
 
-minecraft {
-    replace("@VERSION@", extraVersion)
+tasks.injectTags.configure {
+	outputClassName.set("io.github.legacymoddingmc.unimixins.mixingasm.Tags")
 }
diff --git a/module-mixingasm/src/main/java/makamys/mixingasm/forge/MixingasmMod.java b/module-mixingasm/src/main/java/makamys/mixingasm/forge/MixingasmMod.java
index cdb26b7..d1009c5 100644
--- a/module-mixingasm/src/main/java/makamys/mixingasm/forge/MixingasmMod.java
+++ b/module-mixingasm/src/main/java/makamys/mixingasm/forge/MixingasmMod.java
@@ -1,10 +1,11 @@
 package makamys.mixingasm.forge;
 
 import cpw.mods.fml.common.Mod;
+import io.github.legacymoddingmc.unimixins.mixingasm.Tags;
 import makamys.mixingasm.Mixingasm;
 
-@Mod(modid = Mixingasm.MODID, version = "@VERSION@", acceptableRemoteVersions = "*")
-@net.minecraftforge.fml.common.Mod(modid = Mixingasm.MODID, version = "@VERSION@", acceptableRemoteVersions = "*")
+@Mod(modid = Mixingasm.MODID, version = Tags.VERSION, acceptableRemoteVersions = "*")
+@net.minecraftforge.fml.common.Mod(modid = Mixingasm.MODID, version = Tags.VERSION, acceptableRemoteVersions = "*")
 public class MixingasmMod {
 
 }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 7b8b13b..dd543dc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -19,7 +19,7 @@ pluginManagement {
 include 'module-mixin'
 // include 'module-compat'
 // include 'module-devcompat'
-// include 'module-mixingasm'
+include 'module-mixingasm'
 // include 'module-spongemixins'
 // include 'module-mixinbooterlegacy'
 // include 'module-gasstation'