From cdbfad060b8d1e7020ae0d4123ba66afc2aae64e Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Mon, 27 Feb 2023 20:41:45 -0600
Subject: [PATCH] Fix gradle mystery compiler error

Specifically fixes core gradle being unable to access packages found in API
---
 coreSubProjects     |  2 +-
 fabric/build.gradle | 46 ++++++++++++++++++++++-----------------------
 gradle.properties   |  2 +-
 settings.gradle     |  4 ++--
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/coreSubProjects b/coreSubProjects
index 1234e47f5..42d3e38da 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 1234e47f559ad047fe83a296af91b792e6592e1a
+Subproject commit 42d3e38daa8b2cf83a7ec7003764bef9da9564f2
diff --git a/fabric/build.gradle b/fabric/build.gradle
index cccfdbc9b..8bdd83992 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -120,24 +120,24 @@ dependencies {
     shadowMe(project(path: ":api")) { transitive false }
 }
 
-shadowJar {
-    configurations = [project.configurations.shadowCommon, project.configurations.shadowMe, project.configurations.customModule]
-    relocate 'com.seibel.lod.common', 'loaderCommon.fabric.com.seibel.lod.common'
-
-    // Compression
-    relocate 'org.tukaani', 'distanthorizons.libraries.tukaani'
-
-    // NightConfig (includes Toml & Json)
-    relocate 'com.electronwill.nightconfig', 'distanthorizons.libraries.electronwill.nightconfig'
-
-    // Theming
-    relocate 'com.formdev.flatlaf', 'distanthorizons.libraries.formdev.flatlaf'
-
-    // SVG
-    relocate 'com.kitfox.svg', 'distanthorizons.libraries.kitfox.svg'
-
-    mergeServiceFiles()
-}
+//shadowJar {
+//    configurations = [project.configurations.shadowCommon, project.configurations.shadowMe, project.configurations.customModule]
+//    relocate 'com.seibel.lod.common', 'loaderCommon.fabric.com.seibel.lod.common'
+//
+//    // Compression
+//    relocate 'org.tukaani', 'distanthorizons.libraries.tukaani'
+//
+//    // NightConfig (includes Toml & Json)
+//    relocate 'com.electronwill.nightconfig', 'distanthorizons.libraries.electronwill.nightconfig'
+//
+//    // Theming
+//    relocate 'com.formdev.flatlaf', 'distanthorizons.libraries.formdev.flatlaf'
+//
+//    // SVG
+//    relocate 'com.kitfox.svg', 'distanthorizons.libraries.kitfox.svg'
+//
+//    mergeServiceFiles()
+//}
 
 
 task deleteResources(type: Delete) {
@@ -166,11 +166,11 @@ sourcesJar {
     from commonSources.archiveFile.map { zipTree(it) }
 }
 
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
+//components.java {
+//    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+//        skip()
+//    }
+//}
 
 publishing {
     publications {
diff --git a/gradle.properties b/gradle.properties
index 5b6e8bd59..353f8b4ba 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ mod_issues=https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues
 mod_discord=https://discord.gg/xAB8G4cENx
 
 # Global Plugin Versions
-manifold_version=+
+manifold_version=2023.1.0
 toml_version=3.6.4
 nightconfig_version=3.6.6
 flatlaf_version=2.3
diff --git a/settings.gradle b/settings.gradle
index 12838bfde..deb699eec 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -77,8 +77,8 @@ include("common")
 // Enables or disables the subprojects depending on whats in the version.properties
 if (gradle.builds_for.contains("fabric"))
     include("fabric")
-if (gradle.builds_for.contains("quilt"))
-    include("quilt") // Just put this here for once we need it ;)
+//if (gradle.builds_for.contains("quilt"))
+//    include("quilt") // Just put this here for once we need it ;)
 //if (gradle.builds_for.contains("forge"))
 //    include("forge")