aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities
diff options
context:
space:
mode:
authordraknyte1 <draknyte1@hotmail.com>2016-11-03 00:16:36 +1000
committerdraknyte1 <draknyte1@hotmail.com>2016-11-03 00:16:36 +1000
commitc043d88a57a690b1f40cdcd997cdf00cfe06ad09 (patch)
treec141a5cc008ca5b5c79271abe96bc6e469658f24 /src/Java/gtPlusPlus/xmod/gregtech/common/tileentities
parent8f5e03f5b792738955b1578f6fd98434b566afb8 (diff)
downloadGT5-Unofficial-c043d88a57a690b1f40cdcd997cdf00cfe06ad09.tar.gz
GT5-Unofficial-c043d88a57a690b1f40cdcd997cdf00cfe06ad09.tar.bz2
GT5-Unofficial-c043d88a57a690b1f40cdcd997cdf00cfe06ad09.zip
+ Added support for using items as input for the Matter fabricator.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tileentities')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java
index 1f0655aaa7..626a7b5c81 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java
@@ -103,6 +103,22 @@ public class GregtechMetaTileEntity_MassFabricator extends GregtechMeta_MultiBlo
@Override
public boolean checkRecipe(ItemStack aStack) {
+
+ ArrayList<ItemStack> tInputList = getStoredInputs();
+ for (int i = 0; i < tInputList.size() - 1; i++) {
+ for (int j = i + 1; j < tInputList.size(); j++) {
+ if (GT_Utility.areStacksEqual((ItemStack) tInputList.get(i), (ItemStack) tInputList.get(j))) {
+ if (((ItemStack) tInputList.get(i)).stackSize >= ((ItemStack) tInputList.get(j)).stackSize) {
+ tInputList.remove(j--);
+ } else {
+ tInputList.remove(i--);
+ break;
+ }
+ }
+ }
+ }
+ ItemStack[] tInputs = (ItemStack[]) Arrays.copyOfRange(tInputList.toArray(new ItemStack[tInputList.size()]), 0, 2);
+
ArrayList<FluidStack> tFluidList = getStoredFluids();
for (int i = 0; i < tFluidList.size() - 1; i++) {
for (int j = i + 1; j < tFluidList.size(); j++) {