diff options
author | repo-alt <wvk17@yandex.ru> | 2022-11-27 00:53:33 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-26 22:53:33 +0100 |
commit | e5c7e6eca4f5d35c7cdab66dc641a8de521757b4 (patch) | |
tree | c6ab55fc6ea39a4a13f67bae2d748db6128f8c59 /src/main/java/gregtech/api | |
parent | 9295ba16ff1847ca296873484bf7ff258ff89e06 (diff) | |
download | GT5-Unofficial-e5c7e6eca4f5d35c7cdab66dc641a8de521757b4.tar.gz GT5-Unofficial-e5c7e6eca4f5d35c7cdab66dc641a8de521757b4.tar.bz2 GT5-Unofficial-e5c7e6eca4f5d35c7cdab66dc641a8de521757b4.zip |
fix locked recipe processing for the stocking input bus (#1526)
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r-- | src/main/java/gregtech/api/util/GT_Single_Recipe_Check_Processing_Array.java | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Single_Recipe_Check_Processing_Array.java b/src/main/java/gregtech/api/util/GT_Single_Recipe_Check_Processing_Array.java index 585460842d..68db933a4e 100644 --- a/src/main/java/gregtech/api/util/GT_Single_Recipe_Check_Processing_Array.java +++ b/src/main/java/gregtech/api/util/GT_Single_Recipe_Check_Processing_Array.java @@ -155,16 +155,31 @@ public class GT_Single_Recipe_Check_Processing_Array extends GT_Single_Recipe_Ch } /** Call this before inputs are consumed by the recipe. */ - public Builder setBefore() { - beforeItems = buildItemMap(multiBlockBase); - beforeFluids = buildFluidMap(multiBlockBase); + public Builder setBefore(ItemStack[] inputs, FluidStack[] fluids) { + beforeItems = buildItemMapDirect(inputs); + beforeFluids = buildFluidMapDirect(fluids); return this; } + static Map<GT_Utility.ItemId, Integer> buildItemMapDirect(ItemStack[] inputs) { + Map<GT_Utility.ItemId, Integer> itemMap = new HashMap<>(); + for (ItemStack itemStack : inputs) { + itemMap.merge(GT_Utility.ItemId.create(itemStack), itemStack.stackSize, Integer::sum); + } + return itemMap; + } + static Map<Fluid, Integer> buildFluidMapDirect(FluidStack[] fluids) { + Map<Fluid, Integer> fluidMap = new HashMap<>(); + for (FluidStack fluidStack : fluids) { + fluidMap.merge(fluidStack.getFluid(), fluidStack.amount, Integer::sum); + } + return fluidMap; + } + /** Call this after inputs are consumed by the recipe. */ - public Builder setAfter() { - afterItems = buildItemMap(multiBlockBase); - afterFluids = buildFluidMap(multiBlockBase); + public Builder setAfter(ItemStack[] inputs, FluidStack[] fluids) { + afterItems = buildItemMapDirect(inputs); + afterFluids = buildFluidMapDirect(fluids); return this; } |