From cf38aef742bd9cd116df8ee98caf2f6482db7804 Mon Sep 17 00:00:00 2001
From: coolGi2007 <sasanaps@hotmail.com>
Date: Sat, 23 Apr 2022 20:21:45 +1000
Subject: [PATCH] Fixed quilt running in gradle and updated quilt version

---
 1.16.5.properties   |  2 +-
 1.17.1.properties   |  2 +-
 1.18.1.properties   |  2 +-
 1.18.2.properties   |  2 +-
 fabric/build.gradle | 13 ++++++++++---
 gradle.properties   |  2 +-
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/1.16.5.properties b/1.16.5.properties
index 6d5ee998d..6c9b29555 100644
--- a/1.16.5.properties
+++ b/1.16.5.properties
@@ -43,4 +43,4 @@ forge_version=36.2.28
     enable_terraforged=2
 
 # Quilt loader
-quilt_loader_version=0.16.0-beta.8
\ No newline at end of file
+quilt_loader_version=0.16.0-beta.10
\ No newline at end of file
diff --git a/1.17.1.properties b/1.17.1.properties
index c884ffccd..cc021e036 100644
--- a/1.17.1.properties
+++ b/1.17.1.properties
@@ -43,4 +43,4 @@ forge_version=37.1.1
     enable_terraforged=0
 
 # Quilt loader
-quilt_loader_version=0.16.0-beta.8
\ No newline at end of file
+quilt_loader_version=0.16.0-beta.10
\ No newline at end of file
diff --git a/1.18.1.properties b/1.18.1.properties
index ab38d7adf..ee1a40809 100644
--- a/1.18.1.properties
+++ b/1.18.1.properties
@@ -43,4 +43,4 @@ forge_version=39.1.2
     enable_terraforged=0
 
 # Quilt loader
-quilt_loader_version=0.16.0-beta.8
\ No newline at end of file
+quilt_loader_version=0.16.0-beta.10
\ No newline at end of file
diff --git a/1.18.2.properties b/1.18.2.properties
index 4d1e5446a..8b7e6a3de 100644
--- a/1.18.2.properties
+++ b/1.18.2.properties
@@ -43,4 +43,4 @@ forge_version=40.0.18
     enable_terraforged=0
 
 # Quilt loader
-quilt_loader_version=0.16.0-beta.8
\ No newline at end of file
+quilt_loader_version=0.16.0-beta.10
\ No newline at end of file
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 3c853091c..c97beb0b1 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -41,6 +41,7 @@ dependencies {
     if (rootProject.use_quilt_rather_than_fabric == "true") {
         // Quilt loader
         modImplementation "org.quiltmc:quilt-loader:${rootProject.quilt_loader_version}"
+        modImplementation "org.quiltmc:quilt-json5:1.0.0" // Needed for quilt loader but for some reason it dosnt come with it
     } else {
         // Fabric loader
         modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
@@ -159,9 +160,15 @@ components.java {
 
 publishing {
     publications {
-        mavenFabric(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
+        if (rootProject.use_quilt_rather_than_fabric == "false") {
+            mavenFabric(MavenPublication) {
+                artifactId = rootProject.archives_base_name + "-" + project.name
+                from components.java
+            }
+        } else {
+            mavenJava(MavenPublication) {
+                from components.java
+            }
         }
     }
 
diff --git a/gradle.properties b/gradle.properties
index 55583e6b1..7d01105b4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ maven_group=com.seibel.lod
 archives_base_name=DistantHorizons
 
 # Switch fabric to quilt on the fabric folder
-use_quilt_rather_than_fabric=false
+use_quilt_rather_than_fabric=true
 
 # Mod info
 mod_version=1.6.3a-dev