From c7befd191364828dd84f4bfa6e5bf0c9e08e8d73 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Wed, 5 Jun 2024 19:43:09 -0400
Subject: [PATCH] Switch to TR mixin remapping, make our custom AP incremental

---
 annotation-processor/build.gradle                              | 1 +
 .../META-INF/gradle/incremental.annotation.processors          | 1 +
 .../src/main/groovy/modernfix.mod-common-conventions.gradle    | 3 +++
 forge/build.gradle                                             | 1 -
 4 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 annotation-processor/src/main/resources/META-INF/gradle/incremental.annotation.processors

diff --git a/annotation-processor/build.gradle b/annotation-processor/build.gradle
index 223d94bc..797b62cc 100644
--- a/annotation-processor/build.gradle
+++ b/annotation-processor/build.gradle
@@ -44,6 +44,7 @@ shadowJar {
     // shadowJar bug
     include '*.jar'
     include 'META-INF/services/javax.annotation.processing.Processor'
+    include 'META-INF/gradle/incremental.annotation.processors'
     include 'org/spongepowered/asm/mixin/Mixin.class'
     include 'org/fury_phoenix/**/*'
     include {it.getName() == 'OnlyIn.class'}
diff --git a/annotation-processor/src/main/resources/META-INF/gradle/incremental.annotation.processors b/annotation-processor/src/main/resources/META-INF/gradle/incremental.annotation.processors
new file mode 100644
index 00000000..9b9cf7bc
--- /dev/null
+++ b/annotation-processor/src/main/resources/META-INF/gradle/incremental.annotation.processors
@@ -0,0 +1 @@
+org.fury_phoenix.mixinAp.annotation.MixinProcessor,aggregating
\ No newline at end of file
diff --git a/buildSrc/src/main/groovy/modernfix.mod-common-conventions.gradle b/buildSrc/src/main/groovy/modernfix.mod-common-conventions.gradle
index 2997c5cd..2607468c 100644
--- a/buildSrc/src/main/groovy/modernfix.mod-common-conventions.gradle
+++ b/buildSrc/src/main/groovy/modernfix.mod-common-conventions.gradle
@@ -6,6 +6,9 @@ plugins {
 loom {
     silentMojangMappingsLicense()
     accessWidenerPath = file("${rootDir}/common/src/main/resources/modernfix.accesswidener")
+    mixin {
+        useLegacyMixinAp = false
+    }
 }
 
 dependencies {
diff --git a/forge/build.gradle b/forge/build.gradle
index 1efefbe7..fb8c36f7 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -17,7 +17,6 @@ loom {
         mixinConfig "modernfix-common.mixins.json"
         mixinConfig "modernfix-forge.mixins.json"
     }
-    mixin.defaultRefmapName = "modernfix.refmap.json"
 }
 
 configurations {