From da02c13a7107a883807d70d08c82e3fce14ee60a Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sun, 22 Feb 2015 20:28:16 +0000 Subject: [PATCH] Mana Infused String and recipe/docs for the Bows. --- .../common/crafting/ModCraftingRecipes.java | 19 ++++++++++++++++++- .../crafting/ModManaInfusionRecipes.java | 4 +++- .../vazkii/botania/common/item/ModItems.java | 1 + .../item/material/ItemManaResource.java | 2 +- .../botania/common/lexicon/LexiconData.java | 10 +++++++++- .../botania/common/lib/LibItemNames.java | 3 ++- .../vazkii/botania/common/lib/LibLexicon.java | 4 +++- .../vazkii/botania/common/lib/LibOreDict.java | 1 + .../resources/assets/botania/lang/en_US.lang | 12 ++++++++++++ 9 files changed, 50 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 28f1d7238..17546e06e 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -234,7 +234,9 @@ public final class ModCraftingRecipes { public static IRecipe recipeCorporeaFunnel; public static IRecipe recipeEndStoneBricks; public static IRecipe recipeEndStoneChiseledBricks; - + public static IRecipe recipeLivingwoodBow; + public static IRecipe recipeCrystalBow; + public static void init() { // Lexicon Recipe addShapelessOreDictRecipe(new ItemStack(ModItems.lexicon), "treeSapling", Items.book); @@ -1542,6 +1544,21 @@ public final class ModCraftingRecipes { 'S', new ItemStack(ModFluffBlocks.endStoneSlab)); recipeEndStoneChiseledBricks = BotaniaAPI.getLatestAddedRecipe(); + // Livingwood Bow Recipe + addOreDictRecipe(new ItemStack(ModItems.livingwoodBow), + " TS", "T S", " TS", + 'T', LibOreDict.LIVINGWOOD_TWIG, + 'S', LibOreDict.MANA_STRING); + recipeLivingwoodBow = BotaniaAPI.getLatestAddedRecipe(); + + // Crystal Bow Recipe + addOreDictRecipe(new ItemStack(ModItems.crystalBow), + " DS", "T S", " DS", + 'T', LibOreDict.LIVINGWOOD_TWIG, + 'D', LibOreDict.DRAGONSTONE, + 'S', LibOreDict.MANA_STRING); + recipeCrystalBow = BotaniaAPI.getLatestAddedRecipe(); + // Storage Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 49f65e44c..2a6fc71cf 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -41,6 +41,7 @@ public final class ModManaInfusionRecipes { public static RecipeManaInfusion tinyPotatoRecipe; public static RecipeManaInfusion manaInkwellRecipe; public static RecipeManaInfusion managlassRecipe; + public static RecipeManaInfusion manaStringRecipe; public static void init() { poolRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.pool), new ItemStack(ModBlocks.pool, 1, 2), 320); @@ -77,7 +78,8 @@ public final class ModManaInfusionRecipes { } managlassRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.manaGlass), new ItemStack(Blocks.glass), 150); - + manaStringRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 16), new ItemStack(Items.string), 5000); + BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaBottle), new ItemStack(Items.glass_bottle), 5000); } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 5113bcf90..cec584141 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -346,6 +346,7 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.DREAMWOOD_TWIG, new ItemStack(manaResource, 1, 13)); OreDictionary.registerOre(LibOreDict.GAIA_INGOT, new ItemStack(manaResource, 1, 14)); OreDictionary.registerOre(LibOreDict.ENDER_AIR_BOTTLE, new ItemStack(manaResource, 1, 15)); + OreDictionary.registerOre(LibOreDict.MANA_STRING, new ItemStack(manaResource, 1, 16)); OreDictionary.registerOre(LibOreDict.VIAL, new ItemStack(vial, 1, 0)); OreDictionary.registerOre(LibOreDict.FLASK, new ItemStack(vial, 1, 1)); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 2ed06a164..157d697c7 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -43,7 +43,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement { - final int types = 16; + final int types = 17; IIcon[] icons; public IIcon tailIcon = null; diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index a2beb0f11..893ef2ed3 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -166,6 +166,8 @@ public final class LexiconData { public static LexiconEntry spellCloth; public static LexiconEntry thornChakram; public static LexiconEntry overgrowthSeed; + public static LexiconEntry livingwoodBow; + public static LexiconEntry crystalBow; public static LexiconEntry enderAir; public static LexiconEntry enderEyeBlock; @@ -292,7 +294,7 @@ public final class LexiconData { spreader.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_SPREADER), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("11"), new PageCraftingRecipe("5", ModCraftingRecipes.recipesSpreader)); pool = new BLexiconEntry(LibLexicon.MANA_POOL, categoryMana); - pool.setPriority().setLexiconPages(new PageText("0"), new PageText("9"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePool), new PageManaInfusionRecipe("10", ModManaInfusionRecipes.poolRecipe), new PageText("2"), new PageText("8"), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.manasteelRecipes), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaPearlRecipe), new PageManaInfusionRecipe("5", ModManaInfusionRecipes.manaDiamondRecipes), new PageManaInfusionRecipe("6", ModManaInfusionRecipes.manaPetalRecipes), new PageManaInfusionRecipe("11", ModManaInfusionRecipes.managlassRecipe), new PageManaInfusionRecipe("7", ModManaInfusionRecipes.manaCookieRecipe)).setIcon(new ItemStack(ModBlocks.pool)); + pool.setPriority().setLexiconPages(new PageText("0"), new PageText("9"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePool), new PageManaInfusionRecipe("10", ModManaInfusionRecipes.poolRecipe), new PageText("2"), new PageText("8"), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.manasteelRecipes), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaPearlRecipe), new PageManaInfusionRecipe("5", ModManaInfusionRecipes.manaDiamondRecipes), new PageManaInfusionRecipe("6", ModManaInfusionRecipes.manaPetalRecipes), new PageManaInfusionRecipe("11", ModManaInfusionRecipes.managlassRecipe), new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaStringRecipe), new PageManaInfusionRecipe("7", ModManaInfusionRecipes.manaCookieRecipe)).setIcon(new ItemStack(ModBlocks.pool)); sparks = new BLexiconEntry(LibLexicon.MANA_SPARKS, categoryMana); sparks.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipesSpark)); @@ -636,6 +638,12 @@ public final class LexiconData { overgrowthSeed = new BLexiconEntry(LibLexicon.TOOL_OVERGROWTH_SEED, categoryTools); overgrowthSeed.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.overgrowthSeed)); + livingwoodBow = new BLexiconEntry(LibLexicon.TOOL_LIVINGWOOD_BOW, categoryTools); + livingwoodBow.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeLivingwoodBow)); + + crystalBow = new ALexiconEntry(LibLexicon.TOOL_CRYSTAL_BOW, categoryTools); + crystalBow.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeCrystalBow)); + // ENDER ENTRIES enderAir = new BLexiconEntry(LibLexicon.ENDER_AIR, categoryEnder); enderAir.setPriority().setLexiconPages(new PageText("0")); diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index b3b2a4281..9caf546bd 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -163,6 +163,7 @@ public final class LibItemNames { "redString", "dreamwoodTwig", "gaiaIngot", - "enderAirBottle" + "enderAirBottle", + "manaString" }; } diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 1dc03be37..3ab5bb11f 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -143,7 +143,9 @@ public final class LibLexicon { public static final String TOOL_SPELL_CLOTH = "spellCloth"; public static final String TOOL_THORN_CHAKRAM = "thornChakram"; public static final String TOOL_OVERGROWTH_SEED = "overgrowthSeed"; - + public static final String TOOL_LIVINGWOOD_BOW = "livingwoodBow"; + public static final String TOOL_CRYSTAL_BOW = "crystalBow"; + public static final String ENDER_AIR = "enderAir"; public static final String ENDER_ENDER_EYE_BLOCK = "enderEyeBlock"; public static final String ENDER_PISTON_RELAY = "pistonRelay"; diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java index a2ff840b6..5e4b8a365 100644 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ b/src/main/java/vazkii/botania/common/lib/LibOreDict.java @@ -34,6 +34,7 @@ public final class LibOreDict { public static final String DREAMWOOD_TWIG = "dreamwoodTwig"; public static final String GAIA_INGOT = "gaiaIngot"; public static final String ENDER_AIR_BOTTLE = "bEnderAirBottle"; + public static final String MANA_STRING = "manaString"; public static final String VIAL = "bVial"; public static final String FLASK = "bFlask"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 1a5617916..7f13fe99a 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1065,6 +1065,7 @@ item.botania:cosmetic28.name=Thick Eyebrows item.botania:cosmetic29.name=Lusitanic Shield item.botania:cosmetic30.name=Tiny Potato Mask item.botania:cosmetic31.name=Questgiver Mark +item.botania:manaString.name=Mana Infused String # BREW NAMES botania.brew.fallback=Fallback @@ -1236,6 +1237,7 @@ botania.page.pool4=Infusing &1Mana Pearls&0 botania.page.pool5=Infusing &1Mana Diamonds&0 botania.page.pool6=Infusing &1Mana Petals&0 botania.page.pool11=Infusing &1Managlass&0, clear seamless glass. +botania.page.pool12=Infusing &1String&0 botania.page.pool7=Infusing &1Mana Cookies&0, pretty good food. # -- SPARKS @@ -1946,6 +1948,16 @@ botania.page.thornChakram1=Spores and stingers botania.entry.overgrowthSeed=Overgrowth Seed botania.page.overgrowthSeed0=An &1Overgrowth Seed&0 is an elusive item, which can be used to enchant a piece of &1Grass&0, via right clicking on it in the world, creating &1Enchanted Soil&0. Flowers that are rooted on this &1Enchanted Soil&0 will function at double the normal speed.
There's one problem, though. No known method of creating these exists, but they have been spotted in ancient structures and the like. +# -- LIVINGWOOD BOW +botania.entry.livingwoodBow=Livingwood Bow +botania.page.livingwoodBow0=The &1Livingwood Bow&0 is, as the name describes, a bow made of &1Livingwood&0 strung with &1Mana Infused String&0. Due to its componenets, it will last for longer than a normal &1Bow&0, it'll also repair itself using &4Mana&0, similarly to &1Manasteel Tools&0. +botania.page.livingwoodBow1=Does it shoot airplanes? + +# -- CRYSTAL BOW +botania.entry.crystalBow=Crystal Bow +botania.page.crystalBow0=Crafted with &1Dragonstone&0, the &1Crystal Bow&0 is a ranged weapon with the capacity to generate arrows from &4Mana&0. Similarly to the &1Livingwood Bow&0, it'll repair using &4Mana&0 as well, but carrying &1Arrows&0 is not required as they are created through the magical energies. +botania.page.crystalBow1=The elves are roving + # - ENDER ARTEFACTS # -- EXTRACTING ENDER AIR botania.entry.enderAir=Extracting Ender Air