simplify ifs (#2027)

5 files changed, 10 insertions, 27 deletions

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) {