From 4647e2e8be384582ad09c4f97a4c50dff4e05e4b Mon Sep 17 00:00:00 2001 From: BlueWeabo Date: Fri, 28 Jul 2023 13:13:57 +0300 Subject: Add more API to ParallelHelper and rework OverclockCalculator (#2185) * refactor OC calc * somewhat refactor parallel helper * fix PA not OCing correctly no clue why it wasn't using super and then setting the duration again. * make use of new api to make fusion cleaner * make batch mode actually dynamic * add another reason for 0 parallel * move variables around to try and group them together * address reviews * add overclocking past 1 tick by adding parallels * add null check and make a basic calculator to prevent npe * check null recipeMap supplier * address reviews * addressing of reviews * make it possible to call some OverclockCalculator methods through static methods * address reviews * make sure one doesn't get too many OCs when calculatin under 1 tick * add api for custom duration under one tick and fix batch mode doing 0 ticking * fix not calculating duration under 1 tick correctly * spotless * try to have correct eut consumption * address review * make sure mk5 fusion is said in nei * fix eutCalculating under one tick way too much and address reviews * remove roundUp voltage --- src/main/java/gregtech/nei/FusionSpecialValueFormatter.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/nei') diff --git a/src/main/java/gregtech/nei/FusionSpecialValueFormatter.java b/src/main/java/gregtech/nei/FusionSpecialValueFormatter.java index 0d5517b6f0..2129fd7233 100644 --- a/src/main/java/gregtech/nei/FusionSpecialValueFormatter.java +++ b/src/main/java/gregtech/nei/FusionSpecialValueFormatter.java @@ -28,8 +28,10 @@ public class FusionSpecialValueFormatter implements INEISpecialInfoFormatter { tier = 2; } else if (startupPower <= 40 * M * 16) { tier = 3; - } else { + } else if (startupPower <= 80 * M * 16) { tier = 4; + } else { + tier = 5; } if (voltage <= GT_Values.V[6]) { @@ -38,8 +40,10 @@ public class FusionSpecialValueFormatter implements INEISpecialInfoFormatter { tier = Math.max(tier, 2); } else if (voltage <= GT_Values.V[8]) { tier = Math.max(tier, 3); + } else if (voltage <= GT_Values.V[9]) { + tier = Math.max(tier, 4); } else { - tier = 4; + tier = 5; } return tier; } -- cgit