The Fel Pumpkin is now part of botania itself and not Garden of Glass.

This commit is contained in:
Vasco Lavos committed 2015-12-04 18:16:47 +00:00
1 parent e976d0d7a0
commit ed6aeeaf45
5 files changed
+25 -14

No files matched your search

@@ -123,7 +123,6 @@ public final class BotaniaCreativeTab extends CreativeTabs {
if(Botania.gardenOfGlassLoaded) {
addBlock(ModBlocks.root);
addBlock(ModBlocks.felPumpkin);
addItem(ModItems.waterBowl);
}
@@ -143,10 +142,12 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addBlock(ModBlocks.incensePlate);
addItem(ModItems.incenseStick);
addItem(ModItems.bloodPendant);
addBlock(ModBlocks.felPumpkin);
addBlock(ModBlocks.pylon);
addBlock(ModBlocks.pistonRelay);
addBlock(ModBlocks.hourglass);
addBlock(ModBlocks.redStringContainer);
addBlock(ModBlocks.redStringDispenser);
addBlock(ModBlocks.redStringFertilizer);
@@ -1886,6 +1886,16 @@ public final class ModCraftingRecipes {
'D', LibOreDict.DRAGONSTONE);
recipeCocoon = BotaniaAPI.getLatestAddedRecipe();
// Fel Pumpkin
GameRegistry.addRecipe(new ItemStack(ModBlocks.felPumpkin),
" S ", "BPF", " G ",
'S', new ItemStack(Items.string),
'B', new ItemStack(Items.bone),
'P', new ItemStack(Blocks.pumpkin),
'F', new ItemStack(Items.rotten_flesh),
'G', new ItemStack(Items.gunpowder));
recipeFelPumpkin = BotaniaAPI.getLatestAddedRecipe();
// Luminizer Recipe
addShapelessOreDictRecipe(new ItemStack(ModBlocks.lightRelay), LibOreDict.RED_STRING, LibOreDict.DRAGONSTONE, "dustGlowstone", "dustGlowstone");
recipeLuminizer = BotaniaAPI.getLatestAddedRecipe();
@@ -2219,16 +2229,6 @@ public final class ModCraftingRecipes {
addShapelessOreDictRecipe(new ItemStack(Items.slime_ball), new ItemStack(Items.magma_cream), new ItemStack(Items.water_bucket));
recipeMagmaToSlimeball = BotaniaAPI.getLatestAddedRecipe();
// Fel Pumpkin
GameRegistry.addRecipe(new ItemStack(ModBlocks.felPumpkin),
" S ", "BPF", " G ",
'S', new ItemStack(Items.string),
'B', new ItemStack(Items.bone),
'P', new ItemStack(Blocks.pumpkin),
'F', new ItemStack(Items.rotten_flesh),
'G', new ItemStack(Items.gunpowder));
recipeFelPumpkin = BotaniaAPI.getLatestAddedRecipe();
// Ender Portal
addOreDictRecipe(new ItemStack(Blocks.end_portal_frame),
"OGO",
@@ -160,6 +160,7 @@ public final class LexiconData {
public static LexiconEntry manaBomb;
public static LexiconEntry teruTeruBozu;
public static LexiconEntry avatar;
public static LexiconEntry felPumpkin;
public static LexiconEntry manaBlaster;
public static LexiconEntry grassSeeds;
@@ -352,7 +353,7 @@ public final class LexiconData {
if(Botania.gardenOfGlassLoaded) {
gardenOfGlass = new BLexiconEntry(LibLexicon.BASICS_GARDEN_OF_GLASS, categoryBasics);
gardenOfGlass.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeRootToSapling), new PageCraftingRecipe("4", ModCraftingRecipes.recipeRootToFertilizer), new PageCraftingRecipe("5", ModCraftingRecipes.recipePebbleCobblestone), new PageText("6"), new PageManaInfusionRecipe("7", ModManaInfusionRecipes.sugarCaneRecipe), new PageCraftingRecipe("8", ModCraftingRecipes.recipeMagmaToSlimeball), new PageText("9"), new PageCraftingRecipe("10", ModCraftingRecipes.recipeFelPumpkin), new PageText("11"), new PageCraftingRecipe("12", ModCraftingRecipes.recipeEndPortal));
gardenOfGlass.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeRootToSapling), new PageCraftingRecipe("4", ModCraftingRecipes.recipeRootToFertilizer), new PageCraftingRecipe("5", ModCraftingRecipes.recipePebbleCobblestone), new PageText("6"), new PageManaInfusionRecipe("7", ModManaInfusionRecipes.sugarCaneRecipe), new PageCraftingRecipe("8", ModCraftingRecipes.recipeMagmaToSlimeball), new PageText("9"), new PageText("11"), new PageCraftingRecipe("12", ModCraftingRecipes.recipeEndPortal));
gardenOfGlass.setPriority().setIcon(new ItemStack(ModItems.manaResource, 1, 20));
}
@@ -669,6 +670,9 @@ public final class LexiconData {
avatar = new BLexiconEntry(LibLexicon.DEVICE_AVATAR, categoryDevices);
avatar.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeAvatar));
felPumpkin = new BLexiconEntry(LibLexicon.DEVICE_FEL_PUMPKIN, categoryDevices);
felPumpkin.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFelPumpkin));
// TOOLS ENTRIES
manaBlaster = new BLexiconEntry(LibLexicon.TOOL_MANA_BLASTER, categoryTools);
manaBlaster.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeManaBlaster));
@@ -131,6 +131,7 @@ public final class LibLexicon {
public static final String DEVICE_MANA_BOMB = "manaBomb";
public static final String DEVICE_TERU_TERU_BOZU = "teruTeruBozu";
public static final String DEVICE_AVATAR = "avatar";
public static final String DEVICE_FEL_PUMPKIN = "felPumpkin";
public static final String TOOL_MANA_BLASTER = "manaBlaster";
public static final String TOOL_GRASS_SEEDS = "grassSeeds";