aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2020-01-16 11:33:41 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2020-01-16 11:33:41 +0000
commit72696a0dd5ca5c0cb2a1017cc1e0bb36669d0ce7 (patch)
tree01430c29601718947e0dcb758e121b135f34f26c /src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines
parenteae5bc6995f40b9b4875fc17db9d12dad1872863 (diff)
downloadGT5-Unofficial-72696a0dd5ca5c0cb2a1017cc1e0bb36669d0ce7.tar.gz
GT5-Unofficial-72696a0dd5ca5c0cb2a1017cc1e0bb36669d0ce7.tar.bz2
GT5-Unofficial-72696a0dd5ca5c0cb2a1017cc1e0bb36669d0ce7.zip
+ Added GT RF convertor.
$ Fixed Industrial Mixer not working with fluids. $ Fixed COFH being a hard dependency. $ Fixed Energy Buffers relying on the Rocket Engine config option.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java
index 6e4c071ecb..0c7067b3c0 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java
@@ -14,6 +14,7 @@ import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.util.data.ArrayUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -128,7 +129,7 @@ extends GregtechMeta_MultiBlockBase {
}
if (inputs.length > 0) {
log("Recipe. ["+inputs.length+"]["+getMaxParallelRecipes()+"]");
- if (checkRecipeGeneric(inputs, new FluidStack[]{}, getMaxParallelRecipes(), getEuDiscountForParallelism(), 250, 10000)) {
+ if (checkRecipeGeneric(inputs, (FluidStack[]) ArrayUtils.getArrayFromArrayList(this.getStoredFluids()), getMaxParallelRecipes(), getEuDiscountForParallelism(), 250, 10000)) {
log("Recipe 2.");
return true;
}