From 462bf05145ed2fbd6751866e25f9069c9d48b27b Mon Sep 17 00:00:00 2001 From: miozune Date: Mon, 17 Jul 2023 15:20:45 +0900 Subject: Fix findRecipe might limit stack size by 64 (#2139) --- src/main/java/gregtech/api/util/GT_OreDictUnificator.java | 7 ++++++- src/main/java/gregtech/api/util/GT_Utility.java | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java index d6be321854..3a6f43b83d 100644 --- a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java +++ b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java @@ -144,7 +144,9 @@ public class GT_OreDictUnificator { public static ItemStack[] getStackArray(boolean aUseBlackList, Object... aStacks) { ItemStack[] rStacks = new ItemStack[aStacks.length]; - for (int i = 0; i < aStacks.length; i++) rStacks[i] = get(aUseBlackList, GT_Utility.copy(aStacks[i])); + for (int i = 0; i < aStacks.length; i++) { + rStacks[i] = get(aUseBlackList, GT_Utility.copy(aStacks[i]), true); + } return rStacks; } @@ -169,6 +171,9 @@ public class GT_OreDictUnificator { return get(aUseBlackList, aStack, false); } + /** + * @param unsafe If true, it does not limit stack size by 64. + */ public static ItemStack get(boolean aUseBlackList, ItemStack aStack, boolean unsafe) { if (GT_Utility.isStackInvalid(aStack)) return null; ItemData tPrefixMaterial = getAssociation(aStack); diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 108b9dc2d9..912dbda73d 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -2896,6 +2896,9 @@ public class GT_Utility { return rStack; } + /** + * Unlike {@link #copyAmount(long, Object...)}, this method does not restrict stack size by 64. + */ public static ItemStack copyAmountUnsafe(long aAmount, Object... aStacks) { ItemStack rStack = copy(aStacks); if (isStackInvalid(rStack)) return null; -- cgit