From c98324bfa349ce2c1eeed046075c4da3d0e33d7c Mon Sep 17 00:00:00 2001 From: Caedis Date: Tue, 13 May 2025 07:28:15 -0500 Subject: [PATCH 1/3] Replace Baubles with Baubles Expanded --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index ebd880c..75b6b50 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { api('com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev') 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") From f7027992fdb03085f1b471944df51a5ec172f596 Mon Sep 17 00:00:00 2001 From: Caedis Date: Tue, 13 May 2025 09:01:03 -0500 Subject: [PATCH 2/3] Replace Baubles with Baubles Expanded --- dependencies.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 75b6b50..315923f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,5 +1,7 @@ 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-Expanded:2.1.7-GTNH:dev') @@ -7,5 +9,4 @@ dependencies { 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") - } From 5a2f4a67e9ed127b44960da6d7b26fe13b61471d Mon Sep 17 00:00:00 2001 From: Caedis Date: Tue, 13 May 2025 09:18:01 -0500 Subject: [PATCH 3/3] Working --- dependencies.gradle | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dependencies.gradle b/dependencies.gradle index 315923f..5c3b1bb 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -10,3 +10,14 @@ dependencies { 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"); + });