diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-18 00:17:03 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-18 00:17:03 +0200 |
| commit | 337b6fc66d25361095ad4eddd86992d92668be03 (patch) | |
| tree | 6c7cf46a3730bf37f78f17e8252583267fec675c /src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java | |
| parent | edc857c8a95d39d78bf2e4c325bd2f8d21334469 (diff) | |
| parent | 34474480f73ca5ab1c711d73bdb4bd809673e063 (diff) | |
| download | GT5-Unofficial-337b6fc66d25361095ad4eddd86992d92668be03.tar.gz GT5-Unofficial-337b6fc66d25361095ad4eddd86992d92668be03.tar.bz2 GT5-Unofficial-337b6fc66d25361095ad4eddd86992d92668be03.zip | |
Merge branch 'ChemistryUpdate' into unstable
Conflicts:
src/main/java/gregtech/api/enums/ItemList.java
src/main/java/gregtech/api/enums/Textures.java
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
Diffstat (limited to 'src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java')
| -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 e72bd2b4cd..1425dba1e9 100644 --- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java +++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java @@ -215,7 +215,8 @@ public class GT_NEI_DefaultHandler }
}
if (tDuration > 0) {
- drawText(10, 113, trans("158","Time: ") + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + trans("161"," secs"), -16777216);
+// drawText(10, 113, trans("158","Time: ") + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + trans("161"," secs"), -16777216);
+ drawText(10, 113, String.format("%s%.2f%s", trans("158","Time: "), 0.05 * tDuration, trans("161"," secs")), -16777216);
}
int tSpecial = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue;
if (tSpecial == -100 && GT_Mod.gregtechproxy.mLowGravProcessing) {
@@ -358,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:
|