diff options
author | Maxim <maxim235@gmx.de> | 2022-09-28 18:19:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-28 17:19:11 +0100 |
commit | 6285aa0100b460e2925bdfcadc90aa27affbf8bf (patch) | |
tree | f7010f885541313b97c26f55c58609d09bb1e310 | |
parent | 4edf419eb3d5c9607706a6d58c420c362de583de (diff) | |
download | GT5-Unofficial-6285aa0100b460e2925bdfcadc90aa27affbf8bf.tar.gz GT5-Unofficial-6285aa0100b460e2925bdfcadc90aa27affbf8bf.tar.bz2 GT5-Unofficial-6285aa0100b460e2925bdfcadc90aa27affbf8bf.zip |
Fix input seperation on mixer (#379)
* Added back logic that has input seperation, while still allowing having no input busses at all
* Apply spotless
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java index 34715c8f1e..917a7cb1cc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java @@ -15,6 +15,7 @@ import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; @@ -23,6 +24,7 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; public class GregtechMetaTileEntity_IndustrialMixer extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialMixer> implements ISurvivalConstructable { @@ -155,7 +157,25 @@ public class GregtechMetaTileEntity_IndustrialMixer @Override public boolean checkRecipe(final ItemStack aStack) { - return checkRecipeGeneric(getMaxParallelRecipes(), getEuDiscountForParallelism(), 250, 10000); + for (GT_MetaTileEntity_Hatch_InputBus tBus : mInputBusses) { + if (checkRecipeGeneric( + tBus.mInventory, + getStoredFluids().toArray(new FluidStack[0]), + getMaxParallelRecipes(), + getEuDiscountForParallelism(), + 250, + 10000)) { + return true; + } + } + + return checkRecipeGeneric( + new ItemStack[0], + getStoredFluids().toArray(new FluidStack[0]), + getMaxParallelRecipes(), + getEuDiscountForParallelism(), + 250, + 10000); } @Override |