From d9184833ec430e8ae379f01c95cb53b50319bc83 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Sun, 13 Aug 2023 15:53:20 -0400
Subject: [PATCH] Introduce MixinExtras

---
 build.gradle                                                | 1 +
 common/build.gradle                                         | 1 +
 fabric/build.gradle                                         | 1 +
 forge/build.gradle                                          | 6 +++++-
 .../platform/forge/ModernFixPlatformHooksImpl.java          | 2 ++
 gradle.properties                                           | 1 +
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5d1c67c9..6e8b099b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -94,6 +94,7 @@ allprojects {
         maven {
             url 'https://maven.terraformersmc.com/releases'
         }
+        maven { url = "https://jitpack.io" }
     }
 }
 
diff --git a/common/build.gradle b/common/build.gradle
index c067d157..ec4d9687 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -10,6 +10,7 @@ dependencies {
     // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
     // Do NOT use other classes from fabric loader
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-common:${rootProject.mixinextras_version}"))
 
     modCompileOnly("dev.latvian.mods:kubejs:${kubejs_version}") {
         transitive = false
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 42ff963d..e970eace 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -31,6 +31,7 @@ configurations {
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     testImplementation "net.fabricmc:fabric-loader-junit:${rootProject.fabric_loader_version}"
+    include(implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${rootProject.mixinextras_version}")))
 
     modCompileOnly(fabricApi.module("fabric-api-base", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
     modCompileOnly(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
diff --git a/forge/build.gradle b/forge/build.gradle
index 3769452b..98886d77 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -45,6 +45,8 @@ repositories {
 
 dependencies {
     forge "net.minecraftforge:forge:${rootProject.forge_version}"
+    shadow(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-common:${rootProject.mixinextras_version}"))
+    runtimeOnly("com.github.llamalad7.mixinextras:mixinextras-common:${rootProject.mixinextras_version}")
     // Remove the next line if you don't want to depend on the API
     // modApi "me.shedaniel:architectury-forge:${rootProject.architectury_version}"
 
@@ -93,8 +95,10 @@ shadowJar {
     exclude "fabric.mod.json"
     exclude "architectury.common.json"
 
-    configurations = [project.configurations.shadowCommon]
+    configurations = [project.configurations.shadowCommon, project.configurations.shadow]
+    relocate("com.llamalad7.mixinextras", "org.embeddedt.modernfix.forge.shadow.mixinextras")
     archiveClassifier.set("dev-shadow")
+    mergeServiceFiles()
 }
 
 remapJar {
diff --git a/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java b/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java
index 6463a58c..b75ed47f 100644
--- a/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java
+++ b/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java
@@ -3,6 +3,7 @@ package org.embeddedt.modernfix.platform.forge;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.io.Resources;
+import com.llamalad7.mixinextras.MixinExtrasBootstrap;
 import com.mojang.blaze3d.platform.NativeImage;
 import com.mojang.brigadier.CommandDispatcher;
 import cpw.mods.modlauncher.*;
@@ -195,6 +196,7 @@ public class ModernFixPlatformHooksImpl implements ModernFixPlatformHooks {
         }
 
         NightConfigFixer.monitorFileWatcher();
+        MixinExtrasBootstrap.init();
     }
 
     private Method defineClassMethod = null;
diff --git a/gradle.properties b/gradle.properties
index 0a084c03..1cb73b92 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,6 +2,7 @@
 org.gradle.jvmargs=-Xmx2G
 
 junit_version=5.10.0-M1
+mixinextras_version=0.2.0-beta.9
 
 mod_id=modernfix
 minecraft_version=1.16.5