fix: missing case for number overflow

refinedmods · Dec 27, 2024 · 19889b6 · 19889b6
1 parent d0a11f2
commit 19889b6
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/.../main/java/com/refinedmods/refinedstorage/api/autocrafting/calculation/CraftingState.java b/.../main/java/com/refinedmods/refinedstorage/api/autocrafting/calculation/CraftingState.java
@@ -1,6 +1,7 @@
 package com.refinedmods.refinedstorage.api.autocrafting.calculation;
 
 import com.refinedmods.refinedstorage.api.autocrafting.Pattern;
+import com.refinedmods.refinedstorage.api.resource.ResourceAmount;
 import com.refinedmods.refinedstorage.api.resource.ResourceKey;
 import com.refinedmods.refinedstorage.api.resource.list.MutableResourceList;
 import com.refinedmods.refinedstorage.api.resource.list.MutableResourceListImpl;
@@ -28,10 +29,18 @@ void extractFromStorage(final ResourceKey resource, final long amount) {
 
     void addOutputsToInternalStorage(final Pattern pattern, final Amount amount) {
         pattern.getOutputs().forEach(
-            output -> internalStorage.add(output.resource(), output.amount() * amount.iterations())
+            output -> addOutputToInternalStorage(amount, output)
         );
     }
 
+    private void addOutputToInternalStorage(final Amount amount, final ResourceAmount output) {
+        final long totalAmount = output.amount() * amount.iterations();
+        if (totalAmount < 0) {
+            throw new NumberOverflowDuringCalculationException();
+        }
+        internalStorage.add(output.resource(), totalAmount);
+    }
+
     CraftingState copy() {
         return new CraftingState(storage.copy(), internalStorage.copy());
     }

diff --git a/...pi/src/test/java/com/refinedmods/refinedstorage/api/autocrafting/preview/PreviewTest.java b/...pi/src/test/java/com/refinedmods/refinedstorage/api/autocrafting/preview/PreviewTest.java
@@ -629,7 +629,7 @@ void shouldDetectNumberOverflowInIngredient() {
     }
 
     @Test
-    void shouldDetectNumberOverflowInChildPattern() {
+    void shouldDetectNumberOverflowWithRootPattern() {
         // Arrange
         final RootStorage storage = storage();
         final PatternRepository patterns = patterns(
@@ -650,4 +650,28 @@ void shouldDetectNumberOverflowInChildPattern() {
         // Assert
         assertThat(preview).usingRecursiveComparison().isEqualTo(PreviewBuilder.ofType(OVERFLOW).build());
     }
+
+    @Test
+    void shouldDetectNumberOverflowWithOutputOfChildPattern() {
+        // Arrange
+        final RootStorage storage = storage();
+        final PatternRepository patterns = patterns(
+            pattern()
+                .ingredient(OAK_LOG, 1)
+                .output(OAK_PLANKS, 4)
+                .output(SIGN, Long.MAX_VALUE)
+                .build(),
+            pattern()
+                .ingredient(OAK_PLANKS, 4)
+                .output(CRAFTING_TABLE, 1)
+                .build()
+        );
+        final CraftingCalculator sut = new CraftingCalculatorImpl(patterns, storage);
+
+        // Act
+        final Preview preview = calculatePreview(sut, CRAFTING_TABLE, 2);
+
+        // Assert
+        assertThat(preview).usingRecursiveComparison().isEqualTo(PreviewBuilder.ofType(OVERFLOW).build());
+    }
 }