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 --- .../main/java/fyresmodjam/blocks/BlockTrap.java | 288 ++++++--------------- 1 file changed, 78 insertions(+), 210 deletions(-) (limited to 'YWD/src/main/java/fyresmodjam/blocks/BlockTrap.java') diff --git a/YWD/src/main/java/fyresmodjam/blocks/BlockTrap.java b/YWD/src/main/java/fyresmodjam/blocks/BlockTrap.java index 1de921a..cecfa63 100755 --- a/YWD/src/main/java/fyresmodjam/blocks/BlockTrap.java +++ b/YWD/src/main/java/fyresmodjam/blocks/BlockTrap.java @@ -53,8 +53,7 @@ public class BlockTrap extends BlockContainer implements IShearable { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = par1IconRegister - .registerIcon("fyresmodjam:spikes2"); + blockIcon = par1IconRegister.registerIcon("fyresmodjam:spikes2"); } public int idDropped(int par1, Random par2Random, int par3) { @@ -62,31 +61,24 @@ public class BlockTrap extends BlockContainer implements IShearable { } @Override - public ItemStack getPickBlock(MovingObjectPosition object, - World par1World, int par2, int par3, int par4) { + public ItemStack getPickBlock(MovingObjectPosition object, World par1World, int par2, int par3, int par4) { return new ItemStack(ModjamMod.blockTrap); } @Override - public boolean canHarvestBlock(EntityPlayer par1EntityPlayer, - int par2) { + public boolean canHarvestBlock(EntityPlayer par1EntityPlayer, int par2) { return false; } @Override - public boolean onBlockActivated(World par1World, int par2, - int par3, int par4, EntityPlayer par5EntityPlayer, + public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { if (par5EntityPlayer.getHeldItem() == null) { - TileEntity te = par1World.getTileEntity(par2, par3, - par4); + TileEntity te = par1World.getTileEntity(par2, par3, par4); - if (!par5EntityPlayer.isSneaking() && te != null - && te instanceof TileEntityTrap + if (!par5EntityPlayer.isSneaking() && te != null && te instanceof TileEntityTrap && ((TileEntityTrap) te).placedBy != null - && ((TileEntityTrap) te).placedBy - .equals(par5EntityPlayer - .getCommandSenderName())) { + && ((TileEntityTrap) te).placedBy.equals(par5EntityPlayer.getCommandSenderName())) { if (!par1World.isRemote) { ((TileEntityTrap) te).setting++; if (((TileEntityTrap) te).setting >= TileEntityTrap.settings.length) { @@ -95,18 +87,12 @@ public class BlockTrap extends BlockContainer implements IShearable { te.markDirty(); - NewPacketHandler.SEND_MESSAGE - .sendToPlayer(par5EntityPlayer, - "\u00A7e\u00A7oSet to: " - + TileEntityTrap.settings[((TileEntityTrap) te).setting] - + "."); + NewPacketHandler.SEND_MESSAGE.sendToPlayer(par5EntityPlayer, + "\u00A7e\u00A7oSet to: " + TileEntityTrap.settings[((TileEntityTrap) te).setting] + "."); } } else if (par1World.isRemote) { - NewPacketHandler.DISARM_TRAP.sendToServer( - par2, par3, par4, - BlessingUtils.hasBlessing( - par5EntityPlayer, - "BlessingMechanic")); + NewPacketHandler.DISARM_TRAP.sendToServer(par2, par3, par4, + BlessingUtils.hasBlessing(par5EntityPlayer, "BlessingMechanic")); } } @@ -115,8 +101,7 @@ public class BlockTrap extends BlockContainer implements IShearable { @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, - int par2, int par3, int par4, int par5) { + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return false; } @@ -141,164 +126,88 @@ public class BlockTrap extends BlockContainer implements IShearable { } @Override - public void addCollisionBoxesToList(World par1World, int par2, - int par3, int par4, - AxisAlignedBB par5AxisAlignedBB, List par6List, - Entity par7Entity) { + public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, + List par6List, Entity par7Entity) { } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool( - World par1World, int par2, int par3, int par4) { - return super.getCollisionBoundingBoxFromPool(par1World, - par2, par3, par4); + public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { + return super.getCollisionBoundingBoxFromPool(par1World, par2, par3, par4); } @Override @SideOnly(Side.CLIENT) - public MovingObjectPosition collisionRayTrace(World par1World, - int par2, int par3, int par4, Vec3 par5Vec3, + public MovingObjectPosition collisionRayTrace(World par1World, int par2, int par3, int par4, Vec3 par5Vec3, Vec3 par6Vec3) { EntityPlayer player = Minecraft.getMinecraft().thePlayer; TileEntity te = par1World.getTileEntity(par2, par3, par4); return (player != null && te instanceof TileEntityTrap - && (((TileEntityTrap) te).placedBy != null - || !NewPacketHandler.trapsDisabled) - && (player.getCommandSenderName().equals( - ((TileEntityTrap) te).placedBy) - || player.isSneaking() - || (BlessingUtils - .hasBlessing(player, - "MarkScouting")))) ? super.collisionRayTrace( - par1World, - par2, - par3, - par4, - par5Vec3, - par6Vec3) - : null; + && (((TileEntityTrap) te).placedBy != null || !NewPacketHandler.trapsDisabled) + && (player.getCommandSenderName().equals(((TileEntityTrap) te).placedBy) || player.isSneaking() + || (BlessingUtils.hasBlessing(player, "MarkScouting")))) + ? super.collisionRayTrace(par1World, par2, par3, par4, par5Vec3, par6Vec3) + : null; } @Override - public void onEntityCollidedWithBlock(World par1World, int par2, - int par3, int par4, Entity par5Entity) { + public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { TileEntity te = par1World.getTileEntity(par2, par3, par4); boolean b1 = (((TileEntityTrap) te).placedBy == null - || !par5Entity.getCommandSenderName() - .equals(((TileEntityTrap) te).placedBy)); + || !par5Entity.getCommandSenderName().equals(((TileEntityTrap) te).placedBy)); boolean b2 = ((TileEntityTrap) te).setting != 3 - && (!(par5Entity instanceof EntityPlayer) - || ((TileEntityTrap) te).setting < 2); - boolean b3 = (ConfigData.spawnTraps - || ((TileEntityTrap) te).placedBy != null); - boolean b4 = ((par5Entity instanceof EntityPlayer - && !((EntityPlayer) par5Entity).capabilities.isCreativeMode) + && (!(par5Entity instanceof EntityPlayer) || ((TileEntityTrap) te).setting < 2); + boolean b3 = (ConfigData.spawnTraps || ((TileEntityTrap) te).placedBy != null); + boolean b4 = ((par5Entity instanceof EntityPlayer && !((EntityPlayer) par5Entity).capabilities.isCreativeMode) || par5Entity instanceof EntityMob); - if (!par1World.isRemote && par5Entity.ridingEntity == null - && te != null - && te instanceof TileEntityTrap && b1 && b2 - && b3 && b4) { + if (!par1World.isRemote && par5Entity.ridingEntity == null && te != null && te instanceof TileEntityTrap && b1 + && b2 && b3 && b4) { - int type = par1World.getBlockMetadata(par2, par3, - par4); + int type = par1World.getBlockMetadata(par2, par3, par4); boolean scout = BlessingUtils.hasBlessing(par5Entity, "MarkScouting"); if (par5Entity instanceof EntityPlayer) { if (type % trapTypes == 0) { - par5Entity.attackEntityFrom( - DamageSource.cactus, - 8.0F + (scout ? 2.0F - : 0.0F)); - if (ModjamMod.r.nextInt(8 - (scout - ? 2 - : 0)) == 0) { + par5Entity.attackEntityFrom(DamageSource.cactus, 8.0F + (scout ? 2.0F : 0.0F)); + if (ModjamMod.r.nextInt(8 - (scout ? 2 : 0)) == 0) { ((EntityLivingBase) par5Entity) - .addPotionEffect( - new PotionEffect( - Potion.poison.id, - 100 + (scout ? 25 - : 0), - 1)); + .addPotionEffect(new PotionEffect(Potion.poison.id, 100 + (scout ? 25 : 0), 1)); } } else if (type % trapTypes == 1) { if (!par5Entity.isBurning()) { - par5Entity.setFire(10 - + (scout ? 2 - : 0)); + par5Entity.setFire(10 + (scout ? 2 : 0)); } } else if (type % trapTypes == 2) { ((EntityLivingBase) par5Entity) - .addPotionEffect( - new PotionEffect( - Potion.blindness.id, - 200 + (scout ? 50 - : 0), - 1)); + .addPotionEffect(new PotionEffect(Potion.blindness.id, 200 + (scout ? 50 : 0), 1)); ((EntityLivingBase) par5Entity) - .addPotionEffect( - new PotionEffect( - Potion.moveSlowdown.id, - 200 + (scout ? 50 - : 0), - 1)); + .addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 200 + (scout ? 50 : 0), 1)); } - if (CommonTickHandler.worldData - .getDisadvantage() - .equals("Explosive Traps")) { - par5Entity.worldObj.setBlockToAir( - par2, par3, par4); - par5Entity.worldObj - .createExplosion( - null, - par2 + 0.5F, - par3 + 0.5F, - par4 + 0.5F, - 1.33F, - true); + if (CommonTickHandler.worldData.getDisadvantage().equals("Explosive Traps")) { + par5Entity.worldObj.setBlockToAir(par2, par3, par4); + par5Entity.worldObj.createExplosion(null, par2 + 0.5F, par3 + 0.5F, par4 + 0.5F, 1.33F, true); } par1World.setBlockToAir(par2, par3, par4); - NewPacketHandler.SEND_MESSAGE.sendToPlayer( - (EntityPlayer) par5Entity, - "\u00A7c\u00A7oYou triggered a " - + ItemTrap.names[type - % trapTypes].toLowerCase() - + "!"); + NewPacketHandler.SEND_MESSAGE.sendToPlayer((EntityPlayer) par5Entity, + "\u00A7c\u00A7oYou triggered a " + ItemTrap.names[type % trapTypes].toLowerCase() + "!"); } else { if (type % trapTypes == 0) { - par5Entity.attackEntityFrom( - DamageSource.cactus, - 2.0F); + par5Entity.attackEntityFrom(DamageSource.cactus, 2.0F); if (ModjamMod.r.nextInt(32) == 0) { - ((EntityLivingBase) par5Entity) - .addPotionEffect( - new PotionEffect( - Potion.poison.id, - 100, - 1)); + ((EntityLivingBase) par5Entity).addPotionEffect(new PotionEffect(Potion.poison.id, 100, 1)); } } else if (type % trapTypes == 1) { if (!par5Entity.isBurning()) { par5Entity.setFire(5); } } else if (type % trapTypes == 2) { - ((EntityLivingBase) par5Entity) - .addPotionEffect( - new PotionEffect( - Potion.blindness.id, - 100, - 1)); - ((EntityLivingBase) par5Entity) - .addPotionEffect( - new PotionEffect( - Potion.moveSlowdown.id, - 100, - 1)); + ((EntityLivingBase) par5Entity).addPotionEffect(new PotionEffect(Potion.blindness.id, 100, 1)); + ((EntityLivingBase) par5Entity).addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 100, 1)); } } @@ -306,42 +215,28 @@ public class BlockTrap extends BlockContainer implements IShearable { } @Override - public void onNeighborBlockChange(World par1World, int par2, - int par3, int par4, Block par5) { - super.onNeighborBlockChange(par1World, par2, par3, par4, - par5); - - if (!par1World.isRemote && !par1World.isSideSolid(par2, - par3 - 1, par4, ForgeDirection.SOUTH, - true)) { + public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, Block par5) { + super.onNeighborBlockChange(par1World, par2, par3, par4, par5); + + if (!par1World.isRemote && !par1World.isSideSolid(par2, par3 - 1, par4, ForgeDirection.SOUTH, true)) { par1World.setBlockToAir(par2, par3, par4); - TileEntity te = par1World.getTileEntity(par2, par3, - par4); - if ((ConfigData.spawnTraps || (te != null - && te instanceof TileEntityTrap - && ((TileEntityTrap) te).placedBy != null)) + TileEntity te = par1World.getTileEntity(par2, par3, par4); + if ((ConfigData.spawnTraps + || (te != null && te instanceof TileEntityTrap && ((TileEntityTrap) te).placedBy != null)) && CommonTickHandler.worldData != null - && CommonTickHandler.worldData - .getDisadvantage() - .equals("Explosive Traps")) { - par1World.createExplosion(null, - par2 + 0.5F, par3 + 0.5F, - par4 + 0.5F, 1.33F, true); + && CommonTickHandler.worldData.getDisadvantage().equals("Explosive Traps")) { + par1World.createExplosion(null, par2 + 0.5F, par3 + 0.5F, par4 + 0.5F, 1.33F, true); } } } @Override - public boolean isReplaceable(IBlockAccess world, int x, int y, - int z) { + public boolean isReplaceable(IBlockAccess world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); return super.isReplaceable(world, x, y, z) - || (((world instanceof World - && ((World) world).isRemote) - ? NewPacketHandler.trapsDisabled - : !ConfigData.spawnTraps) - && (te == null || !(te instanceof TileEntityTrap) - || ((TileEntityTrap) te).placedBy == null)); + || (((world instanceof World && ((World) world).isRemote) ? NewPacketHandler.trapsDisabled + : !ConfigData.spawnTraps) + && (te == null || !(te instanceof TileEntityTrap) || ((TileEntityTrap) te).placedBy == null)); } @Override @@ -352,9 +247,7 @@ public class BlockTrap extends BlockContainer implements IShearable { @Override public boolean canPlaceBlockAt(World world, int x, int y, int z) { - return super.canPlaceBlockAt(world, x, y, z) - && (y == 0 || world.getBlock(x, y - 1, - z) != ModjamMod.blockTrap); + return super.canPlaceBlockAt(world, x, y, z) && (y == 0 || world.getBlock(x, y - 1, z) != ModjamMod.blockTrap); } @Override @@ -364,63 +257,48 @@ public class BlockTrap extends BlockContainer implements IShearable { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, - List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for (int i = 0; i < trapTypes; i++) { par3List.add(new ItemStack(par1, 1, i)); } } @Override - public void onBlockPlacedBy(World par1World, int par2, int par3, - int par4, EntityLivingBase par5EntityLivingBase, + public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { - super.onBlockPlacedBy(par1World, par2, par3, par4, - par5EntityLivingBase, par6ItemStack); + super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack); - par1World.setBlockMetadataWithNotify(par2, par3, par4, - par6ItemStack.getItemDamage(), 0); + par1World.setBlockMetadataWithNotify(par2, par3, par4, par6ItemStack.getItemDamage(), 0); - if (par5EntityLivingBase != null - && par5EntityLivingBase instanceof EntityPlayer) { + if (par5EntityLivingBase != null && par5EntityLivingBase instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) par5EntityLivingBase; - if (!player.capabilities.isCreativeMode - || NewPacketHandler.trapsDisabled) { - TileEntity te = par1World.getTileEntity( - par2, par3, par4); + if (!player.capabilities.isCreativeMode || NewPacketHandler.trapsDisabled) { + TileEntity te = par1World.getTileEntity(par2, par3, par4); if (te != null && te instanceof TileEntityTrap) { - ((TileEntityTrap) te).placedBy = player - .getCommandSenderName(); + ((TileEntityTrap) te).placedBy = player.getCommandSenderName(); } } } } @Override - public boolean isShearable(ItemStack item, - IBlockAccess blockAccess, int x, int y, int z) { + public boolean isShearable(ItemStack item, IBlockAccess blockAccess, int x, int y, int z) { return true; } @Override - public ArrayList onSheared(ItemStack item, - IBlockAccess blockAccess, int x, int y, int z, - int fortune) { + public ArrayList onSheared(ItemStack item, IBlockAccess blockAccess, int x, int y, int z, int fortune) { if (blockAccess instanceof World) { World world = (World) blockAccess; world.setBlockToAir(x, y, z); if (!world.isRemote) { - MinecraftServer server = FMLCommonHandler - .instance() - .getMinecraftServerInstance(); + MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); for (int i = 0; i < server.worldServers.length; i++) { - WorldServer s = FMLCommonHandler - .instance() - .getMinecraftServerInstance().worldServers[i]; + WorldServer s = FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[i]; if (s == null) { continue; @@ -433,11 +311,8 @@ public class BlockTrap extends BlockContainer implements IShearable { EntityPlayer player = (EntityPlayer) o; - if (item.equals(player - .getHeldItem())) { - NewPacketHandler.SEND_MESSAGE - .sendToPlayer(player, - "\u00A7e\u00A7oYou disarmed the trap."); + if (item.equals(player.getHeldItem())) { + NewPacketHandler.SEND_MESSAGE.sendToPlayer(player, "\u00A7e\u00A7oYou disarmed the trap."); } } } @@ -450,17 +325,10 @@ public class BlockTrap extends BlockContainer implements IShearable { } @Override - public float getPlayerRelativeBlockHardness( - EntityPlayer par1EntityPlayer, World par2World, - int par3, int par4, int par5) { - return (par1EntityPlayer.getHeldItem() != null - && par1EntityPlayer.getHeldItem() - .getItem() == Items.shears) - ? 1.0F - : getBlockHardness( - par2World, - par3, - par4, - par5); + public float getPlayerRelativeBlockHardness(EntityPlayer par1EntityPlayer, World par2World, int par3, int par4, + int par5) { + return (par1EntityPlayer.getHeldItem() != null && par1EntityPlayer.getHeldItem().getItem() == Items.shears) + ? 1.0F + : getBlockHardness(par2World, par3, par4, par5); } } -- cgit v1.2.3