aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/nei
diff options
context:
space:
mode:
authorJohannes Gäßler <updrn@student.kit.edu>2017-05-13 23:40:08 +0200
committerJohannes Gäßler <updrn@student.kit.edu>2017-05-13 23:40:08 +0200
commit25ff27a2a22b0250ae7a705ed986cfa748e41aef (patch)
treed0918b8314b7f240187c0efb6b3b57d91d1a0e3e /src/main/java/gregtech/nei
parentc0152219c5d8f953aaed708e57d9d077046a9450 (diff)
parenta16ea6bbc7d45695da017ca440985fa77ca337ed (diff)
downloadGT5-Unofficial-25ff27a2a22b0250ae7a705ed986cfa748e41aef.tar.gz
GT5-Unofficial-25ff27a2a22b0250ae7a705ed986cfa748e41aef.tar.bz2
GT5-Unofficial-25ff27a2a22b0250ae7a705ed986cfa748e41aef.zip
Merge branch 'LargeChemicalReactor' into ChemistryUpdate
Diffstat (limited to 'src/main/java/gregtech/nei')
-rw-r--r--src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
index 193e8432d1..26bc6a187b 100644
--- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
+++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
@@ -359,13 +359,22 @@ public class GT_NEI_DefaultHandler
public class CachedDefaultRecipe
extends TemplateRecipeHandler.CachedRecipe {
public final GT_Recipe mRecipe;
- public final List<PositionedStack> mOutputs = new ArrayList();
- public final List<PositionedStack> mInputs = new ArrayList();
+ public final List<PositionedStack> mOutputs;
+ public final List<PositionedStack> mInputs;
public CachedDefaultRecipe(GT_Recipe aRecipe) {
super();
this.mRecipe = aRecipe;
+ if (aRecipe.getInputPositionedStacks() != null && aRecipe.getOutputPositionedStacks() != null) {
+ mInputs = aRecipe.getInputPositionedStacks();
+ mOutputs = aRecipe.getOutputPositionedStacks();
+ return;
+ }
+
+ mOutputs = new ArrayList<PositionedStack>();
+ mInputs = new ArrayList<PositionedStack>();
+
int tStartIndex = 0;
switch (GT_NEI_DefaultHandler.this.mRecipeMap.mUsualInputCount) {
case 0: