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 000000000..7e65201b4 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/grassHorn2.png differ 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