From 24ad01683a084bebd26152b803ee19bffe78213c Mon Sep 17 00:00:00 2001 From: chill Date: Sun, 28 May 2023 09:53:08 +0200 Subject: simplify logic expressions (#2026) --- .../java/gregtech/api/metatileentity/BaseMetaPipeEntity.java | 2 +- .../java/gregtech/api/metatileentity/BaseMetaTileEntity.java | 2 +- .../implementations/GT_MetaTileEntity_Transformer.java | 9 +++++++-- .../gregtech/api/multitileentity/multiblock/base/Controller.java | 2 +- src/main/java/gregtech/api/util/GT_BaseCrop.java | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) (limited to 'src/main/java/gregtech/api') diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java index 38f40f023e..29f109fca0 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java @@ -771,7 +771,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity @Override public boolean shouldDropItemAt(int index) { - return this.mMetaTileEntity != null ? this.mMetaTileEntity.shouldDropItemAt(index) : true; + return this.mMetaTileEntity == null || this.mMetaTileEntity.shouldDropItemAt(index); } @Override diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index eda4f829b6..c4e1ba8521 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -1403,7 +1403,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec @Override public boolean shouldDropItemAt(int index) { - return this.mMetaTileEntity != null ? this.mMetaTileEntity.shouldDropItemAt(index) : true; + return this.mMetaTileEntity == null || this.mMetaTileEntity.shouldDropItemAt(index); } public int getUpgradeCount() { diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java index 36d2583875..a8c26957f8 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java @@ -123,8 +123,13 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi @Override public boolean isInputFacing(ForgeDirection side) { - return getBaseMetaTileEntity().isAllowedToWork() ? side == getBaseMetaTileEntity().getFrontFacing() - : side != getBaseMetaTileEntity().getFrontFacing(); + ForgeDirection blockFrontFacing = getBaseMetaTileEntity().getFrontFacing(); + + if (getBaseMetaTileEntity().isAllowedToWork()) { + return side == blockFrontFacing; + } else { + return side != blockFrontFacing; + } } @Override diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java index c1314ec992..5bec3f1752 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java @@ -1238,7 +1238,7 @@ public abstract class Controller> extends MultiTileBasic return new ListItemHandler(multiBlockInventory.values()); } else { final IItemHandlerModifiable inv = multiBlockInventory.get(lockedInventory); - return inv != null ? inv : null; + return inv; } } diff --git a/src/main/java/gregtech/api/util/GT_BaseCrop.java b/src/main/java/gregtech/api/util/GT_BaseCrop.java index 1ae8206923..4e393dc007 100644 --- a/src/main/java/gregtech/api/util/GT_BaseCrop.java +++ b/src/main/java/gregtech/api/util/GT_BaseCrop.java @@ -215,7 +215,7 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { @Override public boolean rightclick(ICropTile aCrop, EntityPlayer aPlayer) { if (!canBeHarvested(aCrop)) return false; - return aCrop.harvest(aPlayer == null ? false : aPlayer instanceof EntityPlayerMP); + return aCrop.harvest(aPlayer instanceof EntityPlayerMP); } @Override -- cgit