diff options
Diffstat (limited to 'src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java | 17 |
1 files changed, 5 insertions, 12 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; } |