From 4e0574af35570c3a8a7280538a97d77d500f1d43 Mon Sep 17 00:00:00 2001
From: coolGi <sasanaps@hotmail.com>
Date: Fri, 24 Feb 2023 20:44:41 +1030
Subject: [PATCH] Forge now build but dosent run

---
 build.gradle       | 26 ++++++++++++--------------
 forge/build.gradle |  4 ++--
 gradle.properties  |  2 +-
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index a1261d4b5..35aaefaac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -97,7 +97,7 @@ subprojects { p ->
 
     // Apply plugins
     apply plugin: "java"
-    if (isMinecraftSubProject && p != project(":forge"))
+    if (isMinecraftSubProject)
         apply plugin: "systems.manifold.manifold-gradle-plugin"
     apply plugin: "com.github.johnrengelman.shadow"
 //    apply plugin: "org.spongepowered.gradle.vanilla" // Provides minecraft libraries
@@ -107,10 +107,9 @@ subprojects { p ->
 
 
     // Set the manifold version (may not be required tough)
-    if (p != project(":forge"))
-        manifold {
-            manifoldVersion = rootProject.manifold_version
-        }
+    manifold {
+        manifoldVersion = rootProject.manifold_version
+    }
 
 
     // set up custom configurations (configurations are a way to handle dependencies) 
@@ -149,7 +148,7 @@ subprojects { p ->
         
 
         // Manifold
-        if (isMinecraftSubProject && p != project(":forge"))
+        if (isMinecraftSubProject)
             annotationProcessor("systems.manifold:manifold-preprocessor:${rootProject.manifold_version}")
 
         // Log4j
@@ -234,10 +233,11 @@ subprojects { p ->
     */
 
     // Run mergeJars when running build
-    if (isMinecraftSubProject) {
-        build.finalizedBy(mergeJars)
-        assemble.finalizedBy(mergeJars)
-    }
+    // TODO: Fix later
+//    if (isMinecraftSubProject) {
+//        build.finalizedBy(mergeJars)
+//        assemble.finalizedBy(mergeJars)
+//    }
 }
 
 allprojects { p ->
@@ -410,13 +410,11 @@ allprojects { p ->
     tasks.withType(JavaCompile) {
         if (isMinecraftSubProject) {
             options.release = rootProject.java_version as Integer
-            if (p != project(":forge"))
+            if (p != project(":forge")) // FIXME
                 options.compilerArgs += ['-Xplugin:Manifold']
         } else {
             options.release = 8; // Core & Api should use Java 8 no matter what
-            // No it shouldn't cause it fails to find minecraft if it uses Java 8
-            //options.release = rootProject.java_version as Integer
-            // TODO: Once the new build system is done, check if there is a way to make core/api only use java 8 again
+            //options.release = rootProject.java_version as Integer // But if minecraft
         }
         options.encoding = "UTF-8"
     }
diff --git a/forge/build.gradle b/forge/build.gradle
index d33907594..88088b157 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -33,7 +33,7 @@ minecraft {
         client {
             workingDirectory project.file("run")
             ideaModule "${rootProject.name}.${project.name}.main"
-            taskName "Client"
+            taskName "runClient"
             args "-mixins.config=DistantHorizons.mixins.json"
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
@@ -51,7 +51,7 @@ minecraft {
 //        server {
 //            workingDirectory project.file("run")
 //            ideaModule "${rootProject.name}.${project.name}.main"
-//            taskName "Server"
+//            taskName "runServer"
 //            args "-mixins.config=DistantHorizons.mixins.json"
 //        }
 
diff --git a/gradle.properties b/gradle.properties
index 525e471f8..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=2022.1.5
+manifold_version=2023.1.0
 toml_version=3.6.4
 nightconfig_version=3.6.6
 flatlaf_version=2.3