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/BlockPillar.java | 217 ++++++--------------- 1 file changed, 64 insertions(+), 153 deletions(-) (limited to 'YWD/src/main/java/fyresmodjam/blocks/BlockPillar.java') diff --git a/YWD/src/main/java/fyresmodjam/blocks/BlockPillar.java b/YWD/src/main/java/fyresmodjam/blocks/BlockPillar.java index a80d099..07eebbe 100755 --- a/YWD/src/main/java/fyresmodjam/blocks/BlockPillar.java +++ b/YWD/src/main/java/fyresmodjam/blocks/BlockPillar.java @@ -35,8 +35,7 @@ public class BlockPillar extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = par1IconRegister - .registerIcon("fyresmodjam:pillar"); + blockIcon = par1IconRegister.registerIcon("fyresmodjam:pillar"); } public int idDropped(int par1, Random par2Random, int par3) { @@ -44,24 +43,19 @@ public class BlockPillar extends BlockContainer { } @Override - public int getDamageValue(World par1World, int par2, int par3, - int par4) { + public int getDamageValue(World par1World, int par2, int par3, int par4) { int damage = 0; if (ConfigData.showAllPillarsInCreative) { - int meta = par1World.getBlockMetadata(par2, par3, - par4); - TileEntity te = par1World.getTileEntity(par2, - par3 - (meta == 1 ? 1 : 0), par4); + int meta = par1World.getBlockMetadata(par2, par3, par4); + TileEntity te = par1World.getTileEntity(par2, par3 - (meta == 1 ? 1 : 0), par4); if (te != null && te instanceof TileEntityPillar) { TileEntityPillar pte = (TileEntityPillar) te; int i = 0; - for (String blessingName : BlessingUtils.playerBlessings - .keySet()) { - if (pte.blessing.equals( - blessingName)) { + for (String blessingName : BlessingUtils.playerBlessings.keySet()) { + if (pte.blessing.equals(blessingName)) { damage = i + 1; break; } @@ -75,65 +69,45 @@ public class BlockPillar extends BlockContainer { } @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.itemPillar); } @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 (par1World.getBlockMetadata(par2, par3, par4) - % 2 == 1) { + if (par1World.getBlockMetadata(par2, par3, par4) % 2 == 1) { par3--; } TileEntity te = par1World.getTileEntity(par2, par3, par4); - if (par5EntityPlayer.getHeldItem() == null - || par5EntityPlayer.getHeldItem() - .getItem() == null - || par5EntityPlayer.getHeldItem() - .getItemDamage() != 1 - || par5EntityPlayer.getHeldItem() - .getItem() != ModjamMod.sceptre) { - if (te != null && te instanceof TileEntityPillar - && (!BlessingUtils.hasBlessing( - par5EntityPlayer) - || !BlessingUtils - .hasBlessing(par5EntityPlayer, - ((TileEntityPillar) te).blessing))) { + if (par5EntityPlayer.getHeldItem() == null || par5EntityPlayer.getHeldItem().getItem() == null + || par5EntityPlayer.getHeldItem().getItemDamage() != 1 + || par5EntityPlayer.getHeldItem().getItem() != ModjamMod.sceptre) { + if (te != null && te instanceof TileEntityPillar && (!BlessingUtils.hasBlessing(par5EntityPlayer) + || !BlessingUtils.hasBlessing(par5EntityPlayer, ((TileEntityPillar) te).blessing))) { boolean skip = false; - for (int i = 0; i < par1World.loadedEntityList - .size(); i++) { - Entity e = (Entity) par1World.loadedEntityList - .get(i); + for (int i = 0; i < par1World.loadedEntityList.size(); i++) { + Entity e = (Entity) par1World.loadedEntityList.get(i); if (e instanceof EntityMob) { - double xDiff = par2 - - e.posX; - double yDiff = par3 - - e.posY; - double zDiff = par4 - - e.posZ; + double xDiff = par2 - e.posX; + double yDiff = par3 - e.posY; + double zDiff = par4 - e.posZ; if (Math.abs(yDiff) > 4) { continue; } - double dist = Math.sqrt( - xDiff * xDiff + yDiff - * yDiff - + zDiff * zDiff); + double dist = Math.sqrt(xDiff * xDiff + yDiff * yDiff + zDiff * zDiff); if (dist <= 14) { skip = true; @@ -143,42 +117,21 @@ public class BlockPillar extends BlockContainer { if (!skip) { if (((TileEntityPillar) te).blessing != null) { - EntityStatHelper.giveStat( - par5EntityPlayer, - "Blessing", - ((TileEntityPillar) te).blessing); - EntityStatHelper.giveStat( - par5EntityPlayer, - "BlessingActive", - false); - EntityStatHelper.giveStat( - par5EntityPlayer, - "BlessingCounter", - 0); - EntityStatHelper.giveStat( - par5EntityPlayer, - "BlessingCooldown", - 0); + EntityStatHelper.giveStat(par5EntityPlayer, "Blessing", ((TileEntityPillar) te).blessing); + EntityStatHelper.giveStat(par5EntityPlayer, "BlessingActive", false); + EntityStatHelper.giveStat(par5EntityPlayer, "BlessingCounter", 0); + EntityStatHelper.giveStat(par5EntityPlayer, "BlessingCooldown", 0); if (!par1World.isRemote) { - par1World.playSoundAtEntity( - par5EntityPlayer, - "fyresmodjam:pillarActivated", - 1.0F, - 1.0F); - NewPacketHandler.SEND_MESSAGE - .sendToPlayer(par5EntityPlayer, - "Activated " - + BlessingUtils.getBlessingInstance( - ((TileEntityPillar) te).blessing) - .customName() - + "."); + par1World.playSoundAtEntity(par5EntityPlayer, "fyresmodjam:pillarActivated", 1.0F, 1.0F); + NewPacketHandler.SEND_MESSAGE.sendToPlayer(par5EntityPlayer, "Activated " + + BlessingUtils.getBlessingInstance(((TileEntityPillar) te).blessing).customName() + + "."); } } } else if (!par1World.isRemote) { - NewPacketHandler.SEND_MESSAGE - .sendToPlayer(par5EntityPlayer, - "\u00A7cCannot activate pillar with monsters nearby!"); + NewPacketHandler.SEND_MESSAGE.sendToPlayer(par5EntityPlayer, + "\u00A7cCannot activate pillar with monsters nearby!"); } } } else if (!par1World.isRemote) { @@ -188,10 +141,8 @@ public class BlockPillar extends BlockContainer { TileEntityPillar pte = (TileEntityPillar) te; int i = 0; - for (String blessingName : BlessingUtils.playerBlessings - .keySet()) { - if (pte.blessing.equals( - blessingName)) { + for (String blessingName : BlessingUtils.playerBlessings.keySet()) { + if (pte.blessing.equals(blessingName)) { damage = i + 1; break; } @@ -203,15 +154,11 @@ public class BlockPillar extends BlockContainer { if (!par5EntityPlayer.capabilities.isCreativeMode) { par5EntityPlayer.getHeldItem().stackSize--; } - par1World.spawnEntityInWorld(new EntityItem( - par1World, par2 + 0.5F, - par3 + 0.5F, par4 + 0.5F, - new ItemStack(ModjamMod.itemPillar, - 1, damage))); + par1World.spawnEntityInWorld(new EntityItem(par1World, par2 + 0.5F, par3 + 0.5F, par4 + 0.5F, + new ItemStack(ModjamMod.itemPillar, 1, damage))); par1World.setBlockToAir(par2, par3, par4); - NewPacketHandler.SEND_MESSAGE.sendToPlayer( - par5EntityPlayer, + NewPacketHandler.SEND_MESSAGE.sendToPlayer(par5EntityPlayer, "\u00A7e\u00A7oThe pillar deconstructs before you."); } @@ -219,71 +166,45 @@ public class BlockPillar extends BlockContainer { } @Override - public void onNeighborBlockChange(World par1World, int par2, - int par3, int par4, Block par5) { - super.onNeighborBlockChange(par1World, par2, par3, par4, - par5); + public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, Block par5) { + super.onNeighborBlockChange(par1World, par2, par3, par4, par5); - if (!par1World.isRemote - && !WorldGenTrapsTowersAndMore.genning) { - int i1 = par1World.getBlockMetadata(par2, par3, - par4); + if (!par1World.isRemote && !WorldGenTrapsTowersAndMore.genning) { + int i1 = par1World.getBlockMetadata(par2, par3, par4); if (i1 % 2 == 0) { - if (par1World.isAirBlock(par2, par3 + 1, - par4) - || par1World.getBlock(par2, - par3 + 1, - par4) != par1World - .getBlock(par2, par3, - par4)) { - par1World.setBlockToAir(par2, par3, - par4); + if (par1World.isAirBlock(par2, par3 + 1, par4) + || par1World.getBlock(par2, par3 + 1, par4) != par1World.getBlock(par2, par3, par4)) { + par1World.setBlockToAir(par2, par3, par4); } - } else if (par1World.isAirBlock(par2, par3 - 1, - par4) - || par1World.getBlock(par2, - par3 - 1, - par4) != par1World - .getBlock(par2, par3, - par4)) { + } else if (par1World.isAirBlock(par2, par3 - 1, par4) + || par1World.getBlock(par2, par3 - 1, par4) != par1World.getBlock(par2, par3, par4)) { par1World.setBlockToAir(par2, par3, par4); } } } @Override - public boolean canPlaceBlockAt(World par1World, int par2, int par3, - int par4) { + public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { return par3 >= 255 ? false - : (super.canPlaceBlockAt(par1World, par2, - par3, par4) - && super.canPlaceBlockAt( - par1World, - par2, - par3 + 1, - par4)); + : (super.canPlaceBlockAt(par1World, par2, par3, par4) + && super.canPlaceBlockAt(par1World, par2, par3 + 1, par4)); } @Override - public void setBlockBoundsBasedOnState( - IBlockAccess par1IBlockAccess, int par2, int par3, - int par4) { - int l = par1IBlockAccess.getBlockMetadata(par2, par3, - par4); + public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { + int l = par1IBlockAccess.getBlockMetadata(par2, par3, par4); if (l % 2 == 0) { setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 2.0F, 1.0F); } else { - setBlockBounds(0.0F, -1.0F, 0.0F, 1.0F, 1.0F, - 1.0F); + setBlockBounds(0.0F, -1.0F, 0.0F, 1.0F, 1.0F, 1.0F); } } @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; } @@ -308,16 +229,13 @@ public class BlockPillar extends BlockContainer { } @Override - public void onBlockHarvested(World par1World, int par2, int par3, - int par4, int par5, + public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) { - if (par6EntityPlayer.capabilities.isCreativeMode - && par5 >= 2 && par1World.getBlock(par2, - par3 - 1, par4) == this) { + if (par6EntityPlayer.capabilities.isCreativeMode && par5 >= 2 + && par1World.getBlock(par2, par3 - 1, par4) == this) { par1World.setBlockToAir(par2, par3 - 1, par4); } else { - super.onBlockHarvested(par1World, par2, par3, par4, - par5, par6EntityPlayer); + super.onBlockHarvested(par1World, par2, par3, par4, par5, par6EntityPlayer); } } @@ -331,21 +249,14 @@ public class BlockPillar extends BlockContainer { return block.getLightValue(world, x, y, z); } - if (ConfigData.pillarGlow && net.minecraft.client.Minecraft - .getMinecraft().theWorld != null - && net.minecraft.client.Minecraft - .getMinecraft().theWorld.isRemote) { - EntityPlayer player = net.minecraft.client.Minecraft - .getMinecraft().thePlayer; - - boolean blessingMatches = te instanceof TileEntityPillar - && ((TileEntityPillar) te).blessing != null - && BlessingUtils.hasBlessing( - player, - ((TileEntityPillar) te).blessing); - - if (player != null && te != null - && blessingMatches) { + if (ConfigData.pillarGlow && net.minecraft.client.Minecraft.getMinecraft().theWorld != null + && net.minecraft.client.Minecraft.getMinecraft().theWorld.isRemote) { + EntityPlayer player = net.minecraft.client.Minecraft.getMinecraft().thePlayer; + + boolean blessingMatches = te instanceof TileEntityPillar && ((TileEntityPillar) te).blessing != null + && BlessingUtils.hasBlessing(player, ((TileEntityPillar) te).blessing); + + if (player != null && te != null && blessingMatches) { return 4; } } -- cgit v1.2.3