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/api/util/GT_Utility.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/util/GT_Utility.java') diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 912dbda73d..c0043d2adf 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -494,9 +494,17 @@ public class GT_Utility { } /** - * Rounds down partial voltage that exceeds tiered voltage, e.g. 4096 -> 2048 (EV) + * Do not use. It is rounding up voltage */ + @Deprecated public static long roundDownVoltage(long voltage) { + return roundUpVoltage(voltage); + } + + /** + * Rounds up partial voltage that exceeds tiered voltage, e.g. 4,096 -> 8,192(IV) + */ + public static long roundUpVoltage(long voltage) { if (voltage > V[V.length - 1]) { return voltage; } -- cgit