From 72d46b7a22cff01e3712c11c47c4b12f0c22a0b5 Mon Sep 17 00:00:00 2001
From: miozune <miozune@gmail.com>
Date: Wed, 10 May 2023 17:01:26 +0900
Subject: Slight adjustment for TPM NEI (#1972)

---
 src/main/java/gregtech/api/util/GT_Recipe.java          | 17 ++++++++++++++---
 src/main/java/gregtech/api/util/GT_Utility.java         | 12 ++++++++++++
 src/main/java/gregtech/common/power/EUPower.java        |  6 +-----
 .../basic/GT_MetaTileEntity_Massfabricator.java         |  6 +-----
 4 files changed, 28 insertions(+), 13 deletions(-)

(limited to 'src')

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));
diff --git a/src/main/java/gregtech/common/power/EUPower.java b/src/main/java/gregtech/common/power/EUPower.java
index a630c2d90d..a01e827f38 100644
--- a/src/main/java/gregtech/common/power/EUPower.java
+++ b/src/main/java/gregtech/common/power/EUPower.java
@@ -1,6 +1,5 @@
 package gregtech.common.power;
 
-import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_Utility;
 
 public class EUPower extends Power {
@@ -44,10 +43,7 @@ public class EUPower extends Power {
     @Override
     public String getVoltageString() {
         String voltageDescription = GT_Utility.formatNumbers(originalVoltage) + " EU/t";
-        byte recipeTier = GT_Utility.getTier(originalVoltage);
-        if (recipeTier >= 0 && recipeTier < 16) {
-            voltageDescription += " (" + GT_Values.VN[recipeTier] + ")";
-        }
+        voltageDescription += GT_Utility.getTierNameWithParentheses(originalVoltage);
         return voltageDescription;
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
index fd9062cbd4..9416391fc5 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
@@ -8,7 +8,6 @@ import java.util.Arrays;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.enums.ConfigCategories;
-import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.ITexture;
@@ -240,10 +239,7 @@ public class GT_MetaTileEntity_Massfabricator extends GT_MetaTileEntity_BasicMac
         public String getVoltageString() {
             long voltage = V[1];
             String voltageDescription = GT_Utility.formatNumbers(voltage) + " EU";
-            byte recipeTier = GT_Utility.getTier(voltage);
-            if (recipeTier >= 0 && recipeTier < 16) {
-                voltageDescription += " (" + GT_Values.VN[recipeTier] + ")";
-            }
+            voltageDescription += GT_Utility.getTierNameWithParentheses(voltage);
             return voltageDescription;
         }
 
-- 
cgit