use ItemUtils#consumeItem

Mooy1 · Sep 7, 2021 · 02431a1 · 02431a1
1 parent 07f02da
commit 02431a1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.github.mooy1</groupId>
     <artifactId>InfinityLib</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/src/main/java/io/github/mooy1/infinitylib/machines/CraftingBlockRecipe.java b/src/main/java/io/github/mooy1/infinitylib/machines/CraftingBlockRecipe.java
@@ -7,6 +7,7 @@
 
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
 import io.github.thebusybiscuit.slimefun4.libraries.dough.items.ItemStackSnapshot;
+import io.github.thebusybiscuit.slimefun4.libraries.dough.items.ItemUtils;
 import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils;
 
 @Getter
@@ -38,7 +39,7 @@ boolean check(Player p) {
     void consume(ItemStack[] input) {
         for (int i = 0; i < inputs.length; i++) {
             if (inputs[i] != null) {
-                input[i].setAmount(input[i].getAmount() - inputs[i].getAmount());
+                ItemUtils.consumeItem(input[i], inputs[i].getAmount(), true);
             }
         }
     }

diff --git a/src/main/java/io/github/mooy1/infinitylib/machines/MachineBlockRecipe.java b/src/main/java/io/github/mooy1/infinitylib/machines/MachineBlockRecipe.java
@@ -7,6 +7,7 @@
 import org.bukkit.inventory.ItemStack;
 
 import io.github.mooy1.infinitylib.common.StackUtils;
+import io.github.thebusybiscuit.slimefun4.libraries.dough.items.ItemUtils;
 
 final class MachineBlockRecipe {
 
@@ -48,11 +49,11 @@ void consume(Map<String, MachineInput> map) {
             for (ItemStack item : map.get(strings[i]).items) {
                 int amt = item.getAmount();
                 if (amt >= consume) {
-                    item.setAmount(amt - consume);
+                    ItemUtils.consumeItem(item, consume, true);
                     break;
                 }
                 else {
-                    item.setAmount(0);
+                    ItemUtils.consumeItem(item, amt, true);
                     consume -= amt;
                 }
             }

diff --git a/src/test/java/io/github/mooy1/infinitylib/common/TestStackUtils.java b/src/test/java/io/github/mooy1/infinitylib/common/TestStackUtils.java
@@ -13,7 +13,7 @@
 import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;
 import io.github.thebusybiscuit.slimefun4.implementation.setup.SlimefunItemSetup;
 
-public final class TestStackUtils {
+class TestStackUtils {
 
     @BeforeAll
     public static void load() {

diff --git a/src/test/java/io/github/mooy1/infinitylib/machines/TestMachineRecipeType.java b/src/test/java/io/github/mooy1/infinitylib/machines/TestMachineRecipeType.java
@@ -13,7 +13,7 @@
 import io.github.mooy1.infinitylib.core.MockAddon;
 import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 
-public final class TestMachineRecipeType {
+class TestMachineRecipeType {
 
     private static MockAddon addon;
     private static MachineRecipeType type;