From d4c5ae4b9f461ba9b7dbdb946853bbf694a68c49 Mon Sep 17 00:00:00 2001 From: Artemis System Date: Wed, 16 Oct 2024 08:55:37 +0200 Subject: [PATCH] Switch from NeoGradle to ModDevGradle NeoGradle does not work properly on macos yay --- NeoForge/build.gradle | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle index 05fb3f85d5..5a4d19b327 100644 --- a/NeoForge/build.gradle +++ b/NeoForge/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java-library' id 'idea' - id 'net.neoforged.gradle.userdev' + id 'net.neoforged.moddev' id 'eclipse' } @@ -32,32 +32,39 @@ repositories { } } -subsystems { +neoForge { + version = neoforge_version + parchment { var parchment_components = parchment_version.split(":") minecraftVersion = parchment_components[0] mappingsVersion = parchment_components[1] } -} -runs { - configureEach { - workingDirectory project.file('../run') - systemProperty 'forge.logging.console.level', 'debug' - systemProperty 'fml.earlyprogresswindow', 'false' + runs { + configureEach { + gameDirectory = project.file('../run') + systemProperty 'forge.logging.console.level', 'debug' + systemProperty 'fml.earlyprogresswindow', 'false' + } - modSource project.sourceSets.main + client { + client() + } + server { + server() + programArgument '--nogui' + } } - client { - } - server { - programArgument '--nogui' + mods { + "${mod_id}" { + sourceSet sourceSets.main + } } } dependencies { - implementation "net.neoforged:neoforge:${neoforge_version}" implementation project(":Xplat") implementation "vazkii.patchouli:Patchouli:${patchouli_version}-NEOFORGE" @@ -67,8 +74,8 @@ dependencies { compileOnly "dev.emi:emi-neoforge:${emi_version}:api" runtimeOnly "dev.emi:emi-neoforge:${emi_version}" - compileOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}:api" - runtimeOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}" + // compileOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}:api" + // runtimeOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}" // compileOnly 'com.blamejared.crafttweaker:CraftTweaker-forge-1.18.2:9.1.123'