neoforge build script cleanup

build.gradle

@@ -54,7 +54,7 @@ def writeBuildGradlePredefine(List<String> mcVers, int mcIndex)
 // Transfers the values set in settings.gradle to the rest of the project
 project.gradle.ext.getProperties().each { prop ->
     rootProject.ext.set(prop.key, prop.value)
-//    println "Added prop [key:" + prop.key + ", value:" + prop.value + "]"
+    //println "Added prop [key:" + prop.key + ", value:" + prop.value + "]"
 }
 // Sets up manifold stuff
 writeBuildGradlePredefine(rootProject.mcVers, rootProject.mcIndex)
@@ -106,11 +106,12 @@ subprojects { p ->
         apply plugin: "systems.manifold.manifold-gradle-plugin"
     
     // Apply forge's loom
-    if (
-            (findProject(":forge") && p == project(":forge")) ||
-                    (findProject(":neoforge") && p == project(":neoforge"))
-    )
-    apply plugin: "dev.architectury.loom"
+    if ((findProject(":forge") && p == project(":forge")) ||
+        (findProject(":neoforge") && p == project(":neoforge"))
+        )
+    {
+        apply plugin: "dev.architectury.loom"
+    }
 
 
     // Set the manifold version (may not be required tough)
@@ -521,15 +522,17 @@ allprojects { p ->
             }
         }
 
-        // Required for ModMenu
-        maven { url "https://maven.terraformersmc.com/" }
-
-        // Required for Mixins & VanillaGradle
+        // VanillaGradle and Mixins in common
         maven { url "https://repo.spongepowered.org/maven/" }
 
-        // Required for Canvas (mod)
+        // Canvas mod
         maven { url "https://maven.vram.io/" }
+        // ModMenu mod
+        maven { url "https://maven.terraformersmc.com/" }
 
+        // neoforge
+        maven { url "https://maven.neoforged.net/releases/" }
+        
         // These 3 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource
         flatDir {
             dirs "${rootDir}/mods/fabric"

neoforge/build.gradle

@@ -11,43 +11,19 @@ architectury {
     neoForge()
 }
 
-// TODO this is already defined in the main settings.gradle file, why doesn't it work unless also defined here? (If compiling does work without this block feel free to remove)
-repositories {
-    maven {
-        name "Neoforge"
-        url "https://maven.neoforged.net/releases/"
-    }
-}
-
-//loom {
-//    forge {
-//        convertAccessWideners.set(true)
-//        extraAccessWideners.add("lod.accesswidener")
-//        mixinConfigs("DistantHorizons.mixins.json")
-//    }
-//}
-
 loom {
     silentMojangMappingsLicense() // Shut the licencing warning
     accessWidenerPath = project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener")
 
     neoForge {
-        // Access wideners are now defined in the `remapJar.atAccessWideners`
-//        convertAccessWideners = true
-//        extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
+        // Access wideners are defined in the `remapJar.atAccessWideners`
 
-        // Mixins are now defined in the `mods.toml`
-//        mixinConfigs = [
-//                "DistantHorizons.mixins.json"
-//        ]
+        // Mixins are defined in the `mods.toml`
     }
     mixin {
-        // Mixins are now defined in the `mods.toml`
-//        mixinConfigs = [
-//                "DistantHorizons.mixins.json"
-//        ]
+        // Mixins are defined in the `mods.toml`
     }
-
+    
     // "runs" isn't required, but when we do need it then it can be useful
     runs {
         client {
@@ -55,7 +31,7 @@ loom {
             setConfigName("NeoForge Client")
             ideConfigGenerated(true)
             runDir("../run")
-//            vmArgs("-XX:-OmitStackTraceInFastThrow", minecraftMemoryJavaArg)
+            //vmArgs("-XX:-OmitStackTraceInFastThrow", minecraftMemoryJavaArg)
         }
         server {
             server()
@@ -66,13 +42,7 @@ loom {
     }
 }
 
-remapJar {
-    inputFile = shadowJar.archiveFile
-    dependsOn shadowJar
-//    classifier null
 
-    atAccessWideners.add("distanthorizons.accesswidener")
-}
 
 def addMod(path, enabled) {
     if (enabled == "2")
@@ -80,21 +50,24 @@ def addMod(path, enabled) {
     else if (enabled == "1")
         dependencies { modCompileOnly(path) }
 }
-
 dependencies {
     minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-    mappings loom.layered() {
+    mappings loom.layered() 
+    {
         // Mojmap mappings
         officialMojangMappings()
         // Parchment mappings (it adds parameter mappings & javadoc)
         parchment("org.parchmentmc.data:parchment-${rootProject.parchment_version}@zip")
     }
-
+    
+    
     // Neoforge
     neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
     addMod("curse.maven:TerraFirmaCraft-302973:4616004", rootProject.enable_terrafirmacraft)
 }
 
+
+
 task deleteResources(type: Delete) {
     delete file("build/resources/main")
 }
@@ -113,14 +86,15 @@ tasks.named('runClient') {
     finalizedBy(deleteResources)
 }
 
+remapJar {
+    inputFile = shadowJar.archiveFile
+    dependsOn shadowJar
+
+    atAccessWideners.add("distanthorizons.accesswidener")
+}
+
 sourcesJar {
     def commonSources = project(":common").sourcesJar
     dependsOn commonSources
     from commonSources.archiveFile.map { zipTree(it) }
 }
-
-//components.java {
-//    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-//        skip()
-//    }
-//}