diff options
Diffstat (limited to 'src/main/java/gregtech/api')
9 files changed, 15 insertions, 47 deletions
diff --git a/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java b/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java index 1fcda9d84d..eb3c6276cf 100644 --- a/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java +++ b/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java @@ -22,10 +22,7 @@ public class GT_CoolantCellIC_Item extends GT_CoolantCell_Item implements IReact @Override public boolean canStoreHeat(IReactor aReactor, ItemStack aStack, int x, int y) { - if (aReactor.isFluidCooled() && (getControlTagOfStack(aStack)) != 0) { - return false; - } - return true; + return !aReactor.isFluidCooled() || getControlTagOfStack(aStack) == 0; } @Override diff --git a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java index 4d18cce9ba..fce33f3e8d 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java @@ -207,10 +207,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable { if (difference > 1.05 && difference < 1.4) { side = ForgeDirection.EAST; } - boolean tCovered = false; - if (side != ForgeDirection.UNKNOWN && mBaseMetaTileEntity.getCoverIDAtSide(side) > 0) { - tCovered = true; - } + boolean tCovered = side != ForgeDirection.UNKNOWN && mBaseMetaTileEntity.getCoverIDAtSide(side) > 0; if (isConnectedAtSide(side)) { tCovered = true; } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java index 469eb6a866..ece64e2c1d 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java @@ -246,9 +246,7 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier || name.equals("gt.metaitem.01.32521") || name.equals("gt.metaitem.01.32530") || name.equals("gt.metaitem.01.32531")) { - if (ic2.api.item.ElectricItem.manager.getCharge(aStack) == 0) { - return true; - } + return ic2.api.item.ElectricItem.manager.getCharge(aStack) == 0; } } return false; @@ -260,10 +258,7 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier if (!GT_Utility.isStackValid(aStack)) { return false; } - if (mInventory[aIndex] == null && GT_ModHandler.isElectricItem(aStack, this.mTier)) { - return true; - } - return false; + return mInventory[aIndex] == null && GT_ModHandler.isElectricItem(aStack, this.mTier); } @Override diff --git a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java index e36e7e60fb..61adafce13 100644 --- a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java +++ b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java @@ -947,11 +947,7 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl @Override public void setBooleans(int booleans) { - if ((booleans & ACTIVE) == ACTIVE) { - setActive(true); - } else { - setActive(false); - } + setActive((booleans & ACTIVE) == ACTIVE); } protected boolean hasItemInput() { diff --git a/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java b/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java index b53cc4ba07..a1af512b82 100644 --- a/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java +++ b/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java @@ -278,12 +278,9 @@ public class GT_AssemblyLineUtils { * @return Does this Data Stick have a valid output ItemStack? */ public static boolean doesDataStickHaveOutput(ItemStack aDataStick) { - if (isItemDataStick(aDataStick) && aDataStick.hasTagCompound() + return isItemDataStick(aDataStick) && aDataStick.hasTagCompound() && aDataStick.getTagCompound() - .hasKey("output")) { - return true; - } - return false; + .hasKey("output"); } /** @@ -296,9 +293,7 @@ public class GT_AssemblyLineUtils { if (isValidHash(aStickHash) && doesDataStickHaveOutput(aDataStick)) { ItemStack aStickOutput = getDataStickOutput(aDataStick); GT_Recipe_AssemblyLine aIntendedRecipe = findAssemblyLineRecipeByOutput(aStickOutput); - if (aStickHash.equals(generateRecipeHash(aIntendedRecipe))) { - return false; - } + return !aStickHash.equals(generateRecipeHash(aIntendedRecipe)); } } return true; @@ -311,10 +306,8 @@ public class GT_AssemblyLineUtils { public static boolean doesDataStickHaveRecipeHash(ItemStack aDataStick) { if (isItemDataStick(aDataStick) && aDataStick.hasTagCompound()) { NBTTagCompound aNBT = aDataStick.getTagCompound(); - if (aNBT.hasKey("Data.Recipe.Hash") && !aNBT.getString("Data.Recipe.Hash") - .equals("Hash.0")) { - return true; - } + return aNBT.hasKey("Data.Recipe.Hash") && !aNBT.getString("Data.Recipe.Hash") + .equals("Hash.0"); } return false; } diff --git a/src/main/java/gregtech/api/util/GT_BaseCrop.java b/src/main/java/gregtech/api/util/GT_BaseCrop.java index 4e393dc007..912a966e35 100644 --- a/src/main/java/gregtech/api/util/GT_BaseCrop.java +++ b/src/main/java/gregtech/api/util/GT_BaseCrop.java @@ -237,11 +237,7 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData % 1000)]; if ((tMaterial != null) && (tMaterial != Materials._NULL)) { - if (tMaterial == mBlock) { - return true; - } else { - return false; - } + return tMaterial == mBlock; } } } else { diff --git a/src/main/java/gregtech/api/util/GT_GC_Compat.java b/src/main/java/gregtech/api/util/GT_GC_Compat.java index 8674b38ea8..a441fa4be1 100644 --- a/src/main/java/gregtech/api/util/GT_GC_Compat.java +++ b/src/main/java/gregtech/api/util/GT_GC_Compat.java @@ -44,10 +44,8 @@ public class GT_GC_Compat { public static boolean canConnect(TileEntity tTileEntity, ForgeDirection tDirection) { // GC Compat - if (GregTech_API.mGalacticraft && tTileEntity instanceof IEnergyHandlerGC + return GregTech_API.mGalacticraft && tTileEntity instanceof IEnergyHandlerGC && (!(tTileEntity instanceof IConnector) - || ((IConnector) tTileEntity).canConnect(tDirection, NetworkType.POWER))) - return true; - return false; + || ((IConnector) tTileEntity).canConnect(tDirection, NetworkType.POWER)); } } diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java index f851565bf7..8265f3d03f 100644 --- a/src/main/java/gregtech/api/util/GT_ModHandler.java +++ b/src/main/java/gregtech/api/util/GT_ModHandler.java @@ -544,8 +544,7 @@ public class GT_ModHandler { */ public static boolean addSmeltingAndAlloySmeltingRecipe(ItemStack aInput, ItemStack aOutput, boolean hidden) { if (aInput == null || aOutput == null) return false; - boolean temp = false; - if (aInput.stackSize == 1 && addSmeltingRecipe(aInput, aOutput)) temp = true; + boolean temp = aInput.stackSize == 1 && addSmeltingRecipe(aInput, aOutput); return (RA.addAlloySmelterRecipe( aInput, OrePrefixes.ingot.contains(aOutput) ? ItemList.Shape_Mold_Ingot.get(0) diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index f9e7d7fe0c..5e8e9efbca 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -2688,10 +2688,7 @@ public class GT_Utility { Map<Integer, Integer> tEnchantments = EnchantmentHelper.getEnchantments(aStack); Integer tLevel = tEnchantments.get(Enchantment_Hazmat.INSTANCE.effectId); - if (tLevel != null && tLevel >= 1) { - return true; - } - return false; + return tLevel != null && tLevel >= 1; } public static float getHeatDamageFromItem(ItemStack aStack) { |