From ed6aeeaf45eb183f585dd16f5dcfb3ff2d68840c Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 4 Dec 2015 18:16:47 +0000 Subject: [PATCH] The Fel Pumpkin is now part of botania itself and not Garden of Glass. --- .../common/core/BotaniaCreativeTab.java | 3 ++- .../common/crafting/ModCraftingRecipes.java | 20 +++++++++---------- .../botania/common/lexicon/LexiconData.java | 6 +++++- .../vazkii/botania/common/lib/LibLexicon.java | 1 + .../resources/assets/botania/lang/en_US.lang | 9 +++++++-- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index f41f62e15..de8e1863e 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 5ddd41858..bd5b86718 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -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", diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 1a980a1c1..40ffbd8cd 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -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)); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 4981e079c..fc884c301 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -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"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 9caaf8472..3105e699e 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1984,8 +1984,7 @@ botania.page.gardenOfGlass5=Creating &1Cobblestone&0 botania.page.gardenOfGlass6=Aside from that, some things in Botania are different to fit the Skyblock play: The &1Orechid&0 is easier to make, faster and much cheaper; The &1Cocoon of Caprice&0 and the &1Mana Spreader&0 have different recipes; the &1Blaze Lamp&0, which can be used to create &1Obsidian&0, uses powder instead of rods; melon or pumpkin seeds may drop from tall grass; floral fertilizer creates more per craft, and &1Sugar Canes&0 and &1Slimeballs&0 can be crafted. botania.page.gardenOfGlass7=Creating &1Sugar Canes&0 botania.page.gardenOfGlass8=Creating &1Slimeballs&0 -botania.page.gardenOfGlass9=It's possible to infuse a &1Pumpkin&0 with the fel spirits of monster slain, creating a &1Fel Pumpkin&0. This can be placed atop two &1Iron Bars&0, in a similar fashion to a &1Snow Golem&0, to spawn a &1Blaze&0.
&1Blazes&0 spawned with this method drop &1Blaze Powder&0 instead of &1Blaze Rods&0. -botania.page.gardenOfGlass10=Nerfing warlocks again +botania.page.gardenOfGlass9=A problem that one might face in this world is entering the &4Nether&0. Worry not, however, as &1Blaze Lamps&0, as mentioned previously, can create &1Obsidian&0. To get these lamps, creating &1Blazes&0 using &1Fel Pumpkins&0 might be a good investment.
Since there's no easilly available &1Flint&0, opening the portal with a &1Fire Charge&0 will have to do. botania.page.gardenOfGlass11=Aside from providing light, the &1Mana Flash&0 present in the starting area allows a player who has lost their &1Lexica Botania&0 to exchange a &1Sapling&0 for it, by right clicking with the &1Sapling&0 on the &1Mana Flame&0.
This can only be done if the player doesn't have a &1Lexica Botania&0 on them. botania.page.gardenOfGlass12=Lastly, an &1End Portal&0 recipe @@ -2838,6 +2837,12 @@ botania.page.avatar0=Carving some &1Livingwood&0 and combining it with a &1Mana botania.page.avatar1=Not all &4Rods&0 fit this criteria. Any that do, however, will have an explanation of what they can do when given to a &1Livingwood Avatar&0 on their entry.
A few examples of some rods that will work are the &1Rod of the Skies&0, &1Rod of the Hells&0 and &1Rod of the Plentiful Mantle&0. botania.page.avatar2=But is it an anime? +# -- FEL PUMPKIN +botania.entry.felPumpkin=Fel Pumpkin +botania.tagline.felPumpkin=A pumpkin that can spawn blazes +botania.page.felPumpkin0=A &1Fel Pumpkin&0 is a demented infusion of a &1Pumpkin&0 with the fel spirits of slain monsters. This vile pumpkin can be placed atop two &1Iron Bars&0, in a similar fashion to a &1Snow Golem&0, to spawn a &1Blaze&0.
&1Blazes&0 spawned with this method drop a fairly reasonable amount of &1Blaze Powder&0 instead of a small serving of &1Blaze Rods&0. +botania.page.felPumpkin1=Nerfing warlocks again + # - MYSTICAL INSTRUMENTS # -- MANA BLASTER botania.entry.manaBlaster=Mana Blaster