Skip to content

Commit d90f301

Browse files
committed
Fixing the actually awful Gradle quirks
1 parent f9094e3 commit d90f301

3 files changed

Lines changed: 40 additions & 26 deletions

File tree

dependencies.gradle

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -51,28 +51,20 @@ dependencies {
5151
compileOnly(forge.ponder)
5252
compileOnly(forge.flywheel.api)
5353

54-
// Create Aeronautics compat (GTM bridge). compileOnly: the pack ships these, CC must not bundle them.
55-
// Aero/Simulated/Sable have no usable maven (bundler/Fabric/JIJ-only), so the pack's jars are pinned in
56-
// libs/, extracted from create-aeronautics-bundled-1.21.1-1.3.0 and sable-neoforge-1.21.1-2.0.3.
57-
compileOnly(files("libs/The_Undergarden-1.21.1-0.9.6.jar"))
58-
compileOnly(files("libs/aeronautics-neoforge-1.21.1-1.3.0.jar"))
59-
compileOnly(files("libs/simulated-neoforge-1.21.1-1.3.0.jar"))
60-
compileOnly(files("libs/offroad-neoforge-1.21.1-1.3.0.jar"))
61-
compileOnly(files("libs/sable-neoforge-1.21.1-2.0.3.jar"))
62-
compileOnly(files("libs/sable-rapier-1.21.1-2.0.3.jar"))
63-
compileOnly(files("libs/sable-companion-common-1.21.1-1.6.0.jar"))
64-
compileOnly(files("libs/veil-neoforge-1.21.1-4.1.4.jar"))
65-
compileOnly(files("libs/hooked-neoforge-2.0.2.jar"))
66-
67-
// Cosmonautics hard-requires aeronautics + sable at RUNTIME, so the dev run must now load the whole
68-
// Aero/Sable stack it previously only compiled against. Same pinned jars; runtimeOnly does not bundle.
69-
runtimeOnly(files("libs/aeronautics-neoforge-1.21.1-1.3.0.jar"))
70-
runtimeOnly(files("libs/simulated-neoforge-1.21.1-1.3.0.jar"))
71-
runtimeOnly(files("libs/offroad-neoforge-1.21.1-1.3.0.jar"))
72-
runtimeOnly(files("libs/sable-neoforge-1.21.1-2.0.3.jar"))
73-
runtimeOnly(files("libs/sable-rapier-1.21.1-2.0.3.jar"))
74-
runtimeOnly(files("libs/sable-companion-common-1.21.1-1.6.0.jar"))
75-
runtimeOnly(files("libs/veil-neoforge-1.21.1-4.1.4.jar"))
54+
compileOnly(forge.undergarden) { transitive = false }
55+
compileOnly(forge.aeronautics) { transitive = false }
56+
compileOnly(forge.simulated) { transitive = false }
57+
compileOnly(forge.sable) { transitive = false }
58+
compileOnly(forge.sable.companion) { transitive = false }
59+
compileOnly(forge.hooked) { transitive = false }
60+
61+
runtimeOnly(forge.aeronautics) { transitive = false }
62+
runtimeOnly(forge.simulated) { transitive = false }
63+
runtimeOnly(forge.offroad) { transitive = false }
64+
runtimeOnly(forge.sable) { transitive = false }
65+
runtimeOnly(forge.sable.companion) { transitive = false }
66+
runtimeOnly(forge.sable.rapier)
67+
runtimeOnly(forge.veil) { transitive = false }
7668
runtimeOnly(forge.create) {
7769
exclude group: 'maven.modrinth', module: 'journeymap'
7870
}
@@ -100,10 +92,7 @@ dependencies {
10092
// space location bridging) can compile against it and the dev run loads it.
10193
implementation("curse.maven:create-cosmonautics-1595491:8358740")
10294

103-
// The Undergarden: CC's Drowned Hollow worldgen (biome modifiers + features) targets its biomes/blocks, so
104-
// the dev run must load it or those JSONs fail to resolve. runtimeOnly: CC has no compile-time Undergarden
105-
// refs (the worldgen is data JSON). Pinned to the pack's exact jar.
106-
runtimeOnly(files("libs/The_Undergarden-1.21.1-0.9.6.jar"))
95+
runtimeOnly(forge.undergarden) { transitive = false }
10796

10897
// Apotheosis (modular on 1.21.1)
10998
// Placebo is provided transitively by the Apothic mods as dev.shadowsoffire:Placebo. Declaring it

gradle/forge.versions.toml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ lso = "1.21.1-2.4.2"
4545
jade = "15.10.5+neoforge"
4646
journeymapapi = "2.0.0-1.21.1-SNAPSHOT"
4747
effortless = "4.1"
48+
aeronautics = "1.3.0"
49+
sable = "2.0.3"
50+
sableCompanion = "1.6.0"
51+
undergardenCurseFile = "7862546"
52+
hookedCurseFile = "7131932"
53+
veilCurseFile = "8236124"
4854

4955
# Xaero's Minimap / World Map (coordinates verbatim from GregTech-Modern forge.versions.toml)
5056
xaerosLib = "1.1.0"
@@ -100,6 +106,15 @@ lso = { module = "maven.modrinth:legendary-survival-overhaul", v
100106
jade = { module = "maven.modrinth:jade", version.ref = "jade" }
101107
journeymap-api = { module = "info.journeymap:journeymap-api-neoforge", version.ref = "journeymapapi" }
102108
effortless = { module = "maven.modrinth:effortless-building", version.ref = "effortless" }
109+
aeronautics = { module = "dev.eriksonn.aeronautics:aeronautics-neoforge-1.21.1", version.ref = "aeronautics" }
110+
simulated = { module = "dev.simulated_team.simulated:simulated-neoforge-1.21.1", version.ref = "aeronautics" }
111+
offroad = { module = "dev.ryanhcode.offroad:offroad-neoforge-1.21.1", version.ref = "aeronautics" }
112+
sable = { module = "dev.ryanhcode.sable:sable-neoforge-1.21.1", version.ref = "sable" }
113+
sable-companion = { module = "dev.ryanhcode.sable-companion:sable-companion-common-1.21.1", version.ref = "sableCompanion" }
114+
sable-rapier = { module = "dev.ryanhcode.sable:sable-sable_rapier-1.21.1", version.ref = "sable" }
115+
undergarden = { module = "curse.maven:the-undergarden-379849", version.ref = "undergardenCurseFile" }
116+
hooked = { module = "curse.maven:hooked-297209", version.ref = "hookedCurseFile" }
117+
veil = { module = "curse.maven:veil-lib-1517006", version.ref = "veilCurseFile" }
103118

104119
xaeroslib = { module = "xaero.lib:xaerolib-neoforge-1.21.1", version.ref = "xaerosLib" }
105120
xaerosworldmap = { module = "xaero.map:xaeroworldmap-neoforge-1.21.1", version.ref = "xaerosWorldMap" }

gradle/scripts/repositories.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,16 @@ repositories {
5454
forRepository { maven { url = "https://maven.ftb.dev/releases/" } }
5555
filter { includeGroup("dev.ftb.mods") }
5656
}
57+
exclusiveContent {
58+
forRepository { maven { url = "https://maven.ryanhcode.dev/releases" } }
59+
filter {
60+
includeGroup("dev.eriksonn.aeronautics")
61+
includeGroup("dev.simulated_team.simulated")
62+
includeGroup("dev.ryanhcode.offroad")
63+
includeGroup("dev.ryanhcode.sable")
64+
includeGroup("dev.ryanhcode.sable-companion")
65+
}
66+
}
5767
exclusiveContent { // architectury, cloth-config
5868
forRepository { maven { url = "https://maven.shedaniel.me/" } }
5969
filter {

0 commit comments

Comments
 (0)