From 8161c0d08e134f709829212cec1a2608ac7a595d Mon Sep 17 00:00:00 2001
From: Yeregorix <yeregorixcraft@gmail.com>
Date: Sat, 11 Jan 2025 00:12:23 +0100
Subject: [PATCH] Ship mixinextras-forge on SpongeForge

---
 build.gradle.kts                 | 2 +-
 forge/build.gradle.kts           | 2 +-
 gradle/libs.versions.toml        | 3 ++-
 gradle/verification-metadata.xml | 8 ++++++++
 vanilla/build.gradle.kts         | 2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c7679b29296..f42a302a8d5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -122,7 +122,7 @@ dependencies {
         exclude(group = "org.apache.commons", module = "commons-lang3")
     }
     launchConfig(libs.mixin)
-    launchConfig(libs.mixinextras)
+    launchConfig(libs.mixinextras.common)
     launchConfig(apiLibs.checkerQual)
     launchConfig(libs.guava) {
         exclude(group = "com.google.code.findbugs", module = "jsr305") // We don't want to use jsr305, use checkerframework
diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
index facb491c615..4d72d0292ed 100644
--- a/forge/build.gradle.kts
+++ b/forge/build.gradle.kts
@@ -216,13 +216,13 @@ dependencies {
         exclude(group = "org.spongepowered", module = "configurate-core")
         exclude(group = "org.checkerframework", module = "checker-qual")
     }
-    service(libs.mixinextras)
 
     val game = gameLibrariesConfig.name
     game("org.spongepowered:spongeapi:$apiVersion")
     game(libs.javaxInject)
     game(platform(apiLibs.adventure.bom))
     game(libs.adventure.serializerConfigurate4)
+    game(libs.mixinextras.forge)
 
     val serviceShadedLibraries = serviceShadedLibrariesConfig.name
     serviceShadedLibraries(project(transformersProject.path)) { isTransitive = false }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 05eece1265f..844932c668c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -55,7 +55,8 @@ configurate-jackson = { module = "org.spongepowered:configurate-jackson" } # ver
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 javaxInject = { module = "javax.inject:javax.inject", version = "1" }
 mixin = { module = "org.spongepowered:mixin", version.ref = "mixin" }
-mixinextras = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixinextras" }
+mixinextras-common = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixinextras" }
+mixinextras-forge = { module = "io.github.llamalad7:mixinextras-forge", version.ref = "mixinextras" }
 mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 mockito-junitJupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 8245c20b334..3e2bb2b9968 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -1767,6 +1767,14 @@
             <sha256 value="bc224bc9bb3c376b76a673e146f548dfb5152b15f2cf0a1f1df697cf1a3acc9e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.github.llamalad7" name="mixinextras-forge" version="0.4.1">
+         <artifact name="mixinextras-forge-0.4.1.jar">
+            <sha256 value="9d48cb0a40299d283248fdad8b02c6d175c45b27f9bec48ef63d7ee8a4ee3066" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="mixinextras-forge-0.4.1.pom">
+            <sha256 value="8c3bc9fd591bc79e46cbc93e917cb718af952d1539f44cc9599c6299f2c778d5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.github.llamalad7" name="mixinextras-neoforge" version="0.4.1">
          <artifact name="mixinextras-neoforge-0.4.1.jar">
             <sha256 value="9f9b6b2b1a2f376a1d62489fc8d928338d5798d69d329d2b3af7f84e420e90e9" origin="Generated by Gradle"/>
diff --git a/vanilla/build.gradle.kts b/vanilla/build.gradle.kts
index c7b61566fb2..0dad28c1732 100644
--- a/vanilla/build.gradle.kts
+++ b/vanilla/build.gradle.kts
@@ -227,7 +227,7 @@ dependencies {
     }
 
     boot(libs.mixin)
-    boot(libs.mixinextras)
+    boot(libs.mixinextras.common)
     boot(libs.asm.tree)
     boot(libs.guava) {
         exclude(group = "com.google.errorprone", module = "error_prone_annotations")