From dffc0b6ed4011b62b8830fca641bf1fa0d3cb660 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 14 Apr 2014 22:01:41 +0100 Subject: [PATCH] Recipe/docs for the Terra Blade. --- MODSRC/vazkii/botania/api/BotaniaAPI.java | 2 +- .../botania/common/crafting/ModCrafingRecipes.java | 8 ++++++++ .../botania/common/item/tool/ItemTerraSword.java | 2 +- MODSRC/vazkii/botania/common/lexicon/LexiconData.java | 10 +++++++--- MODSRC/vazkii/botania/common/lib/LibLexicon.java | 3 ++- resources/assets/botania/lang/en_US.lang | 5 +++++ 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/MODSRC/vazkii/botania/api/BotaniaAPI.java b/MODSRC/vazkii/botania/api/BotaniaAPI.java index 8774bdd8d..73fb9cc96 100644 --- a/MODSRC/vazkii/botania/api/BotaniaAPI.java +++ b/MODSRC/vazkii/botania/api/BotaniaAPI.java @@ -52,7 +52,7 @@ public final class BotaniaAPI { public static ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); public static ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", 34, new int[] {3, 8, 6, 3}, 26); - public static ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 3, 1800, 9F, 3F, 26); + public static ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 3, 2300, 9F, 3F, 26); static { registerSubTile("", DummySubTile.class); diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index 00065e297..c41480dde 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -96,6 +96,7 @@ public final class ModCrafingRecipes { public static IRecipe recipeTerrasteelChest; public static IRecipe recipeTerrasteelLegs; public static IRecipe recipeTerrasteelBoots; + public static IRecipe recipeTerraSword; public static void init() { // Lexicon Recipe @@ -448,6 +449,13 @@ public final class ModCrafingRecipes { "S S", "S S", 'S', LibOreDict.TERRA_STEEL); recipeTerrasteelBoots = BotaniaAPI.getLatestAddedRecipe(); + + // Terra Blade Recipe + addOreDictRecipe(new ItemStack(ModItems.terraSword), + "I", "I", "S", + 'I', LibOreDict.TERRA_STEEL, + 'S', LibOreDict.LIVINGWOOD_TWIG); + recipeTerraSword = BotaniaAPI.getLatestAddedRecipe(); } private static void addOreDictRecipe(ItemStack output, Object... recipe) { diff --git a/MODSRC/vazkii/botania/common/item/tool/ItemTerraSword.java b/MODSRC/vazkii/botania/common/item/tool/ItemTerraSword.java index b5d777e5f..b1302028c 100644 --- a/MODSRC/vazkii/botania/common/item/tool/ItemTerraSword.java +++ b/MODSRC/vazkii/botania/common/item/tool/ItemTerraSword.java @@ -37,7 +37,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect { public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { if(par3Entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) par3Entity; - if(player.swingProgress == 0.16666667F && !par2World.isRemote && par2World.rand.nextInt(2) == 0) { + if(player.getCurrentEquippedItem() == par1ItemStack && player.swingProgress == 0.16666667F && !par2World.isRemote && par2World.rand.nextInt(2) == 0) { EntityManaBurst burst = getBurst(player, par1ItemStack); par2World.spawnEntityInWorld(burst); ManasteelToolCommons.damageItem(par1ItemStack, 1, player, MANA_PER_DAMAGE); diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 12e3a1842..1fd513983 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -101,6 +101,7 @@ public final class LexiconData { public static LexiconEntry manasteelGear; public static LexiconEntry terrasteelArmor; public static LexiconEntry grassHorn; + public static LexiconEntry terraBlade; public static LexiconEntry unstableBlocks; public static LexiconEntry decorativeBlocks; @@ -289,12 +290,15 @@ public final class LexiconData { new PageCraftingRecipe("4", ModCrafingRecipes.recipeManasteelShears), new PageCraftingRecipe("5", ModCrafingRecipes.recipeManasteelSword), new PageCraftingRecipe("6", ModCrafingRecipes.recipeManasteelHelm), new PageCraftingRecipe("7", ModCrafingRecipes.recipeManasteelChest), new PageCraftingRecipe("8", ModCrafingRecipes.recipeManasteelLegs), new PageCraftingRecipe("9", ModCrafingRecipes.recipeManasteelBoots)); - grassSeeds = new BLexiconEntry(LibLexicon.TOOL_GRASS_HORN, categoryTools); - grassSeeds.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeGrassHorn)); - terrasteelArmor = new BLexiconEntry(LibLexicon.TOOL_TERRASTEEL_ARMOR, categoryTools); terrasteelArmor.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeTerrasteelHelm), new PageCraftingRecipe("2", ModCrafingRecipes.recipeTerrasteelChest), new PageCraftingRecipe("3", ModCrafingRecipes.recipeTerrasteelLegs), new PageCraftingRecipe("4", ModCrafingRecipes.recipeTerrasteelBoots)); + grassHorn = new BLexiconEntry(LibLexicon.TOOL_GRASS_HORN, categoryTools); + grassHorn.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeGrassHorn)); + + terraBlade = new BLexiconEntry(LibLexicon.TOOL_TERRA_SWORD, categoryTools); + terraBlade.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeTerraSword)); + // MISCLENAEOUS ENTRIES unstableBlocks = new BLexiconEntry(LibLexicon.MISC_UNSTABLE_BLOCKS, categoryMisc); unstableBlocks.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_UNSTABLE_BLOCK), new PageCraftingRecipe("2", ModCrafingRecipes.recipesUnstableBlocks), new PageText("3"), new PageImage("4", LibResources.ENTRY_UNSTABLE_BEACON), new PageCraftingRecipe("5", ModCrafingRecipes.recipesManaBeacons), new PageText("6"), new PageCraftingRecipe("7", ModCrafingRecipes.recipesSignalFlares)); diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index 44f2a7c76..4f210685b 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -83,7 +83,8 @@ public final class LibLexicon { public static final String TOOL_MANASTEEL_GEAR = "manaGear"; public static final String TOOL_TERRASTEEL_ARMOR = "terrasteelArmor"; public static final String TOOL_GRASS_HORN = "grassHorn"; - + public static final String TOOL_TERRA_SWORD = "terraSword"; + public static final String MISC_UNSTABLE_BLOCKS = "unstableBlocks"; public static final String MISC_DECORATIVE_BLOCKS = "decorativeBlocks"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 751a13482..40767f891 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -650,6 +650,11 @@ botania.page.terrasteelArmor2=The &1Terrasteel Chestplate&0 botania.page.terrasteelArmor3=The &1Terrasteel Leggings&0 botania.page.terrasteelArmor4=The &1Terrasteel Boots&0 +# -- TERRA BLADE +botania.entry.terraSword=Terra Blade +botania.page.terraSword0=The &1Terra Blade&0, crafted from &1Terrasteel Ingots&0, is a sword infused with natural strength. Not only does it par with a &1Diamond Sword&0 in terms of strength and it uses &4Mana&0 from the inventory like &1Manasteel Tools&0, but when it's swinged, there's a chance for it to create a beam that will deal as much damage as a melee hit. +botania.page.terraSword1=No Broken Hero Sword + # - MISCLANEOUS # -- UNSTABLE CUBE botania.entry.unstableBlocks=Unstable Cubes