diff --git a/dependencies.gradle b/dependencies.gradle index e4b66dd..6ee4e8b 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,12 +1,12 @@ dependencies { - api('com.github.GTNewHorizons:Botania:1.12.18-GTNH:dev') { + api('com.github.GTNewHorizons:Botania:1.13.10-GTNH:dev') { exclude module: 'Baubles' } - api('com.github.GTNewHorizons:Botanic-horizons:1.11.16-GTNH:dev') + api('com.github.GTNewHorizons:Botanic-horizons:1.12.3-GTNH:dev') api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - api('com.github.GTNewHorizons:Baubles-Expanded:2.1.9-GTNH:dev') - compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.4.3:dev") - compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.7.64-GTNH:dev") + api('com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev') + compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.4.10:dev") + compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.8.50-GTNH:dev") compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.2:dev") } @@ -16,7 +16,7 @@ project.getConfigurations() final DependencySubstitutions ds = c.getResolutionStrategy() .getDependencySubstitution(); ds.substitute(ds.module("com.github.GTNewHorizons:Baubles")) - .using(ds.module("com.github.GTNewHorizons:Baubles-Expanded:2.1.9-GTNH")) + .using(ds.module("com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH")) .withClassifier("dev") .because("Baubles-Expanded replaces Baubles"); }); diff --git a/gradle.properties b/gradle.properties index 050a1e9..553158e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -96,7 +96,9 @@ usesMixinDebug = false # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. mixinPlugin = -# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! +# Specify the package that contains all of your Mixins. The package must exist or +# the build will fail. If you have a package property defined in your mixins..json, +# it must match with this or the build will fail. mixinsPackage = # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! @@ -172,6 +174,12 @@ curseForgeRelations = # projects. New projects should not use this parameter. # customArchiveBaseName = +# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory. +# runClientWorkingDirectory = run/client + +# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory. +# runServerWorkingDirectory = run/server + # Optional parameter to have the build automatically fail if an illegal version is used. # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'. # The check is ONLY performed if the version is a git tag. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b..d4081da 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 7622cde..b4bf855 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.49' } diff --git a/src/main/java/ab/common/lib/register/RecipeListAB.java b/src/main/java/ab/common/lib/register/RecipeListAB.java index dabf6e0..88b1611 100644 --- a/src/main/java/ab/common/lib/register/RecipeListAB.java +++ b/src/main/java/ab/common/lib/register/RecipeListAB.java @@ -821,8 +821,7 @@ public static void setupCrafting() { .add(Aspect.MAGIC, 32).add(Aspect.ELDRITCH, 32).add(Aspect.BEAST, 16).add(Aspect.HUNGER, 16), new ItemStack(ItemListAB.itemAquaSword), new ItemStack[] { new ItemStack(ModItems.rainbowRod), new ItemStack(ItemListAB.itemABResource, 1, 0), - new ItemStack( - (Item) Item.itemRegistry.getObject("dreamcraft:item.MysteriousCrystalGemFlawless")), + new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:MysteriousCrystalGemFlawless")), new ItemStack(ItemListAB.itemABResource, 1, 0), new ItemStack(ItemListAB.itemNebulaRod), new ItemStack(ModBlocks.dreamwood, 1, 5), new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ModBlocks.livingwood, 1, 5), @@ -842,16 +841,16 @@ public static void setupCrafting() { new ItemStack((Item) Item.itemRegistry.getObject("thaumicbases:voidAnvil")), new ItemStack[] { new ItemStack(ModBlocks.terraPlate), new ItemStack(ModItems.rune, 1, 2), OreDict.preference("blockTerrasteel"), - new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:item.DiamondCoreChip")), + new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:DiamondCoreChip")), new ItemStack(ModBlocks.terraPlate), new ItemStack(ModItems.rune, 1, 3), OreDict.preference("blockManasteel"), - new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:item.EssentiaCircuit")), + new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:EssentiaCircuit")), new ItemStack(ModBlocks.terraPlate), new ItemStack(ModItems.rune, 1, 2), OreDict.preference("blockTerrasteel"), - new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:item.DiamondCoreChip")), + new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:DiamondCoreChip")), new ItemStack(ModBlocks.terraPlate), new ItemStack(ModItems.rune, 1, 3), OreDict.preference("blockManasteel"), - new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:item.EssentiaCircuit")), }); + new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:EssentiaCircuit")), }); Destroyer = ThaumcraftApi.addInfusionCraftingRecipe( "Destroyer",