diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-05-20 00:12:58 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-05-20 00:12:58 +0200 |
| commit | cec1f3a09a22c7e84119750cc1005a3da267060b (patch) | |
| tree | e46c8c23fa3ed0580a5279210d692bfbdc436f0a /src/main/java/gregtech/nei | |
| parent | 08cd5fe48560f7b8db2252733afe59d160eaf426 (diff) | |
| parent | 0217101187b04775b41a8c36cc94f9f47cc61371 (diff) | |
| download | GT5-Unofficial-cec1f3a09a22c7e84119750cc1005a3da267060b.tar.gz GT5-Unofficial-cec1f3a09a22c7e84119750cc1005a3da267060b.tar.bz2 GT5-Unofficial-cec1f3a09a22c7e84119750cc1005a3da267060b.zip | |
Merge remote-tracking branch 'Petrochemy/mergeGTNH' into Test-Chemie
Diffstat (limited to 'src/main/java/gregtech/nei')
| -rw-r--r-- | src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java index cd9469850a..42d6eaa516 100644 --- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java +++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java @@ -217,7 +217,8 @@ public class GT_NEI_DefaultHandler }
}
if (tDuration > 0) {
- drawText(10, 113, "Time: " + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + " secs", -16777216);
+// drawText(10, 113, "Time: " + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + " secs", -16777216);
+ drawText(10, 113, String.format("Time: %.2f secs", 0.05 * tDuration), -16777216);
}
int tSpecial = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue;
if (tSpecial == -100 && GT_Mod.gregtechproxy.mLowGravProcessing) {//IF mSpecialValue == -100 THEN needs Low Gravity
@@ -360,13 +361,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:
|