From f446ea280f15a1e01f9aa2d273d8a5db181f5895 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 25 Jan 2023 23:27:18 +0100 Subject: [PATCH] quick fix : Condition is covered by further condition --- src/main/java/tconstruct/achievements/AchievementEvents.java | 3 +-- src/main/java/tconstruct/armor/ArmorAbilities.java | 2 +- src/main/java/tconstruct/armor/inventory/SlotAccessory.java | 3 +-- src/main/java/tconstruct/armor/inventory/SlotCanister.java | 3 +-- src/main/java/tconstruct/armor/inventory/SlotKnapsack.java | 2 +- src/main/java/tconstruct/client/tabs/TabRegistry.java | 2 +- src/main/java/tconstruct/items/tools/Scythe.java | 2 +- src/main/java/tconstruct/library/entity/ProjectileBase.java | 1 - src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java | 2 +- src/main/java/tconstruct/smeltery/blocks/SearedBlock.java | 2 +- .../java/tconstruct/smeltery/logic/CastingChannelLogic.java | 5 ++--- src/main/java/tconstruct/smeltery/logic/FaucetLogic.java | 5 +---- src/main/java/tconstruct/tools/ToolProxyCommon.java | 2 +- src/main/java/tconstruct/tools/blocks/EquipBlock.java | 2 +- src/main/java/tconstruct/tools/entity/ArrowEntity.java | 1 - src/main/java/tconstruct/tools/logic/PartBuilderLogic.java | 2 +- src/main/java/tconstruct/util/ItemHelper.java | 2 +- 17 files changed, 16 insertions(+), 25 deletions(-) diff --git a/src/main/java/tconstruct/achievements/AchievementEvents.java b/src/main/java/tconstruct/achievements/AchievementEvents.java index 074e2084..bc17fcb9 100644 --- a/src/main/java/tconstruct/achievements/AchievementEvents.java +++ b/src/main/java/tconstruct/achievements/AchievementEvents.java @@ -24,8 +24,7 @@ public class AchievementEvents { TAchievements.triggerAchievement(event.player, "tconstruct.preparedFight"); } - if (event.inventory != null - && event.inventory instanceof ToolForgeLogic + if (event.inventory instanceof ToolForgeLogic && event.tool.getItem() instanceof ToolCore && ((ToolCore) event.tool.getItem()).durabilityTypeExtra() != 0) { TAchievements.triggerAchievement(event.player, "tconstruct.proTinkerer"); diff --git a/src/main/java/tconstruct/armor/ArmorAbilities.java b/src/main/java/tconstruct/armor/ArmorAbilities.java index 8c4f3e4f..10d88487 100644 --- a/src/main/java/tconstruct/armor/ArmorAbilities.java +++ b/src/main/java/tconstruct/armor/ArmorAbilities.java @@ -77,7 +77,7 @@ public class ArmorAbilities { @SubscribeEvent public void dimensionChanged(PlayerEvent.PlayerChangedDimensionEvent event) { - if (event.player == null || !(event.player instanceof EntityPlayerMP)) return; + if (!(event.player instanceof EntityPlayerMP)) return; // this callback is only called serverside float oldHealth = event.player.getHealth(); diff --git a/src/main/java/tconstruct/armor/inventory/SlotAccessory.java b/src/main/java/tconstruct/armor/inventory/SlotAccessory.java index 51bef493..9a0fc05f 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotAccessory.java +++ b/src/main/java/tconstruct/armor/inventory/SlotAccessory.java @@ -27,8 +27,7 @@ public class SlotAccessory extends Slot { */ public boolean isItemValid(ItemStack par1ItemStack) { Item item = (par1ItemStack == null ? null : par1ItemStack.getItem()); - return item != null - && (item instanceof IAccessory) + return (item instanceof IAccessory) && ((IAccessory) item).canEquipAccessory(par1ItemStack, this.slotID); } } diff --git a/src/main/java/tconstruct/armor/inventory/SlotCanister.java b/src/main/java/tconstruct/armor/inventory/SlotCanister.java index c7c7ebcc..b6be015b 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotCanister.java +++ b/src/main/java/tconstruct/armor/inventory/SlotCanister.java @@ -28,8 +28,7 @@ public class SlotCanister extends Slot { @Override public boolean isItemValid(ItemStack par1ItemStack) { Item item = (par1ItemStack == null ? null : par1ItemStack.getItem()); - return item != null - && (item instanceof IHealthAccessory) + return (item instanceof IHealthAccessory) && ((IHealthAccessory) item).canEquipAccessory(par1ItemStack, this.slotID); } } diff --git a/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java b/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java index 53bbc5f6..46464c48 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java +++ b/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java @@ -25,6 +25,6 @@ public class SlotKnapsack extends Slot { @Override public boolean isItemValid(ItemStack par1ItemStack) { Item item = (par1ItemStack == null ? null : par1ItemStack.getItem()); - return item != null && (item instanceof Knapsack); + return (item instanceof Knapsack); } } diff --git a/src/main/java/tconstruct/client/tabs/TabRegistry.java b/src/main/java/tconstruct/client/tabs/TabRegistry.java index 379e11a9..308baec2 100644 --- a/src/main/java/tconstruct/client/tabs/TabRegistry.java +++ b/src/main/java/tconstruct/client/tabs/TabRegistry.java @@ -78,7 +78,7 @@ public class TabRegistry { Class c = Class.forName("codechicken.nei.NEIClientConfig"); Object hidden = c.getMethod("isHidden").invoke(null); Object enabled = c.getMethod("isEnabled").invoke(null); - if (hidden != null && hidden instanceof Boolean && enabled != null && enabled instanceof Boolean) { + if (hidden instanceof Boolean && enabled instanceof Boolean) { if ((Boolean) hidden || !((Boolean) enabled)) { // If NEI is disabled or hidden, offset the tabs by 60 return 60; diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index c91edc8e..78589836 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -219,7 +219,7 @@ public class Scythe extends Weapon { if (world.isRemote) { INetHandler handler = FMLClientHandler.instance() .getClientPlayHandler(); - if (handler != null && handler instanceof NetHandlerPlayClient) { + if (handler instanceof NetHandlerPlayClient) { NetHandlerPlayClient handlerClient = (NetHandlerPlayClient) handler; handlerClient.addToSendQueue(new C07PacketPlayerDigging( diff --git a/src/main/java/tconstruct/library/entity/ProjectileBase.java b/src/main/java/tconstruct/library/entity/ProjectileBase.java index ed85b51e..347042db 100644 --- a/src/main/java/tconstruct/library/entity/ProjectileBase.java +++ b/src/main/java/tconstruct/library/entity/ProjectileBase.java @@ -463,7 +463,6 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit // did we hit a player? if (movingobjectposition != null - && movingobjectposition.entityHit != null && movingobjectposition.entityHit instanceof EntityPlayer) { EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit; diff --git a/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java b/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java index 22ba9205..4b1a860e 100644 --- a/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java +++ b/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java @@ -21,7 +21,7 @@ public class SmelteryProxyCommon implements IGuiHandler { @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile != null && tile instanceof InventoryLogic) { + if (tile instanceof InventoryLogic) { return ((InventoryLogic) tile).getGuiContainer(player.inventory, world, x, y, z); } diff --git a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java index 6e29305e..83bd2e50 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java @@ -204,7 +204,7 @@ public class SearedBlock extends InventoryBlock { return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1); } else { TileEntity tile = world.getTileEntity(x, y, z); - if (tile != null && tile instanceof FaucetLogic) { + if (tile instanceof FaucetLogic) { FaucetLogic logic = (FaucetLogic) tile; float xMin = 0.25F; float xMax = 0.75F; diff --git a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java index 8ae61cb7..fd713216 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java @@ -49,7 +49,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { boolean flagActiveFaucet = false; TileEntity possibleFaucet = worldObj.getTileEntity(xCoord, yCoord + 1, zCoord); - if (possibleFaucet != null && possibleFaucet instanceof FaucetLogic) + if (possibleFaucet instanceof FaucetLogic) flagActiveFaucet = ((FaucetLogic) possibleFaucet).active; if (ticks == 6) // && !flagActiveFaucet) @@ -297,8 +297,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { int tY = this.yCoord + fd.offsetY; int tZ = this.zCoord + fd.offsetZ; TileEntity tile = this.worldObj.getTileEntity(tX, tY, tZ); - - if (tile != null && tile instanceof IFluidHandler) map.put(fd, tile); + if (tile instanceof IFluidHandler) map.put(fd, tile); } return map; } diff --git a/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java b/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java index d3481135..9b10304b 100644 --- a/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java @@ -37,10 +37,7 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi TileEntity drainte = worldObj.getTileEntity(x, yCoord, z); TileEntity tankte = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord); - if (drainte != null - && drainte instanceof IFluidHandler - && tankte != null - && tankte instanceof IFluidHandler) { + if (drainte instanceof IFluidHandler && tankte instanceof IFluidHandler) { FluidStack templiquid = ((IFluidHandler) drainte).drain(getForgeDirection(), TConstruct.ingotLiquidValue, false); if (templiquid != null) { diff --git a/src/main/java/tconstruct/tools/ToolProxyCommon.java b/src/main/java/tconstruct/tools/ToolProxyCommon.java index 91c16b98..e5385a69 100644 --- a/src/main/java/tconstruct/tools/ToolProxyCommon.java +++ b/src/main/java/tconstruct/tools/ToolProxyCommon.java @@ -38,7 +38,7 @@ public class ToolProxyCommon implements IGuiHandler { @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile != null && tile instanceof InventoryLogic) { + if (tile instanceof InventoryLogic) { return ((InventoryLogic) tile).getGuiContainer(player.inventory, world, x, y, z); } return null; diff --git a/src/main/java/tconstruct/tools/blocks/EquipBlock.java b/src/main/java/tconstruct/tools/blocks/EquipBlock.java index 48cf5e7d..15ed46a6 100644 --- a/src/main/java/tconstruct/tools/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/tools/blocks/EquipBlock.java @@ -124,7 +124,7 @@ public class EquipBlock extends InventoryBlock { public void breakBlock(World par1World, int x, int y, int z, Block par5, int meta) { TileEntity te = par1World.getTileEntity(x, y, z); - if (te != null && te instanceof EquipLogic) { + if (te instanceof EquipLogic) { EquipLogic logic = (EquipLogic) te; for (int iter = 0; iter < logic.getSizeInventory(); ++iter) { ItemStack stack = iter == 0 ? logic.getEquipmentItem() : logic.getStackInSlot(iter); diff --git a/src/main/java/tconstruct/tools/entity/ArrowEntity.java b/src/main/java/tconstruct/tools/entity/ArrowEntity.java index 33b646ee..cd4d8202 100644 --- a/src/main/java/tconstruct/tools/entity/ArrowEntity.java +++ b/src/main/java/tconstruct/tools/entity/ArrowEntity.java @@ -166,7 +166,6 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa } if (movingobjectposition != null - && movingobjectposition.entityHit != null && movingobjectposition.entityHit instanceof EntityPlayer) { EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit; diff --git a/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java b/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java index 2e84bffb..16997fde 100644 --- a/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java +++ b/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java @@ -32,7 +32,7 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory for (int zPos = z - 1; zPos <= z + 1; zPos++) { for (int yPos = y - 1; yPos <= y + 1; yPos++) { TileEntity tile = world.getTileEntity(xPos, yPos, zPos); - if (tile != null && tile instanceof PatternChestLogic && (x == xPos || z == zPos)) + if (tile instanceof PatternChestLogic && (x == xPos || z == zPos)) return new PartCrafterChestContainer(inventoryplayer, this, (PatternChestLogic) tile); } } diff --git a/src/main/java/tconstruct/util/ItemHelper.java b/src/main/java/tconstruct/util/ItemHelper.java index 6ee6ad4a..fd444716 100644 --- a/src/main/java/tconstruct/util/ItemHelper.java +++ b/src/main/java/tconstruct/util/ItemHelper.java @@ -18,7 +18,7 @@ public class ItemHelper { Class clazz = Class.forName(classPackage); Field field = clazz.getDeclaredField(name); Object ret = field.get(null); - if (ret != null && (ret instanceof ItemStack || ret instanceof Item)) return ret; + if ((ret instanceof ItemStack || ret instanceof Item)) return ret; return null; } catch (Exception e) { TConstruct.logger.warn("Could not find " + name + "from " + classPackage);