From 531f251168d885534fc605d7bcf244a09a87739f Mon Sep 17 00:00:00 2001
From: Jared <jaredlll08@gmail.com>
Date: Sun, 11 Jun 2023 03:27:39 +0200
Subject: [PATCH] AccessTransformers and AccessWideners now apply if the file
 is present

AccessWideners are shared on common and fabric, since you will most likely need them in common anyway, and they are faster to apply than AccessTransformers
---
 common/build.gradle |  3 +++
 fabric/build.gradle |  3 +++
 forge/build.gradle  | 10 +++++-----
 gradle.properties   |  1 -
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/common/build.gradle b/common/build.gradle
index 9bd4dc7..47e6775 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -9,6 +9,9 @@ archivesBaseName = "${mod_name}-common-${minecraft_version}"
 
 minecraft {
     version(minecraft_version)
+    if(file("src/main/resources/${mod_id}.accesswidener").exists()){
+        accessWideners(file("src/main/resources/${mod_id}.accesswidener"))
+    }
 }
 
 dependencies {
diff --git a/fabric/build.gradle b/fabric/build.gradle
index f4a766b..da28214 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -17,6 +17,9 @@ dependencies {
 }
 
 loom {
+    if(project(":common").file("src/main/resources/${mod_id}.accesswidener").exists()){
+        accessWidenerPath.set(project(":common").file("src/main/resources/${mod_id}.accesswidener"))
+    }
     mixin {
         defaultRefmapName.set("${mod_id}.refmap.json")
     }
diff --git a/forge/build.gradle b/forge/build.gradle
index 6f3d0c4..141f44e 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -16,12 +16,12 @@ mixin {
 
 minecraft {
     mappings channel: 'official', version: minecraft_version
-    
-    if (project.hasProperty('forge_ats_enabled') && project.findProperty('forge_ats_enabled').toBoolean()) {
-        // This location is hardcoded in Forge and can not be changed.
-        // https://github.com/MinecraftForge/MinecraftForge/blob/be1698bb1554f9c8fa2f58e32b9ab70bc4385e60/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java#L123
+
+    // Automatically enable forge AccessTransformers if the file exists
+    // This location is hardcoded in Forge and can not be changed.
+    // https://github.com/MinecraftForge/MinecraftForge/blob/be1698bb1554f9c8fa2f58e32b9ab70bc4385e60/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java#L123
+    if (file('src/main/resources/META-INF/accesstransformer.cfg').exists()) {
         accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
-        project.logger.debug('Forge Access Transformers are enabled for this project.')
     }
 
     runs {
diff --git a/gradle.properties b/gradle.properties
index b777390..dfc5493 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,6 @@ minecraft_version=1.19.3
 
 # Forge
 forge_version=44.0.1
-//forge_ats_enabled=true
 
 # Fabric
 fabric_version=0.68.1+1.19.3