From 8fa573be5aa6afbd7622e75c420070ba9a0a917c Mon Sep 17 00:00:00 2001 From: Caedis Date: Tue, 13 May 2025 09:27:18 -0500 Subject: [PATCH] Replace Baubles with Baubles Expanded (#12) --- dependencies.gradle | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index ebd880c..5c3b1bb 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,11 +1,23 @@ dependencies { - api('com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev') + api('com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev') { + exclude module: 'Baubles' + } api('com.github.GTNewHorizons:Botanic-horizons:1.1.5-GTNH:dev') api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - api('com.github.GTNewHorizons:Baubles:1.0.4:dev') + api('com.github.GTNewHorizons:Baubles-Expanded:2.1.7-GTNH:dev') compileOnly("com.github.GTNewHorizons:CodeChickenLib:1.3.0:dev") compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.3.6:dev") compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.6.33-GTNH:dev") compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.0:dev") - } + +// deps may transitively add Baubles, so we replace it +project.getConfigurations() + .all(c -> { + final DependencySubstitutions ds = c.getResolutionStrategy() + .getDependencySubstitution(); + ds.substitute(ds.module("com.github.GTNewHorizons:Baubles")) + .using(ds.module("com.github.GTNewHorizons:Baubles-Expanded:2.1.7-GTNH")) + .withClassifier("dev") + .because("Baubles-Expanded replaces Baubles"); + });