diff --git a/src/minecraft/assets/biomesoplenty/lang/en_US.xml b/src/minecraft/assets/biomesoplenty/lang/en_US.xml index ac3c7f2af..8eea4c530 100644 --- a/src/minecraft/assets/biomesoplenty/lang/en_US.xml +++ b/src/minecraft/assets/biomesoplenty/lang/en_US.xml @@ -35,7 +35,7 @@ Cattail Reed Tiny Cactus - Antiwart + Wither Wart Clover Swampflower diff --git a/src/minecraft/assets/biomesoplenty/textures/blocks/antiwart.png b/src/minecraft/assets/biomesoplenty/textures/blocks/antiwart.png deleted file mode 100644 index cadd8c7cd..000000000 Binary files a/src/minecraft/assets/biomesoplenty/textures/blocks/antiwart.png and /dev/null differ diff --git a/src/minecraft/assets/biomesoplenty/textures/blocks/item_antiwart.png b/src/minecraft/assets/biomesoplenty/textures/blocks/item_witherwart.png similarity index 100% rename from src/minecraft/assets/biomesoplenty/textures/blocks/item_antiwart.png rename to src/minecraft/assets/biomesoplenty/textures/blocks/item_witherwart.png diff --git a/src/minecraft/assets/biomesoplenty/textures/blocks/witherwart.png b/src/minecraft/assets/biomesoplenty/textures/blocks/witherwart.png new file mode 100644 index 000000000..67cf64733 Binary files /dev/null and b/src/minecraft/assets/biomesoplenty/textures/blocks/witherwart.png differ diff --git a/src/minecraft/biomesoplenty/api/BlockReferences.java b/src/minecraft/biomesoplenty/api/BlockReferences.java index 61a550457..72b279896 100644 --- a/src/minecraft/biomesoplenty/api/BlockReferences.java +++ b/src/minecraft/biomesoplenty/api/BlockReferences.java @@ -156,7 +156,7 @@ public class BlockReferences { cattail (Blocks.plants, 7), reed (Blocks.plants, 8), tinyCactus (Blocks.plants, 12), - antiwart (Blocks.plants, 13), + witherwart (Blocks.plants, 13), treeMoss (Blocks.treeMoss, 0), moss (Blocks.moss, 0), diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java b/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java index adb99018b..70516f5ec 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java @@ -13,6 +13,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; @@ -27,7 +29,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPPlant extends BlockFlower implements IShearable { - private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail", "reed", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "antiwart"}; + private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail", "reed", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "witherwart"}; private Icon[] textures; private static final int CATTAILTOP = 9; @@ -339,6 +341,11 @@ public class BlockBOPPlant extends BlockFlower implements IShearable public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) { super.harvestBlock(world, player, x, y, z, meta); + + if (meta == 13) + { + player.addPotionEffect(new PotionEffect(Potion.wither.id, 200)); + } } @Override @@ -366,14 +373,6 @@ public class BlockBOPPlant extends BlockFlower implements IShearable return false; } - - @Override - public void breakBlock(World par1World, int par2, int par3, int par4, int par5, int par6) - { - int meta = par1World.getBlockMetadata(par2, par3, par4); - - - } @Override public boolean isBlockReplaceable(World world, int x, int y, int z) diff --git a/src/minecraft/biomesoplenty/itemblocks/ItemBlockPlant.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockPlant.java index 76b99bb75..03055bfc7 100644 --- a/src/minecraft/biomesoplenty/itemblocks/ItemBlockPlant.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockPlant.java @@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBlockPlant extends ItemBlock { - private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail", "reed", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "antiwart"}; + private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail", "reed", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "witherwart"}; @SideOnly(Side.CLIENT) private Icon[] textures; @@ -39,7 +39,7 @@ public class ItemBlockPlant extends ItemBlock textures[0] = iconRegister.registerIcon("biomesoplenty:item_barley"); textures[1] = iconRegister.registerIcon("biomesoplenty:item_cattail"); textures[2] = iconRegister.registerIcon("biomesoplenty:item_reed"); - textures[3] = iconRegister.registerIcon("biomesoplenty:item_antiwart"); + textures[3] = iconRegister.registerIcon("biomesoplenty:item_witherwart"); } @Override