From c918a1b6d8008773e9beebb48ba1a770405aee20 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 19:54:41 -0400 Subject: Bulk update back to sanity --- .../fyresmodjam/items/ItemMysteryMushroom.java | 83 +++++++--------------- 1 file changed, 26 insertions(+), 57 deletions(-) (limited to 'YWD/src/main/java/fyresmodjam/items/ItemMysteryMushroom.java') diff --git a/YWD/src/main/java/fyresmodjam/items/ItemMysteryMushroom.java b/YWD/src/main/java/fyresmodjam/items/ItemMysteryMushroom.java index f38d488..d4e9b2f 100755 --- a/YWD/src/main/java/fyresmodjam/items/ItemMysteryMushroom.java +++ b/YWD/src/main/java/fyresmodjam/items/ItemMysteryMushroom.java @@ -28,16 +28,13 @@ public class ItemMysteryMushroom extends Item { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { - icon = par1IconRegister - .registerIcon("fyresmodjam:mushroom"); - overlay = par1IconRegister.registerIcon( - "fyresmodjam:mushroom_overlay"); + icon = par1IconRegister.registerIcon("fyresmodjam:mushroom"); + overlay = par1IconRegister.registerIcon("fyresmodjam:mushroom_overlay"); itemIcon = icon; } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, - List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for (int i = 0; i < 13; i++) { par3List.add(new ItemStack(par1, 1, i)); } @@ -45,10 +42,8 @@ public class ItemMysteryMushroom extends Item { @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, - int par2) { - return NewPacketHandler.mushroomColors[par1ItemStack - .getItemDamage() % 13][par2 % 2]; + public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { + return NewPacketHandler.mushroomColors[par1ItemStack.getItemDamage() % 13][par2 % 2]; } @Override @@ -64,20 +59,14 @@ public class ItemMysteryMushroom extends Item { } @Override - public boolean onItemUse(ItemStack par1ItemStack, - EntityPlayer par2EntityPlayer, World par3World, - int par4, int par5, int par6, int par7, float par8, - float par9, float par10) { + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, + int par5, int par6, int par7, float par8, float par9, float par10) { Block i1 = par3World.getBlock(par4, par5, par6); - if (i1 == Blocks.snow && (par3World.getBlockMetadata(par4, - par5, par6) & 7) < 1) { + if (i1 == Blocks.snow && (par3World.getBlockMetadata(par4, par5, par6) & 7) < 1) { par7 = 1; - } else if (i1 != Blocks.vine && i1 != Blocks.tallgrass - && i1 != Blocks.deadbush - && (i1 == null || !i1.isReplaceable( - par3World, par4, par5, - par6))) { + } else if (i1 != Blocks.vine && i1 != Blocks.tallgrass && i1 != Blocks.deadbush + && (i1 == null || !i1.isReplaceable(par3World, par4, par5, par6))) { if (par7 == 0) { --par5; } @@ -105,36 +94,22 @@ public class ItemMysteryMushroom extends Item { if (par1ItemStack.stackSize == 0) { return false; - } else if (!par2EntityPlayer.canPlayerEdit(par4, par5, - par6, par7, par1ItemStack)) { + } else if (!par2EntityPlayer.canPlayerEdit(par4, par5, par6, par7, par1ItemStack)) { return false; - } else if (par5 == 255 && ModjamMod.mysteryMushroomBlock - .getMaterial().isSolid()) { + } else if (par5 == 255 && ModjamMod.mysteryMushroomBlock.getMaterial().isSolid()) { return false; - } else if (par3World.canPlaceEntityOnSide( - ModjamMod.mysteryMushroomBlock, par4, par5, - par6, false, par7, par2EntityPlayer, - par1ItemStack)) { + } else if (par3World.canPlaceEntityOnSide(ModjamMod.mysteryMushroomBlock, par4, par5, par6, false, par7, + par2EntityPlayer, par1ItemStack)) { Block block = ModjamMod.mysteryMushroomBlock; int j1 = par1ItemStack.getItemDamage(); - int k1 = ModjamMod.mysteryMushroomBlock - .onBlockPlaced(par3World, par4, - par5, par6, par7, - par8, par9, par10, - j1); - - if (onItemUseFirst(par1ItemStack, par2EntityPlayer, - par3World, par4, par5, par6, par7, - par8, par9, par10, k1)) { - par3World.playSoundEffect(par4 + 0.5F, - par5 + 0.5F, par6 + 0.5F, - block.stepSound.func_150496_b(), - (block.stepSound.getVolume() - + 1.0F) - / 2.0F, - block.stepSound.getPitch() - * 0.8F); + int k1 = ModjamMod.mysteryMushroomBlock.onBlockPlaced(par3World, par4, par5, par6, par7, par8, par9, par10, + j1); + + if (onItemUseFirst(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10, + k1)) { + par3World.playSoundEffect(par4 + 0.5F, par5 + 0.5F, par6 + 0.5F, block.stepSound.func_150496_b(), + (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F); --par1ItemStack.stackSize; } @@ -144,21 +119,15 @@ public class ItemMysteryMushroom extends Item { } } - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, - World world, int x, int y, int z, int side, + public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - if (!world.setBlock(x, y, z, - ModjamMod.mysteryMushroomBlock, metadata, - 3)) { + if (!world.setBlock(x, y, z, ModjamMod.mysteryMushroomBlock, metadata, 3)) { return false; } - if (world.getBlock(x, y, - z) == ModjamMod.mysteryMushroomBlock) { - ModjamMod.mysteryMushroomBlock.onBlockPlacedBy( - world, x, y, z, player, stack); - ModjamMod.mysteryMushroomBlock.onPostBlockPlaced( - world, x, y, z, metadata); + if (world.getBlock(x, y, z) == ModjamMod.mysteryMushroomBlock) { + ModjamMod.mysteryMushroomBlock.onBlockPlacedBy(world, x, y, z, player, stack); + ModjamMod.mysteryMushroomBlock.onPostBlockPlaced(world, x, y, z, metadata); } return true; -- cgit v1.2.3