From e68b11202047a79e048eeba96e37ccbc060eb5ab Mon Sep 17 00:00:00 2001
From: Ran-Mewo <43445785+Ran-Mewo@users.noreply.github.com>
Date: Fri, 17 Apr 2026 00:14:28 +1000
Subject: [PATCH] Forgix workaround

---
 buildSrc/src/main/groovy/dh-loader.gradle | 11 ++++++-----
 fabric/build.gradle                       |  4 ++--
 fabric/src/main/resources/fabric.mod.json |  2 +-
 forge/build.gradle                        |  2 +-
 forge/src/main/resources/pack.mcmeta      |  8 +++++---
 neoforge/build.gradle                     |  4 ++--
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/buildSrc/src/main/groovy/dh-loader.gradle b/buildSrc/src/main/groovy/dh-loader.gradle
index aac954d09..838e869ce 100644
--- a/buildSrc/src/main/groovy/dh-loader.gradle
+++ b/buildSrc/src/main/groovy/dh-loader.gradle
@@ -434,6 +434,7 @@ if (isNotCommonProject) {
             issues                       : rootProject.mod_issues,
             discord                      : rootProject.mod_discord,
             minecraft_version            : rootProject.minecraft_version,
+            accessWidenerVersion         : rootProject.accessWidenerVersion,
             compatible_minecraft_versions: rootProject.compatible_minecraft_versions,
             compatible_forgemc_versions  : compatible_forgemc_versions,
             java_version                 : rootProject.java_version,
@@ -464,11 +465,11 @@ if (isNotCommonProject) {
 
     // ==================== Resource Copy Tasks ====================
 
-    task copyCommonLoaderResources(type: Copy) {
-        from project(":common").file("src/main/resources/${rootProject.accessWidenerVersion}.distanthorizons.accesswidener")
-        into(file(project.file("build/resources/main")))
-        rename "${rootProject.accessWidenerVersion}.distanthorizons.accesswidener", "distanthorizons.accesswidener"
-    }
+    // task copyCommonLoaderResources(type: Copy) {
+    //     from project(":common").file("src/main/resources/${rootProject.accessWidenerVersion}.distanthorizons.accesswidener")
+    //     into(file(project.file("build/resources/main")))
+    //     rename "${rootProject.accessWidenerVersion}.distanthorizons.accesswidener", "distanthorizons.accesswidener"
+    // }
 
     task copyCoreResources(type: Copy) {
         from fileTree(project(":core").file("src/main/resources"))
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 5951c2005..24460d713 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -76,12 +76,12 @@ task deleteResources(type: Delete) {
 
 processResources {
     dependsOn(copyCoreResources)
-    dependsOn(copyCommonLoaderResources)
+    // dependsOn(copyCommonLoaderResources)
 }
 
 tasks.named('runClient') {
     dependsOn(copyCoreResources)
-    dependsOn(copyCommonLoaderResources)
+    // dependsOn(copyCommonLoaderResources)
     finalizedBy(deleteResources)
 }
 
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index db15ae4bf..36d0c1ec3 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -19,7 +19,7 @@
     "license": "LGPL-3",
     "icon": "assets/distanthorizons/icon.png",
     
-    "accessWidener": "distanthorizons.accesswidener",
+    "accessWidener": "${accessWidenerVersion}.distanthorizons.accesswidener",
     
     "environment": "*",
     "entrypoints": {
diff --git a/forge/build.gradle b/forge/build.gradle
index b28418f08..33ba45e15 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -39,7 +39,7 @@ task deleteResources(type: Delete) {
 
 tasks.register('copyAllResources') {
     dependsOn(copyCoreResources)
-    dependsOn(copyCommonLoaderResources)
+    // dependsOn(copyCommonLoaderResources)
 }
 
 processResources {
diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
index 37621f6f9..f48d006ff 100644
--- a/forge/src/main/resources/pack.mcmeta
+++ b/forge/src/main/resources/pack.mcmeta
@@ -1,10 +1,12 @@
 {
     "pack": {
-        "pack_format": 7,
+        "pack_format": 64,
         "supported_formats": {
-            "min_inclusive": 16,
+            "min_inclusive": 64,
             "max_inclusive": 90000
         },
-        "description": "Distant Horizons"
+        "description": "Distant Horizons",
+        "min_format": 64,
+        "max_format": 90000
     }
 }
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index 9809b552b..707e4ea21 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -29,12 +29,12 @@ task deleteResources(type: Delete) {
 
 processResources {
     dependsOn(copyCoreResources)
-    dependsOn(copyCommonLoaderResources)
+    // dependsOn(copyCommonLoaderResources)
 }
 
 tasks.named('runClient') {
     dependsOn(copyCoreResources)
-    dependsOn(copyCommonLoaderResources)
+    // dependsOn(copyCommonLoaderResources)
     finalizedBy(deleteResources)
 }