From 435472085dbee40fbec6b29e97d6bd8ab4ab42d3 Mon Sep 17 00:00:00 2001
From: Michael Primm <mprimm@mirificsystems.com>
Date: Sun, 2 Jun 2024 20:57:16 -0500
Subject: [PATCH] Fix Forge 1.20.6 build

---
 forge-1.20.6/build.gradle                   | 21 +++------------------
 forge-1.20.6/src/main/resources/pack.mcmeta |  2 +-
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/forge-1.20.6/build.gradle b/forge-1.20.6/build.gradle
index 38107ccb..58413c93 100644
--- a/forge-1.20.6/build.gradle
+++ b/forge-1.20.6/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '[6.0.24,6.2)', changing: true
     }
 }
 apply plugin: 'net.minecraftforge.gradle'
@@ -27,6 +27,8 @@ ext.buildNumber = System.getenv().BUILD_NUMBER ?: "Dev"
 minecraft {
     mappings channel: 'official', version: '1.20.6'
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+    reobf = false
+    copyIdeResources = true
     runs {
         server {
             workingDirectory project.file('run').canonicalPath
@@ -73,21 +75,4 @@ shadowJar.doLast {
         ant.checksum file: task.archivePath
 }
 
-afterEvaluate {
-reobf {
-    shadowJar {
-        mappings = createMcpToSrg.output
-    }
-}
-}
-
-task deobfJar(type: Jar) {
-    from sourceSets.main.output
-    archiveClassifier = 'dev'
-}
-
-artifacts {
-    archives deobfJar
-}
-
 build.dependsOn(shadowJar)
diff --git a/forge-1.20.6/src/main/resources/pack.mcmeta b/forge-1.20.6/src/main/resources/pack.mcmeta
index 7ea476d3..64ff3854 100644
--- a/forge-1.20.6/src/main/resources/pack.mcmeta
+++ b/forge-1.20.6/src/main/resources/pack.mcmeta
@@ -3,6 +3,6 @@
         "description": {
            "text": "Dynmap resources"
         },
-        "pack_format": 32
+        "pack_format": 22
     }
 }