From 838d82589be00bdadd72ea4b51d09b8820ca06ba Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Sun, 4 Feb 2024 21:27:22 -0600
Subject: [PATCH] Fix Forge 1.20.4 compiling, but not gradle running

---
 forge/build.gradle                            | 19 ++++++++++++++++++-
 .../{pack.mcmeta.ignored => pack.mcmeta}      |  0
 versionProperties/1.20.4.properties           |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)
 rename forge/src/main/resources/{pack.mcmeta.ignored => pack.mcmeta} (100%)

diff --git a/forge/build.gradle b/forge/build.gradle
index 660022115..5ed383e22 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -73,4 +73,21 @@ sourcesJar {
 //    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
 //        skip()
 //    }
-//}
\ No newline at end of file
+//}
+
+
+
+// TODO this was specifically added for MC 1.20.4 should it be enabled for anything below MC 1.20.4?
+// source: https://github.com/MinecraftForge/MinecraftForge/blob/5d0047753dfac0caaf5d97cc3f5c9a8b0990cb44/mdk/build.gradle#L209-L217
+//
+// Merge the resources and classes into the same directory. 
+// This is done because java expects modules to be in a single directory.
+// And if we have it in multiple we have to do performance intensive hacks like having the UnionFileSystem
+// This will eventually be migrated to ForgeGradle so modders don't need to manually do it. But that is later.
+sourceSets.each {
+    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
+    //println "source name " + it.name // as of 2024-2-4 "it.name" only returned "main" and "test"
+    it.output.resourcesDir = dir
+    it.java.destinationDirectory = dir
+}
+
diff --git a/forge/src/main/resources/pack.mcmeta.ignored b/forge/src/main/resources/pack.mcmeta
similarity index 100%
rename from forge/src/main/resources/pack.mcmeta.ignored
rename to forge/src/main/resources/pack.mcmeta
diff --git a/versionProperties/1.20.4.properties b/versionProperties/1.20.4.properties
index 315f01d8d..3efdf77f9 100644
--- a/versionProperties/1.20.4.properties
+++ b/versionProperties/1.20.4.properties
@@ -4,7 +4,7 @@ minecraft_version=1.20.4
 parchment_version=1.20.2:2023.12.10
 compatible_minecraft_versions=["1.20.3", "1.20.4"]
 accessWidenerVersion=1_20_2
-builds_for=fabric,neoforge
+builds_for=fabric,neoforge,forge
 
 # Fabric loader
 fabric_loader_version=0.15.1