From 72d9fcba461fe641263b2014dfcf3cefcd6434c8 Mon Sep 17 00:00:00 2001 From: miozune Date: Tue, 23 Aug 2022 15:24:49 +0900 Subject: Fix fusion display stuff (#1288) --- .../machines/multi/GT_MetaTileEntity_FusionComputer2.java | 2 +- .../machines/multi/GT_MetaTileEntity_FusionComputer3.java | 2 +- src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java index de9d863529..8d2b0b6d3b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java @@ -66,7 +66,7 @@ public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionC tt.addMachineType("Fusion Reactor") .addInfo("It's over 9000!!!") .addInfo("Controller block for the Fusion Reactor Mk II") - .addInfo("4096EU/t and 20M EU capacity per Energy Hatch") + .addInfo("8192EU/t and 20M EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addSeparator() diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java index 4e5c6c3cad..67cb06f3c1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java @@ -66,7 +66,7 @@ public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionC tt.addMachineType("Fusion Reactor") .addInfo("A SUN DOWN ON EARTH") .addInfo("Controller block for the Fusion Reactor Mk III") - .addInfo("8192EU/t and 40M EU capacity per Energy Hatch") + .addInfo("32768EU/t and 40M EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addSeparator() diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java index eeea2374ba..f8d030df6e 100644 --- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java +++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java @@ -494,9 +494,11 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { } else { tier = 4; } - if (Voltage <= 65536) { + if (Voltage <= GT_Values.V[6]) { + //no-op + } else if (Voltage <= GT_Values.V[7]) { tier = Math.max(tier, 2); - } else if (Voltage <= 131072) { + } else if (Voltage <= GT_Values.V[8]) { tier = Math.max(tier, 3); } else { tier = 4; -- cgit