From 74d926aff5b71a57269d83452cddcde2382b49a0 Mon Sep 17 00:00:00 2001
From: Tyler Hancock <darklime@live.ca>
Date: Fri, 24 Sep 2021 02:10:14 -0600
Subject: [PATCH 1/4] Updated Forge and Fabric to their latest versions at time
 of commit.

---
 gradle.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 2c4b67e..9127fa1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,11 +2,11 @@
 minecraft_version=1.17.1
 
 # Forge
-forge_version=37.0.13
+forge_version=37.0.70
 
 # Fabric
-fabric_version=0.37.0+1.17
-fabric_loader_version=0.11.6
+fabric_version=0.40.1+1.17
+fabric_loader_version=0.11.7
 
 # Mod options
 mod_group=com.blamejared.multiloader

From 6e8a284425d5b06869e3dca06b7be628cb833a73 Mon Sep 17 00:00:00 2001
From: Tyler Hancock <darklime@live.ca>
Date: Fri, 24 Sep 2021 02:11:13 -0600
Subject: [PATCH 2/4] Move GradleWrapper from snapshots to proper release.

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0595cf7..ffed3a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.2-20210702220150+0000-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From b7f45281db51abbd800324174bcadb0f419231a2 Mon Sep 17 00:00:00 2001
From: Tyler Hancock <darklime@live.ca>
Date: Fri, 24 Sep 2021 02:16:48 -0600
Subject: [PATCH 3/4] Remove hardcoded modid from Forge run generation.

---
 Forge/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Forge/build.gradle b/Forge/build.gradle
index 5af4923..60a50e8 100644
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -27,7 +27,7 @@ minecraft {
             workingDirectory project.file('run')
             ideaModule "${rootProject.name}.${project.name}.main"
             mods {
-                examplemod {
+                modClientRun {
                     source sourceSets.main
                     source project(":Common").sourceSets.main
                 }
@@ -38,7 +38,7 @@ minecraft {
             workingDirectory project.file('run')
             ideaModule "${rootProject.name}.${project.name}.main"
             mods {
-                examplemod {
+                modServerRun {
                     source sourceSets.main
                     source project(":Common").sourceSets.main
                 }
@@ -50,7 +50,7 @@ minecraft {
             ideaModule "${rootProject.name}.${project.name}.main"
             args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
             mods {
-                examplemod {
+                modDataRun {
                     source sourceSets.main
                     source project(":Common").sourceSets.main
                 }

From 11f7e07f2e6938923f924b3f20e2cb91de0473d0 Mon Sep 17 00:00:00 2001
From: Tyler Hancock <darklime@live.ca>
Date: Fri, 24 Sep 2021 02:40:54 -0600
Subject: [PATCH 4/4] Move Forge Access Transformers to a boolean toggle.

Also added additional information about why the path to the AT file can not be easily changed.
---
 Forge/build.gradle | 8 +++++++-
 gradle.properties  | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Forge/build.gradle b/Forge/build.gradle
index 60a50e8..b54c537 100644
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -20,7 +20,13 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(16)
 
 minecraft {
     mappings channel: 'official', version: minecraft_version
-    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
+    
+    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
+        accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+        project.logger.debug('Forge Access Transformers are enabled for this project.')
+    }
 
     runs {
         client {
diff --git a/gradle.properties b/gradle.properties
index 9127fa1..709b189 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,6 +3,7 @@ minecraft_version=1.17.1
 
 # Forge
 forge_version=37.0.70
+//forge_ats_enabled=true
 
 # Fabric
 fabric_version=0.40.1+1.17