Fix overclock calculator calculating eu/t use for ulv recipe wrong on certain parallel (#2225)

* fix overclock calculator calculating eu/t use for ulv recipe wrong on certain parallel

* make formula into its own method

1 files changed, 37 insertions, 1 deletions

diff --git a/src/test/java/gregtech/overclock/GT_OverclockCalculator_UnitTest.java b/src/test/java/gregtech/overclock/GT_OverclockCalculator_UnitTest.java
index e6e74fde7d..5a66d2420b 100644
--- a/src/test/java/gregtech/overclock/GT_OverclockCalculator_UnitTest.java
+++ b/src/test/java/gregtech/overclock/GT_OverclockCalculator_UnitTest.java
@@ -423,7 +423,7 @@ class GT_OverclockCalculator_UnitTest {
             .setAmperageOC(false)
             .setAmperage(16)
             .calculate();
-        assertEquals(32 * 64, calculator.getConsumption(), messageEUt);
+        assertEquals((32 * 64), calculator.getConsumption(), messageEUt);
     }
 
     @Test
@@ -460,4 +460,40 @@ class GT_OverclockCalculator_UnitTest {
             .calculate();
         assertEquals((8 << 2) * 16, calculator.getConsumption(), messageEUt);
     }
+
+    @Test
+    void ulvRecipeDoesntOverclockExtraWithAmperageWithoutAmperageOCVersion6() {
+        GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(7)
+            .setEUt(V[3])
+            .setParallel(64)
+            .setDuration(160)
+            .setAmperage(64)
+            .setAmperageOC(false)
+            .calculate();
+        assertEquals((7 << 4) * 64, calculator.getConsumption(), messageEUt);
+    }
+
+    @Test
+    void ulvRecipeDoesntOverclockExtraWithAmperageWithoutAmperageOCVersion7() {
+        GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(7)
+            .setEUt(V[3])
+            .setParallel(19)
+            .setDuration(160)
+            .setAmperage(19)
+            .setAmperageOC(false)
+            .calculate();
+        assertEquals((7 << 4) * 19, calculator.getConsumption(), messageEUt);
+    }
+
+    @Test
+    void ulvRecipeDoesntOverclockExtraWithAmperageWithoutAmperageOCVersion8() {
+        GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(7)
+            .setEUt(V[3])
+            .setParallel(29)
+            .setDuration(160)
+            .setAmperage(25)
+            .setAmperageOC(false)
+            .calculate();
+        assertEquals((7 << 4) * 29, calculator.getConsumption(), messageEUt);
+    }
 }