aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-10-02 11:34:10 +0200
committerDream-Master <dream-master@gmx.net>2018-10-02 11:34:10 +0200
commit1b242e01561f75fa0369e1447102973e06ff8af7 (patch)
tree56840c5034f1845d0713768803e4991fd1562dcf /src
parent99bdea188713e30f1b495acee58e9338e4472f36 (diff)
downloadGT5-Unofficial-1b242e01561f75fa0369e1447102973e06ff8af7.tar.gz
GT5-Unofficial-1b242e01561f75fa0369e1447102973e06ff8af7.tar.bz2
GT5-Unofficial-1b242e01561f75fa0369e1447102973e06ff8af7.zip
fix
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
index 7ec603a6f6..0bf8bde82c 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
@@ -659,7 +659,7 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
return (!mRequiresFluidForFiltering || getFillableStack() != null) && (((getInputAt(0) != null && getInputAt(1) != null) || (getInputAt(0) == null && getInputAt(1) == null ? getRecipeList().containsInput(aStack) : (getRecipeList().containsInput(aStack) && null != getRecipeList().findRecipe(getBaseMetaTileEntity(), mLastRecipe, true, V[mTier], new FluidStack[]{getFillableStack()}, getSpecialSlot(), aIndex == getInputSlot() ? new ItemStack[]{aStack, getInputAt(1)} : new ItemStack[]{getInputAt(0), aStack})))));
default:
GT_Recipe_Map gt_recipe_map = getRecipeList();
- if (GT_Recipe_Map.sCircuitAssemblerRecipes == gt_recipe_map || GT_Recipe_Map.sAssemblerRecipes == gt_recipe_map ) // assemblers IDs and circuit assembler IDs
+ if (GT_Recipe_Map.sCircuitAssemblerRecipes == gt_recipe_map || GT_Recipe_Map.sAssemblerRecipes == gt_recipe_map) // assemblers IDs and circuit assembler IDs
{
if (GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitBasic") ||
GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitGood") ||
@@ -669,12 +669,14 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitUltimate") ||
GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitSuperconductor") ||
GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitInfinity") ||
- GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitBio"))return true;
- // allow input all of this oredict circuits for assemblers
- return getRecipeList().containsInput(aStack);
+ GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitBio"))// allow input all of this oredict circuits for assemblers
+ {
+ return true;
+ }
+
}
+ return getRecipeList().containsInput(aStack);
}
- return true;
}