diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java b/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java index 8dcd529..b3b6ee5 100644 --- a/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java @@ -50,6 +50,13 @@ public class BotaniaHelper implements IModHelper { GAIA_INGOT, ENDER_AIR_BOTTLE, MANA_STRING, + MANASTEEL_NUGGET, + TERRASTEEL_NUGGET, + ELEMENTIUM_NUGGET, + ROOT, + PEBBLE, + MANAWEAVE_CLOTH, + MANA_POWDER ; } @@ -86,7 +93,6 @@ public class BotaniaHelper implements IModHelper { public static Block blockDreamWood; public static Item itemPetal; - public static Item itemManaPetal; public static Item itemManaResource; public static Item itemPastureSeed; public static Item itemRune; @@ -152,7 +158,7 @@ public class BotaniaHelper implements IModHelper { 's', blockLivingRock, 'm', new ItemStack(itemManaResource, 1, ManaResource.MANASTEEL.ordinal()), 'p', Config.pollen.getStackForType(PollenType.UNUSUAL), - 'l', new ItemStack(itemManaPetal, 1, OreDictionary.WILDCARD_VALUE) + 'l', new ItemStack(itemPetal, 1, OreDictionary.WILDCARD_VALUE) }); manaBoosterRecipe = (IRecipe) CraftingManager.getInstance().getRecipeList().get(CraftingManager.getInstance().getRecipeList().size() - 1); @@ -175,7 +181,6 @@ public class BotaniaHelper implements IModHelper { public static void getItems() { itemPetal = ItemInterface.getItem(Name, "petal"); - itemManaPetal = ItemInterface.getItem(Name, "manaPetal"); itemManaResource = ItemInterface.getItem(Name, "manaResource"); itemPastureSeed = ItemInterface.getItem(Name, "grassSeeds"); itemRune = ItemInterface.getItem(Name, "rune"); diff --git a/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java b/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java index 6bbb75a..4d9c78d 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java +++ b/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java @@ -70,12 +70,11 @@ public class BotaniaAPIDistanceHelper { RecipePetals beegoniaRecipe = BotaniaAPI.registerPetalRecipe(BotaniaAPI.internalHandler.getSubTileAsStack(SubTileBeegonia.NAME), new ItemStack(BotaniaHelper.itemPetal), - new ItemStack(BotaniaHelper.itemManaPetal), new ItemStack(BotaniaHelper.itemPetal, 1, 4), + new ItemStack(BotaniaHelper.itemPetal, 1, 15), new ItemStack(BotaniaHelper.itemPetal, 1, 4), - new ItemStack(BotaniaHelper.itemPetal, 1, 4), - new ItemStack(BotaniaHelper.itemManaPetal, 1, 4), - new ItemStack(BotaniaHelper.itemManaPetal, 1, 15) + new ItemStack(BotaniaHelper.itemPetal, 1, 15), + new ItemStack(BotaniaHelper.itemManaResource, 1, ManaResource.MANA_POWDER.ordinal()) ); entryBeegonia = new BotaniaLexiconEntry("tile.botania:flower." + SubTileBeegonia.NAME + ".name", BotaniaAPI.categoryGenerationFlowers); entryBeegonia.setLexiconPages( @@ -87,13 +86,10 @@ public class BotaniaAPIDistanceHelper { RecipePetals hiveacynthRecipe = BotaniaAPI.registerPetalRecipe(BotaniaAPI.internalHandler.getSubTileAsStack(SubTileHiveacynth.NAME), new ItemStack(BotaniaHelper.itemPetal, 1, 3), - new ItemStack(BotaniaHelper.itemManaPetal, 1, 3), new ItemStack(BotaniaHelper.itemPetal, 1, 9), new ItemStack(BotaniaHelper.itemPetal, 1, 9), - new ItemStack(BotaniaHelper.itemManaPetal, 1, 9), new ItemStack(BotaniaHelper.itemPetal, 1, 11), - new ItemStack(BotaniaHelper.itemManaPetal, 1, 11), - new ItemStack(BotaniaHelper.itemManaPetal, 1, 11), + new ItemStack(BotaniaHelper.itemManaResource, 1, ManaResource.MANA_POWDER.ordinal()), new ItemStack(BotaniaHelper.itemManaResource, 1, ManaResource.REDSTONE_ROOT.ordinal()) ); entryHiveacynth = new BotaniaLexiconEntry("tile.botania:flower." + SubTileHiveacynth.NAME + ".name", BotaniaAPI.categoryFunctionalFlowers); @@ -104,15 +100,11 @@ public class BotaniaAPIDistanceHelper { RecipePetals hibeescusRecipe = BotaniaAPI.registerPetalRecipe(BotaniaAPI.internalHandler.getSubTileAsStack(SubTileHibeescus.NAME), new ItemStack(BotaniaHelper.itemPetal, 1, 1), - new ItemStack(BotaniaHelper.itemManaPetal, 1, 1), new ItemStack(BotaniaHelper.itemPetal, 1, 2), new ItemStack(BotaniaHelper.itemPetal, 1, 2), new ItemStack(BotaniaHelper.itemPetal, 1, 2), - new ItemStack(BotaniaHelper.itemManaPetal, 1, 2), - new ItemStack(BotaniaHelper.itemManaPetal, 1, 2), new ItemStack(BotaniaHelper.itemPetal, 1, 14), - new ItemStack(BotaniaHelper.itemManaPetal, 1, 12), - new ItemStack(BotaniaHelper.itemManaPetal, 1, 10), + new ItemStack(BotaniaHelper.itemManaResource, 1, ManaResource.MANA_POWDER.ordinal()), BotaniaHelper.getRune(Rune.AIR, 1), BotaniaHelper.getRune(Rune.SUMMER, 1), BotaniaHelper.getRune(Rune.ENVY, 1),