Updated dependencies

This commit is contained in:
Christian Knaapen
2025-03-22 11:47:57 +01:00
parent 9476ecbcc5
commit 64b0fbc0aa
3 changed files with 26 additions and 25 deletions

View File

@@ -7,8 +7,6 @@ plugins {
id 'com.matthewprenger.cursegradle' version "${cursegradle_version}" id 'com.matthewprenger.cursegradle' version "${cursegradle_version}"
} }
jarJar.enable()
boolean ponderInWorkspace = findProject(':Ponder') != null boolean ponderInWorkspace = findProject(':Ponder') != null
ext.buildNumber = System.getenv('BUILD_NUMBER') ext.buildNumber = System.getenv('BUILD_NUMBER')
@@ -106,14 +104,15 @@ repositories {
dependencies { dependencies {
implementation "net.neoforged:neoforge:${neo_version}" implementation "net.neoforged:neoforge:${neo_version}"
jarJar("dev.engine-room.flywheel:flywheel-neoforge-${flywheel_minecraft_version}:${flywheel_version}") { jarJar("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}")
version {
strictly "[1.0.0-9,2.0)"
}
}
compileOnly("dev.engine-room.flywheel:flywheel-neoforge-api-${flywheel_minecraft_version}:${flywheel_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}") runtimeOnly("dev.engine-room.vanillin:vanillin-neoforge-${flywheel_minecraft_version}:${vanillin_version}")
if (ponderInWorkspace) { if (ponderInWorkspace) {
@@ -122,8 +121,6 @@ dependencies {
} else { } else {
implementation("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}") implementation("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}")
} }
jarJar("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}")
} }
sourceSets.main.resources { sourceSets.main.resources {

View File

@@ -3,11 +3,11 @@
org.gradle.jvmargs=-Xmx3G org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false org.gradle.daemon=false
mod_version = 3.5 mod_version = 3.10
artifact_minecraft_version = 1.21.1 artifact_minecraft_version = 1.21.1
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.minecraftVersion = 1.21.1
neogradle.subsystems.parchment.mappingsVersion = 2024.11.17 neogradle.subsystems.parchment.mappingsVersion = 2024.11.17
neogradle.subsystems.conventions.runs.create-default-run-per-type = false neogradle.subsystems.conventions.runs.create-default-run-per-type = false
@@ -16,6 +16,6 @@ neogradle_version = 7.0.181
cursegradle_version = 1.4.0 cursegradle_version = 1.4.0
flywheel_minecraft_version = 1.21.1 flywheel_minecraft_version = 1.21.1
flywheel_version = 1.0.0-9 flywheel_version = 1.0.2
vanillin_version = 1.0.0-beta-9 vanillin_version = 1.0.0-beta-11
ponder_version = 1.0.39 ponder_version = 1.0.46

View File

@@ -19,23 +19,27 @@ Makes building easier by providing tools like mirrors, arrays, build modes and a
[[dependencies.effortlessbuilding]] [[dependencies.effortlessbuilding]]
modId="neoforge" modId="neoforge"
type="required" type="required"
versionRange="[21.1.1,)" versionRange="[21.1.129,)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"
[[dependencies.effortlessbuilding]] [[dependencies.effortlessbuilding]]
modId="minecraft" modId="minecraft"
type="required" type="required"
versionRange="[1.21.1,1.21.2)" versionRange="[1.21.1]"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"
#[[dependencies.effortlessbuilding]] [[dependencies.effortlessbuilding]]
# modId="flywheel" modId="flywheel"
# type="required" mandatory=true
# versionRange="[0.6.10,0.7)" versionRange="[1.0.0,2.0)"
# ordering="AFTER" ordering="AFTER"
# side="CLIENT" side="CLIENT"
#[[accessTransformers]] [[dependencies.effortlessbuilding]]
# file="META-INF/accesstransformer.cfg" modId = "ponder"
mandatory = true
versionRange = "[0.8,)"
ordering = "AFTER"
side = "BOTH"