From 79ba86d8c23eb3a30a37bcf3fc2c701648c27995 Mon Sep 17 00:00:00 2001
From: coolGi <sasanaps@hotmail.com>
Date: Sun, 12 Feb 2023 20:45:57 +1030
Subject: [PATCH] New Build system now works as good as the old build system
 (forge still broken)

---
 build.gradle                        | 1 +
 common/build.gradle                 | 2 +-
 coreSubProjects                     | 2 +-
 fabric/build.gradle                 | 2 ++
 forge/build.gradle                  | 2 ++
 versionProperties/1.18.2.properties | 4 ++--
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index ca4daf114..62dce0933 100644
--- a/build.gradle
+++ b/build.gradle
@@ -235,6 +235,7 @@ subprojects { p ->
 
     // Adds the standalone jar's entrypoint
     jar {
+        from "LICENSE.txt"
         manifest {
             attributes 'Implementation-Title': rootProject.mod_name,
                     'Implementation-Version': rootProject.mod_version,
diff --git a/common/build.gradle b/common/build.gradle
index 9d87530b4..d23ba8513 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 minecraft {
-    accessWideners(project(":common").file("src/main/resources/${rootProject.accessWidenerVersion}.lod.accesswidener"))
+    accessWideners(project(":common").file("src/main/resources/${accessWidenerVersion}.lod.accesswidener"))
     version(rootProject.minecraft_version)
 }
 
diff --git a/coreSubProjects b/coreSubProjects
index 5ec91475a..0c6e62040 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 5ec91475a4f0301d06bcb99fadf7f21e252d99ac
+Subproject commit 0c6e62040653d0d3bc513059e168715b4dded797
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 5267d720e..10abedf5c 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -5,6 +5,8 @@ plugins {
 loom {
     // FIXME: AccessWidener
     accessWidenerPath = project(":common").file("src/main/resources/${accessWidenerVersion}.lod.accesswidener")
+
+    // "runs" isn't required, but when we do need it then it can be useful
     runs {
         client {
             client()
diff --git a/forge/build.gradle b/forge/build.gradle
index 7f31e14e9..07bcf04f8 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -15,6 +15,8 @@ apply plugin: "net.minecraftforge.gradle"
 apply plugin: "org.parchmentmc.librarian.forgegradle"
 apply plugin: "org.spongepowered.mixin"
 
+// TODO: Check accessWidener works fine
+
 mixin {
     add sourceSets.main, "DistantHorizons.refmap.json"
 
diff --git a/versionProperties/1.18.2.properties b/versionProperties/1.18.2.properties
index 1451fb35c..6bf4a7397 100644
--- a/versionProperties/1.18.2.properties
+++ b/versionProperties/1.18.2.properties
@@ -7,8 +7,8 @@ accessWidenerVersion=1_18
 builds_for=["fabric", "forge"]
 
 # Fabric loader
-fabric_loader_version=0.13.3
-fabric_api_version=0.48.0+1.18.2
+fabric_loader_version=0.14.14
+fabric_api_version=0.67.1+1.18.2
     # Fabric mod versions
     modmenu_version=3.1.0
     #architectury_version=4.4.59