diff --git a/dependencies.gradle b/dependencies.gradle index 3259a02..e8c1a34 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,31 +35,31 @@ */ dependencies { - api("com.github.GTNewHorizons:NotEnoughItems:2.6.34-GTNH:dev") - devOnlyNonPublishable("com.github.GTNewHorizons:EnderIO:2.8.17:dev") + api("com.github.GTNewHorizons:NotEnoughItems:2.6.51-GTNH:dev") + devOnlyNonPublishable("com.github.GTNewHorizons:EnderIO:2.8.22:dev") devOnlyNonPublishable(rfg.deobf("curse.maven:Infernal-Mobs-227875:2227584")) compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.7.0-GTNH:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Draconic-Evolution:1.3.9-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.9-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.6.3:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.11.6:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Hardcore-Ender-Expansion:1.11.2-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:harvestcraft:1.2.1-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:OpenBlocks:1.10.1-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Draconic-Evolution:1.3.14-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.16-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.6.5:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.11.7:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hardcore-Ender-Expansion:1.12.0-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Botania:1.12.1-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:harvestcraft:1.2.3-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:OpenBlocks:1.10.2-GTNH:dev") { transitive = false } compileOnly('com.github.GTNewHorizons:OpenModsLib:0.11.1:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:BloodArsenal:1.3.2:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.3:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ThaumicTinkerer:2.10.1:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:BloodArsenal:1.3.4:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.9:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ThaumicTinkerer:2.10.2:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:ForbiddenMagic:0.7.0-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Electro-Magic-Tools:1.5.12:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:WitchingGadgets:1.5.14-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.63:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Hardcore-Ender-Expansion:1.11.2-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.10:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ThaumicBases:1.7.5:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Electro-Magic-Tools:1.6.0:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:WitchingGadgets:1.5.17-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.09:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hardcore-Ender-Expansion:1.12.0-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.19:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ThaumicBases:1.8.0:dev") { transitive = false } compileOnly(rfg.deobf("curse.maven:witchery-69673:2234410")) compileOnly(rfg.deobf("curse.maven:Automagy-222153:2285272")) compileOnly(rfg.deobf("curse.maven:edit-mob-drops-348932:4458014")) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0..e2847c8 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.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index aa612ad..0147a99 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30' } diff --git a/src/main/java/com/kuba6000/mobsinfo/loader/VanillaVillagerTradesLoader.java b/src/main/java/com/kuba6000/mobsinfo/loader/VanillaVillagerTradesLoader.java index 6ce52eb..ca4b92a 100644 --- a/src/main/java/com/kuba6000/mobsinfo/loader/VanillaVillagerTradesLoader.java +++ b/src/main/java/com/kuba6000/mobsinfo/loader/VanillaVillagerTradesLoader.java @@ -10,6 +10,8 @@ import com.kuba6000.mobsinfo.api.VillagerTrade; +import cpw.mods.fml.common.Loader; + public class VanillaVillagerTradesLoader { public static HashMap> vanillaTrades = new HashMap<>(); @@ -66,7 +68,11 @@ public static void init() { { // profession 2 ArrayList recipes = new ArrayList<>(); - recipes.add(new VillagerTrade(Items.emerald, null, Items.ender_eye, 0.3d)); + // TODO: This file should not depend on other mods + // TODO: Add an API to do it instead! + if (!Loader.isModLoaded("dreamcraft")) { + recipes.add(new VillagerTrade(Items.emerald, null, Items.ender_eye, 0.3d)); + } recipes.add(new VillagerTrade(Items.emerald, null, Items.experience_bottle, 0.2d)); recipes.add(new VillagerTrade(Items.emerald, null, Items.redstone, 0.4d)); recipes.add(new VillagerTrade(Items.emerald, null, Item.getItemFromBlock(Blocks.glowstone), 0.3d));