From f50cfab3f72af28c93f68dc954c38ed03d022803 Mon Sep 17 00:00:00 2001
From: coolGi <sasanaps@hotmail.com>
Date: Fri, 24 Feb 2023 19:10:11 +1030
Subject: [PATCH] Commented, updated, downgraded forge stuff but still to no
 avail

---
 build.gradle            |  5 ++--
 forge/build.gradle      | 57 ++++++++++++++++-------------------------
 forge/gradle.properties |  1 -
 3 files changed, 25 insertions(+), 38 deletions(-)
 delete mode 100644 forge/gradle.properties

diff --git a/build.gradle b/build.gradle
index 81fb044e5..1b9abf276 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id "java"
 
     // Plugin to handle dependencies
-    id "com.github.johnrengelman.shadow" version '7.0.0' apply false
+    id "com.github.johnrengelman.shadow" version '7.1.2' apply false
 
     // Plugin to create merged jars
     id "io.github.pacifistmc.forgix" version "1.2.6"
@@ -352,6 +352,7 @@ allprojects { p ->
     }
 
     // Fix forge version numbering system as it is weird
+    // For whatever reason forge uses [1.18, 1.18.1, 1.18.2) instead of the standard ["1.18", "1.18.1", "1.18.2"] which make more sense
     def compatible_forgemc_versions = "${compatible_minecraft_versions}".replaceAll("\"", "").replaceAll("]", ",)")
 //    System.out.println(compatible_forgemc_versions)
 
@@ -374,7 +375,6 @@ allprojects { p ->
                 java_version                 : java_version
         ]
         // The left side is what gets replaced in the mod info and the right side is where to get it from in the gradle.properties
-        //TODO: Make Forge loader version also be replaced with non hardcoded value instead of "[36,42)"
 
         inputs.properties replaceProperties
         replaceProperties.put 'project', project
@@ -424,6 +424,7 @@ allprojects { p ->
     }
 }
 
+
 // Delete the merged folder when running clean
 task cleanMergedJars() {
     def mergedFolder = file("Merged")
diff --git a/forge/build.gradle b/forge/build.gradle
index 108ba1c99..d33907594 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -6,7 +6,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: "net.minecraftforge.gradle", name: "ForgeGradle", version: "5.1.+", changing: true
+//        classpath group: "net.minecraftforge.gradle", name: "ForgeGradle", version: "5.1.61", changing: true
+        classpath group: "net.minecraftforge.gradle", name: "ForgeGradle", version: "5.1.67", changing: true
         classpath "org.parchmentmc:librarian:1.+"
         classpath "org.spongepowered:mixingradle:0.7-SNAPSHOT"
     }
@@ -15,10 +16,9 @@ apply plugin: "net.minecraftforge.gradle"
 apply plugin: "org.parchmentmc.librarian.forgegradle"
 apply plugin: "org.spongepowered.mixin"
 
-// TODO: Check accessWidener works fine
-
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 mixin {
-    add sourceSets.main, "DistantHorizons.refmap.json"
+    add sourceSets.main, "DistantHorizons.refmap.json" // TODO: Create an accessWidener to refmap
 
     config "DistantHorizons.mixins.json"
 }
@@ -75,13 +75,14 @@ minecraft {
     }
 }
 // TODO: Check if the next 7 lines are necessary
-sourceSets.main.resources.srcDir "src/generated/resources"
-minecraft.runs.all {
-    lazyToken('minecraft_classpath') {
-        configurations.library.copyRecursive().resolve().collect { it.absolutePath }.join(File.pathSeparator)
-        configurations.runtimeLibrary.copyRecursive().resolve().collect { it.absolutePath }.join(File.pathSeparator)
-    }
-}
+//sourceSets.main.resources.srcDir "src/generated/resources"
+//minecraft.runs.all {
+//    lazyToken('minecraft_classpath') {
+//        configurations.library.copyRecursive().resolve().collect { it.absolutePath }.join(File.pathSeparator)
+//        configurations.runtimeLibrary.copyRecursive().resolve().collect { it.absolutePath }.join(File.pathSeparator)
+//    }
+//}
+
 
 //loom {
 //    forge {
@@ -102,13 +103,13 @@ minecraft.runs.all {
 //}
 
 
+
 def addMod(path, enabled) {
     if (enabled == "2")
         dependencies { implementation(path) }
     else if (enabled == "1")
         dependencies { modCompileOnly(path) }
 }
-
 dependencies {
     // Forge loader
     minecraft "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
@@ -122,13 +123,13 @@ dependencies {
 
     // Starlight
     addMod("curse.maven:starlight-forge-526854:${rootProject.starlight_version_forge}", rootProject.enable_starlight_forge)
-    annotationProcessor "org.spongepowered:mixin:0.8.4:processor"
+//    annotationProcessor "org.spongepowered:mixin:0.8.4:processor"
 
     addMod("curse.maven:TerraForged-363820:${rootProject.terraforged_version}", rootProject.enable_terraforged)
 
-    if (System.getProperty("idea.sync.active") != "true") {
-        annotationProcessor "org.spongepowered:mixin:0.8.4:processor"
-    }
+//    if (System.getProperty("idea.sync.active") != "true") {
+//        annotationProcessor "org.spongepowered:mixin:0.8.4:processor"
+//    }
 
     common(project(path: ":common")) { transitive false }
     shadowCommon(project(path: ":common")) { transitive false }
@@ -175,22 +176,8 @@ sourcesJar {
     from commonSources.archiveFile.map { zipTree(it) }
 }
 
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-publishing {
-    publications {
-        mavenForge(MavenPublication) {
-            artifactId = rootProject.mod_name + "-" + project.name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}
+//components.java {
+//    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+//        skip()
+//    }
+//}
\ No newline at end of file
diff --git a/forge/gradle.properties b/forge/gradle.properties
deleted file mode 100644
index 32f842a63..000000000
--- a/forge/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-loom.platform=forge
\ No newline at end of file