From 59f3b5b72ada3737381b1dbddaead6192b2b4506 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Thu, 26 Jan 2023 02:09:12 +0100 Subject: [PATCH] spotless --- .../mechworks/blocks/BlockLandmine.java | 3 +-- .../inventory/ContainerLandmine.java | 6 +++-- .../mechworks/logic/TileEntityLandmine.java | 7 +++--- .../smeltery/logic/CastingChannelLogic.java | 6 ++--- .../tools/blocks/BattlesignBlock.java | 24 ++++++++++++------- .../tconstruct/world/entity/CartEntity.java | 7 +++++- 6 files changed, 33 insertions(+), 20 deletions(-) diff --git a/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java index fbd770ba..a500f13c 100644 --- a/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java @@ -145,8 +145,7 @@ public class BlockLandmine extends BlockContainer { if (tileentity.hasCustomInventoryName()) { is.setStackDisplayName(tileentity.getInventoryName()); } - dropBlockAsItem( - par1World, par2, par3, par4, new ItemStack(this, 1, damageDropped(tileentity.triggerType))); + dropBlockAsItem(par1World, par2, par3, par4, new ItemStack(this, 1, damageDropped(tileentity.triggerType))); for (int j1 = 0; j1 < tileentity.getSizeInventory(); ++j1) { ItemStack itemstack = tileentity.getStackInSlot(j1); diff --git a/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java b/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java index 9006a014..b58b8677 100644 --- a/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java +++ b/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java @@ -242,8 +242,10 @@ public class ContainerLandmine extends Container { if (itemstack4.stackSize == 0) { inventoryplayer.setItemStack(null); } - } else if (shouldDoStuff && itemstack4 != null && slot2.isItemValid( - new ItemStack(itemstack4.getItem(), 1, itemstack4.getItemDamage()))) { + } else if (shouldDoStuff + && itemstack4 != null + && slot2.isItemValid( + new ItemStack(itemstack4.getItem(), 1, itemstack4.getItemDamage()))) { k1 = par2 == 0 ? 1 : 1; if (k1 > slot2.getSlotStackLimit()) { diff --git a/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java index 3a4bf7e5..b6ff67a2 100644 --- a/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java @@ -165,9 +165,10 @@ public class TileEntityLandmine extends TileEntity implements IInventory { @Override public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { - return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) == this && par1EntityPlayer.getDistanceSq( - (double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) - <= 64.0D; + return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) == this + && par1EntityPlayer.getDistanceSq( + (double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) + <= 64.0D; } @Override diff --git a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java index f6f6a447..1e7fed65 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java @@ -46,12 +46,12 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { public void updateEntity() { ticks++; - //boolean flagActiveFaucet = false; + // boolean flagActiveFaucet = false; TileEntity possibleFaucet = worldObj.getTileEntity(xCoord, yCoord + 1, zCoord); - //if (possibleFaucet instanceof FaucetLogic) { + // if (possibleFaucet instanceof FaucetLogic) { // flagActiveFaucet = ((FaucetLogic) possibleFaucet).active; - //} + // } if (ticks == 6) // && !flagActiveFaucet) this.distributeFluids(); diff --git a/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java b/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java index dc20b37e..8c49898c 100644 --- a/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java +++ b/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java @@ -29,15 +29,21 @@ public class BattlesignBlock extends EquipBlock { @Override public boolean shouldSideBeRendered( IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - return p_149646_5_ == 0 && this.minY > 0.0D || (p_149646_5_ == 1 && this.maxY < 1.0D || (p_149646_5_ == 2 && this.minZ > 0.0D || (p_149646_5_ == 3 && this.maxZ < 1.0D || (p_149646_5_ == 4 && this.minX > 0.0D || (p_149646_5_ == 5 && this.maxX < 1.0D || !(p_149646_1_ - .getBlock(p_149646_2_, p_149646_3_, p_149646_4_) - .isOpaqueCube() - && p_149646_1_ - .getBlock( - p_149646_2_, - p_149646_3_ + 1, - p_149646_4_) - .isOpaqueCube())))))); + return p_149646_5_ == 0 && this.minY > 0.0D + || (p_149646_5_ == 1 && this.maxY < 1.0D + || (p_149646_5_ == 2 && this.minZ > 0.0D + || (p_149646_5_ == 3 && this.maxZ < 1.0D + || (p_149646_5_ == 4 && this.minX > 0.0D + || (p_149646_5_ == 5 && this.maxX < 1.0D + || !(p_149646_1_ + .getBlock(p_149646_2_, p_149646_3_, p_149646_4_) + .isOpaqueCube() + && p_149646_1_ + .getBlock( + p_149646_2_, + p_149646_3_ + 1, + p_149646_4_) + .isOpaqueCube())))))); } @Override diff --git a/src/main/java/tconstruct/world/entity/CartEntity.java b/src/main/java/tconstruct/world/entity/CartEntity.java index 820a94df..f86fc368 100644 --- a/src/main/java/tconstruct/world/entity/CartEntity.java +++ b/src/main/java/tconstruct/world/entity/CartEntity.java @@ -646,7 +646,12 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS public void applyEntityCollision(Entity par1Entity) { if (!this.worldObj.isRemote) { if (par1Entity != this.riddenByEntity) { - if (par1Entity instanceof EntityLiving && !(par1Entity instanceof EntityIronGolem) && canBeRidden() && this.motionX * this.motionX + this.motionZ * this.motionZ > 0.01D && this.riddenByEntity == null && par1Entity.ridingEntity == null) { + if (par1Entity instanceof EntityLiving + && !(par1Entity instanceof EntityIronGolem) + && canBeRidden() + && this.motionX * this.motionX + this.motionZ * this.motionZ > 0.01D + && this.riddenByEntity == null + && par1Entity.ridingEntity == null) { par1Entity.mountEntity(this); }