diff --git a/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java index f076d408..3a4bf7e5 100644 --- a/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java @@ -165,11 +165,9 @@ public class TileEntityLandmine extends TileEntity implements IInventory { @Override public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { - return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this - ? false - : 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/blocks/GlassBlock.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java index b1c352db..547ee3df 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java @@ -25,7 +25,7 @@ public class GlassBlock extends TConstructBlock { @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { Block i1 = par1IBlockAccess.getBlock(par2, par3, par4); - return i1 == (Block) this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); + return i1 != this && super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); } @Override diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java index a5375993..ef7bffb1 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java @@ -526,7 +526,7 @@ public class GlassBlockConnected extends MantleBlock { @Override public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { Block b = par1IBlockAccess.getBlock(par2, par3, par4); - return b == (Block) this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); + return b != this && super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); } @Override diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java index e77a27e8..c5245de2 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java @@ -48,7 +48,7 @@ public class GlassBlockStained extends TConstructBlock { @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { Block block = world.getBlock(x, y, z); - return block == this ? false : super.shouldSideBeRendered(world, x, y, z, side); + return block != this && super.shouldSideBeRendered(world, x, y, z, side); } @Override diff --git a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java index 3a4fbbef..7fd6ef9c 100644 --- a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java @@ -91,7 +91,7 @@ public class LavaTankBlock extends BlockContainer { @Override public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { Block bID = world.getBlock(x, y, z); - return bID == this ? false : super.shouldSideBeRendered(world, x, y, z, side); + return bID != this && super.shouldSideBeRendered(world, x, y, z, side); } @Override @@ -103,7 +103,7 @@ public class LavaTankBlock extends BlockContainer { @Override public int getLightValue(IBlockAccess world, int x, int y, int z) { TileEntity logic = world.getTileEntity(x, y, z); - if (logic != null && logic instanceof LavaTankLogic) return ((LavaTankLogic) logic).getBrightness(); + if (logic instanceof LavaTankLogic) return ((LavaTankLogic) logic).getBrightness(); return 0; } diff --git a/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java b/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java index 25e61fc5..dc20b37e 100644 --- a/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java +++ b/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java @@ -29,27 +29,15 @@ 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 - ? true - : (p_149646_5_ == 1 && this.maxY < 1.0D - ? true - : (p_149646_5_ == 2 && this.minZ > 0.0D - ? true - : (p_149646_5_ == 3 && this.maxZ < 1.0D - ? true - : (p_149646_5_ == 4 && this.minX > 0.0D - ? true - : (p_149646_5_ == 5 && this.maxX < 1.0D - ? true - : !(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/tools/logic/EquipLogic.java b/src/main/java/tconstruct/tools/logic/EquipLogic.java index cd62a319..2fb048e0 100644 --- a/src/main/java/tconstruct/tools/logic/EquipLogic.java +++ b/src/main/java/tconstruct/tools/logic/EquipLogic.java @@ -44,7 +44,7 @@ public abstract class EquipLogic extends InventoryLogic { @Override public boolean isStackInSlot(int slot) { - return slot != 0 ? inventory[slot] != null : false; + return slot != 0 && inventory[slot] != null; } @Override diff --git a/src/main/java/tconstruct/tools/logic/FurnaceLogic.java b/src/main/java/tconstruct/tools/logic/FurnaceLogic.java index e7b76cdd..e2a6d73c 100644 --- a/src/main/java/tconstruct/tools/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/tools/logic/FurnaceLogic.java @@ -307,7 +307,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin @Override public boolean isItemValidForSlot(int par1, ItemStack par2ItemStack) { - return par1 == 2 ? false : (par1 == 1 ? isItemFuel(par2ItemStack) : true); + return par1 != 2 && (par1 != 1 || isItemFuel(par2ItemStack)); } @Override diff --git a/src/main/java/tconstruct/world/entity/CartEntity.java b/src/main/java/tconstruct/world/entity/CartEntity.java index 726bb1a7..c9185d36 100644 --- a/src/main/java/tconstruct/world/entity/CartEntity.java +++ b/src/main/java/tconstruct/world/entity/CartEntity.java @@ -902,7 +902,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS */ @Override public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { - return this.isDead ? false : par1EntityPlayer.getDistanceSqToEntity(this) <= 64.0D; + return !this.isDead && par1EntityPlayer.getDistanceSqToEntity(this) <= 64.0D; } /**