diff --git a/build.gradle b/build.gradle index f436c92..6b12399 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,6 @@ plugins { id 'com.matthewprenger.cursegradle' version "${cursegradle_version}" } -jarJar.enable() - boolean ponderInWorkspace = findProject(':Ponder') != null ext.buildNumber = System.getenv('BUILD_NUMBER') @@ -106,14 +104,15 @@ repositories { dependencies { implementation "net.neoforged:neoforge:${neo_version}" - jarJar("dev.engine-room.flywheel:flywheel-neoforge-${flywheel_minecraft_version}:${flywheel_version}") { - version { - strictly "[1.0.0-9,2.0)" - } - } + jarJar("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}") compileOnly("dev.engine-room.flywheel:flywheel-neoforge-api-${flywheel_minecraft_version}:${flywheel_version}") - runtimeOnly("dev.engine-room.flywheel:flywheel-neoforge-${flywheel_minecraft_version}:${flywheel_version}") + runtimeOnly(jarJar("dev.engine-room.flywheel:flywheel-neoforge-${flywheel_minecraft_version}:${flywheel_version}") { + version { + strictly "[1.0,2.0)" + prefer flywheel_version + } + }) runtimeOnly("dev.engine-room.vanillin:vanillin-neoforge-${flywheel_minecraft_version}:${vanillin_version}") if (ponderInWorkspace) { @@ -122,8 +121,6 @@ dependencies { } else { implementation("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}") } - - jarJar("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}") } sourceSets.main.resources { diff --git a/gradle.properties b/gradle.properties index fe817f2..d6fa5de 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,11 +3,11 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -mod_version = 3.5 +mod_version = 3.10 artifact_minecraft_version = 1.21.1 minecraft_version = 1.21.1 -neo_version = 21.1.127 +neo_version = 21.1.129 neogradle.subsystems.parchment.minecraftVersion = 1.21.1 neogradle.subsystems.parchment.mappingsVersion = 2024.11.17 neogradle.subsystems.conventions.runs.create-default-run-per-type = false @@ -16,6 +16,6 @@ neogradle_version = 7.0.181 cursegradle_version = 1.4.0 flywheel_minecraft_version = 1.21.1 -flywheel_version = 1.0.0-9 -vanillin_version = 1.0.0-beta-9 -ponder_version = 1.0.39 \ No newline at end of file +flywheel_version = 1.0.2 +vanillin_version = 1.0.0-beta-11 +ponder_version = 1.0.46 \ No newline at end of file diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml index 44df873..cf00775 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -19,23 +19,27 @@ Makes building easier by providing tools like mirrors, arrays, build modes and a [[dependencies.effortlessbuilding]] modId="neoforge" type="required" - versionRange="[21.1.1,)" + versionRange="[21.1.129,)" ordering="NONE" side="BOTH" [[dependencies.effortlessbuilding]] modId="minecraft" type="required" - versionRange="[1.21.1,1.21.2)" + versionRange="[1.21.1]" ordering="NONE" side="BOTH" -#[[dependencies.effortlessbuilding]] -# modId="flywheel" -# type="required" -# versionRange="[0.6.10,0.7)" -# ordering="AFTER" -# side="CLIENT" +[[dependencies.effortlessbuilding]] + modId="flywheel" + mandatory=true + versionRange="[1.0.0,2.0)" + ordering="AFTER" + side="CLIENT" -#[[accessTransformers]] -# file="META-INF/accesstransformer.cfg" \ No newline at end of file +[[dependencies.effortlessbuilding]] + modId = "ponder" + mandatory = true + versionRange = "[0.8,)" + ordering = "AFTER" + side = "BOTH" \ No newline at end of file