diff --git a/src/main/java/net/fuzzycraft/botanichorizons/mod/ForgeMod.java b/src/main/java/net/fuzzycraft/botanichorizons/mod/ForgeMod.java index 597f706..89d51b7 100644 --- a/src/main/java/net/fuzzycraft/botanichorizons/mod/ForgeMod.java +++ b/src/main/java/net/fuzzycraft/botanichorizons/mod/ForgeMod.java @@ -33,7 +33,7 @@ public class ForgeMod { public static final String MOD_NAME = MOD_ID; public static final String VERSION = "GRADLETOKEN_VERSION"; - public static final String DEPENDENCIES = "required-after:Baubles;required-after:Thaumcraft;required-after:Botania;required-after:gregtech;after:witchery;after:BiomesOPlenty;after:dreamcraft;required-after:TConstruct;required-after:Avaritia;after:chisel;after:StructureLib"; + public static final String DEPENDENCIES = "required-after:Baubles;required-after:Thaumcraft;required-after:Botania;required-after:gregtech;after:witchery;after:BiomesOPlenty;after:dreamcraft;required-after:TConstruct;required-after:Avaritia;after:chisel;after:StructureLib;after:etfuturum"; //public static final String DEPENDENCIES = "required-after:Botania"; // developer mode @Mod.Instance(MOD_ID) diff --git a/src/main/java/net/fuzzycraft/botanichorizons/patches/ApothecaryPatches.java b/src/main/java/net/fuzzycraft/botanichorizons/patches/ApothecaryPatches.java index a51ee0b..791abed 100644 --- a/src/main/java/net/fuzzycraft/botanichorizons/patches/ApothecaryPatches.java +++ b/src/main/java/net/fuzzycraft/botanichorizons/patches/ApothecaryPatches.java @@ -31,6 +31,13 @@ public static void applyPatches() { whitelistBlockIfExists("BiomesOPlenty:ivy"); whitelistBlockIfExists("BiomesOPlenty:flowerVine"); whitelistBlockIfExists("Natura:Thornvines"); + whitelistBlockIfExists("etfuturum:lily_of_the_valley"); + whitelistBlockIfExists("etfuturum:cornflower"); + whitelistBlockIfExists("etfuturum:wither_rose"); + whitelistBlockIfExists("etfuturum:rose"); + whitelistBlockIfExists("etfuturum:pink_petals"); + whitelistBlockIfExists("etfuturum:cave_vine"); + whitelistBlockIfExists("etfuturum:cave_vine_plant"); CustomBotaniaAPI.extraFlowerComponents.put(Item.getItemFromBlock(Blocks.red_flower), alwaysAllowHandler); CustomBotaniaAPI.extraFlowerComponents.put(Item.getItemFromBlock(Blocks.yellow_flower), alwaysAllowHandler); CustomBotaniaAPI.extraFlowerComponents.put(Item.getItemFromBlock(Blocks.vine), alwaysAllowHandler); diff --git a/src/main/java/net/fuzzycraft/botanichorizons/patches/OredictPatches.java b/src/main/java/net/fuzzycraft/botanichorizons/patches/OredictPatches.java index 845da5e..a186a70 100644 --- a/src/main/java/net/fuzzycraft/botanichorizons/patches/OredictPatches.java +++ b/src/main/java/net/fuzzycraft/botanichorizons/patches/OredictPatches.java @@ -45,6 +45,19 @@ private static void applyCrossModPatches() { oredictThirdPartyBlocks("BiomesOPlenty:mushrooms", "listInedibleMushroom", "listInedibleMushroom", "listInedibleMushroom", "listInedibleMushroom", "listInedibleMushroom", "listInedibleMushroom"); + oredictThirdPartyBlocks("etfuturum:lily_of_the_valley", "flowerWhite"); + oredictThirdPartyBlocks("etfuturum:lily_of_the_valley", "flowerLilyValley"); + oredictThirdPartyBlocks("etfuturum:cornflower", "flowerBlue"); + oredictThirdPartyBlocks("etfuturum:cornflower", "flowerCorn"); + oredictThirdPartyBlocks("etfuturum:wither_rose", "flowerBlack"); + oredictThirdPartyBlocks("etfuturum:wither_rose", "flowerRoseWither"); + oredictThirdPartyBlocks("etfuturum:rose", "flowerRed"); + oredictThirdPartyBlocks("etfuturum:rose", "flowerRose"); + oredictThirdPartyBlocks("etfuturum:pink_petals", "flowerPink"); + oredictThirdPartyBlocks("etfuturum:pink_petals", "flowerPinkPetals"); + + oredictThirdPartyBlocks("etfuturum:cave_vine", "cropVine"); + oredictThirdPartyBlocks("etfuturum:cave_vine_plant", "cropVine"); oredictThirdPartyItem("witchery:ingredient", 14, "itemMutandis"); }