From dc01b5ad8e64d8f3f151dfe879ba5047e04157ab Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sun, 15 Mar 2015 21:40:43 +0000 Subject: [PATCH] Added the Horn of the Covering to clear snow. Closes #648 --- .../common/crafting/ModCraftingRecipes.java | 5 +++++ .../botania/common/item/ItemGrassHorn.java | 5 +++-- .../botania/common/lexicon/LexiconData.java | 2 +- .../resources/assets/botania/lang/en_US.lang | 6 ++++-- .../botania/textures/items/grassHorn2.png | Bin 0 -> 18024 bytes .../items/{ => unused}/crystalBowLong0.png | Bin 6 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/items/grassHorn2.png rename src/main/resources/assets/botania/textures/items/{ => unused}/crystalBowLong0.png (100%) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index c8b203289..14f19c956 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -239,6 +239,7 @@ public final class ModCraftingRecipes { public static List recipesCosmeticItems; public static List recipesMushrooms; public static IRecipe recipeSwapRing; + public static IRecipe recipeSnowHorn; public static void init() { // Lexicon Recipe @@ -1587,6 +1588,10 @@ public final class ModCraftingRecipes { 'M', LibOreDict.MANA_STEEL); recipeSwapRing = BotaniaAPI.getLatestAddedRecipe(); + // Horn of the Covering Recipe + addShapelessOreDictRecipe(new ItemStack(ModItems.grassHorn, 1, 2), new ItemStack(ModItems.grassHorn), new ItemStack(Items.snowball)); + recipeSnowHorn = BotaniaAPI.getLatestAddedRecipe(); + // Storage Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 89c25651a..01fef64ab 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -22,6 +22,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -36,7 +37,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemGrassHorn extends ItemMod { - private static final int SUBTYPES = 2; + private static final int SUBTYPES = 3; IIcon[] icons; public ItemGrassHorn() { @@ -112,7 +113,7 @@ public class ItemGrassHorn extends ItemMod { int z = srcz + j; Block block = world.getBlock(x, y, z); - if(stackDmg == 0 && block instanceof BlockBush && !(block instanceof ISpecialFlower) && (!(block instanceof IGrassHornExcempt) || ((IGrassHornExcempt) block).canUproot(world, x, y, z)) || stackDmg == 1 && block instanceof BlockLeavesBase) + if((stackDmg == 0 && block instanceof BlockBush && !(block instanceof ISpecialFlower) && (!(block instanceof IGrassHornExcempt) || ((IGrassHornExcempt) block).canUproot(world, x, y, z))) || (stackDmg == 1 && block instanceof BlockLeavesBase) || (stackDmg == 2 && block == Blocks.snow_layer)) coords.add(new ChunkCoordinates(x, y, z)); } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index e5a175246..2630eeefa 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -567,7 +567,7 @@ public final class LexiconData { terrasteelArmor.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTerrasteelHelm), new PageCraftingRecipe("2", ModCraftingRecipes.recipeTerrasteelChest), new PageCraftingRecipe("3", ModCraftingRecipes.recipeTerrasteelLegs), new PageCraftingRecipe("4", ModCraftingRecipes.recipeTerrasteelBoots)); grassHorn = new BLexiconEntry(LibLexicon.TOOL_GRASS_HORN, categoryTools); - grassHorn.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGrassHorn), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLeafHorn)); + grassHorn.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGrassHorn), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLeafHorn), new PageCraftingRecipe("3", ModCraftingRecipes.recipeSnowHorn)); terraBlade = new BLexiconEntry(LibLexicon.TOOL_TERRA_SWORD, categoryTools); terraBlade.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTerraSword)); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 9f7eb8e91..c30565e16 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -944,6 +944,7 @@ item.botania:manasteelSword.name=Manasteel Sword item.botania:manasteelShears.name=Manasteel Shears item.botania:grassHorn0.name=Horn of the Wild item.botania:grassHorn1.name=Horn of the Canopy +item.botania:grassHorn2.name=Horn of the Covering item.botania:terrasteel.name=Terrasteel Ingot item.botania:terrasteelHelm.name=Terrasteel Helmet item.botania:terrasteelChest.name=Terrasteel Chestplate @@ -1812,9 +1813,10 @@ botania.page.manaGear9=The &1Manasteel Boots&0 # -- HORN OF THE WILD botania.entry.grassHorn=Horn of the Wild -botania.page.grassHorn0=Clearing out &1Tall Grass&0 by hand can definitely be a nuisance.
Simply blowing the &1Horn of the Wild&0 will quickly cause any nearby vegetation to uproot, leaving behind drops as if it had been broken by hand.
With some modifications, the horn can be modified to break leaves instead. +botania.page.grassHorn0=Clearing out &1Tall Grass&0 by hand can definitely be a nuisance.
Simply blowing the &1Horn of the Wild&0 will quickly cause any nearby vegetation to uproot, leaving behind drops as if it had been broken by hand.
With some modifications, the horn can be modified to break leaves or snow instead. botania.page.grassHorn1=Crafting the horn -botania.page.grassHorn2=Modifying the horn +botania.page.grassHorn2=Modifying to break &1Leaves&0 +botania.page.grassHorn3=Modifying to break &1Snow&0 # -- TERRASTEEL ARMOR botania.entry.terrasteelArmor=Terrasteel Armor diff --git a/src/main/resources/assets/botania/textures/items/grassHorn2.png b/src/main/resources/assets/botania/textures/items/grassHorn2.png new file mode 100644 index 0000000000000000000000000000000000000000..7e65201b48ca55007bc697ab702a60663514f611 GIT binary patch literal 18024 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 A(*OVf literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/items/crystalBowLong0.png b/src/main/resources/assets/botania/textures/items/unused/crystalBowLong0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/crystalBowLong0.png rename to src/main/resources/assets/botania/textures/items/unused/crystalBowLong0.png