aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java17
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java12
2 files changed, 26 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index 2306ed98e0..a232096c85 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -2069,8 +2069,14 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
setUsualFluidInputCount(20);
setUsualFluidOutputCount(1);
setProgressBarPos(86, 44);
- setLogoPos(87, 81);
- setNEIBackgroundSize(172, 125);
+ setNEITransferRect(
+ new Rectangle(
+ progressBarPos.x - (16 / 2),
+ progressBarPos.y,
+ progressBarSize.width + 16,
+ progressBarSize.height));
+ setLogoPos(87, 99);
+ setNEIBackgroundSize(172, 118);
}
@Override
@@ -2098,7 +2104,12 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
+ formatNumbers(1000L * recipeInfo.recipe.mDuration / 100L * recipeInfo.recipe.mEUt)
+ " EU");
// 1000 / (20 ticks * 5 seconds) = 10L/t. 10L/t * x EU/L = 10 * x EU/t.
- drawNEIText(recipeInfo, "Average: " + formatNumbers(10L * recipeInfo.recipe.mEUt) + " EU/t");
+ long averageUsage = 10L * recipeInfo.recipe.mEUt;
+ drawNEIText(
+ recipeInfo,
+ "Average: " + formatNumbers(averageUsage)
+ + " EU/t"
+ + GT_Utility.getTierNameWithParentheses(averageUsage));
}
}
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index bc6cc9b1b2..a477f6d59f 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -35,6 +35,7 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.block.Block;
@@ -477,6 +478,17 @@ public class GT_Utility {
return GT_Values.TIER_COLORS[tier] + GT_Values.VN[tier] + EnumChatFormatting.RESET;
}
+ @Nonnull
+ public static String getTierNameWithParentheses(long voltage) {
+ byte tier = getTier(voltage);
+ if (tier < 0) {
+ return "";
+ } else if (tier >= GT_Values.VN.length - 1) {
+ return " (MAX+)";
+ }
+ return " (" + GT_Values.VN[tier] + ")";
+ }
+
public static void sendChatToPlayer(EntityPlayer aPlayer, String aChatMessage) {
if (aPlayer instanceof EntityPlayerMP && aChatMessage != null) {
aPlayer.addChatComponentMessage(new ChatComponentText(aChatMessage));