diff --git a/src/main/java/ab/common/lib/register/RecipeListAB.java b/src/main/java/ab/common/lib/register/RecipeListAB.java index 73ecd43..dabb6ba 100644 --- a/src/main/java/ab/common/lib/register/RecipeListAB.java +++ b/src/main/java/ab/common/lib/register/RecipeListAB.java @@ -39,7 +39,7 @@ import ab.common.block.tile.TileLebethronCore; import ab.common.core.handler.ConfigABHandler; import ab.common.item.ItemCraftingPattern; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.*; +// import mcp.mobius.waila.addons.enderio.EnderIOModule; import gregtech.api.enums.ToolDictNames; public class RecipeListAB { @@ -367,23 +367,6 @@ public class RecipeListAB { .setIcon(new ItemStack(ItemListAB.itemMithrillRing)); AdvancedBotanyAPI.registerFarmlandSeed(Blocks.nether_wart, 3); - // Mana flower recipe - GameRegistry.addShapedRecipe( - new ItemStack(ItemListAB.itemManaFlower), - new Object[] { " F ", "PMP", " R ", Character.valueOf('T'), - new ItemStack(BlockListAB.blockABStorage, 1, 6), Character.valueOf('F'), - new ItemStack(ItemListAB.itemABResource, 1, 4), Character.valueOf('P'), - new ItemStack(ConfigItems.itemEldritchObject, 1, 3), Character.valueOf('M'), - new ItemStack(ModItems.manaBottle), Character.valueOf('R'), - new ItemStack(ModItems.rune, 1, 8) }); - manaFlower = new BLexiconEntry("manaFlower", categoryForgotten); - manaFlower.setKnowledgeType(forgotten) - .setLexiconPages( - new LexiconPage[] { new PageText("0"), - new AlphirineCraftPage(manaFlower, manaFlowerRecipe.getOutput(), ".alphirineCraft"), - BotaniaAPI.internalHandler.craftingRecipePage(".craft", getLastRecipe()) }) - .setIcon(new ItemStack(ItemListAB.itemManaFlower)); - // Blade of space recipe GameRegistry.addShapedRecipe( new ItemStack(ItemListAB.itemMithrillSword), @@ -657,6 +640,7 @@ public class RecipeListAB { new ItemStack(ItemListAB.itemNebulaHelmReveal), new Object[] { new ItemStack(ItemListAB.itemNebulaHelm), new ItemStack(ConfigItems.itemGoggles) }); + if (ConfigABHandler.hasAutoThaum) { List recipes = new ArrayList(); for (int i = 1; i < 10; i++) { @@ -674,6 +658,7 @@ public class RecipeListAB { new ItemStack(ConfigItems.itemNugget, 1, 6) }); recipes.add(getLastRecipe()); } + // Thaumic crafty crate recipe IRecipe crate = GameRegistry.addShapedRecipe( new ItemStack(BlockListAB.blockMagicCraftCrate), @@ -694,7 +679,24 @@ public class RecipeListAB { BotaniaAPI.internalHandler.craftingRecipePage(".craft0", getLastRecipe()), BotaniaAPI.internalHandler.craftingRecipesPage(".craft1", recipes) }); + // Mana flower recipe + GameRegistry.addShapedRecipe( + new ItemStack(ItemListAB.itemManaFlower), + new Object[] { " F ", "PMP", " R ", Character.valueOf('T'), + new ItemStack(BlockListAB.blockABStorage, 1, 6), Character.valueOf('F'), + new ItemStack(ItemListAB.itemABResource, 1, 4), Character.valueOf('P'), + new ItemStack(ConfigItems.itemEldritchObject, 1, 3), Character.valueOf('M'), + new ItemStack(ModItems.manaBottle), Character.valueOf('R'), + new ItemStack(ModItems.rune, 1, 8) }); + manaFlower = new BLexiconEntry("manaFlower", categoryForgotten); + manaFlower.setKnowledgeType(forgotten) + .setLexiconPages( + new LexiconPage[] { new PageText("0"), + new AlphirineCraftPage(manaFlower, manaFlowerRecipe.getOutput(), ".alphirineCraft"), + BotaniaAPI.internalHandler.craftingRecipePage(".craft", getLastRecipe()) }) + .setIcon(new ItemStack(ItemListAB.itemManaFlower)); } + // Pure Gladiolus recipe pureGladRecipe = BotaniaAPI.registerPetalRecipe( ItemBlockSpecialFlower.ofType("pureGladiolus"),