aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities
diff options
context:
space:
mode:
authorYang Xizhi <60341015+GlodBlock@users.noreply.github.com>2022-08-28 20:24:26 +0800
committerGitHub <noreply@github.com>2022-08-28 14:24:26 +0200
commit63ee4cc46984e422a0201a0f03e9fac1e40ad758 (patch)
treee90ed23a13534ecff9bca32617935e2469e4f692 /src/main/java/gregtech/common/tileentities
parentd9881524d327622d9b4eca0436892081b79d2c5b (diff)
downloadGT5-Unofficial-63ee4cc46984e422a0201a0f03e9fac1e40ad758.tar.gz
GT5-Unofficial-63ee4cc46984e422a0201a0f03e9fac1e40ad758.tar.bz2
GT5-Unofficial-63ee4cc46984e422a0201a0f03e9fac1e40ad758.zip
fix multi input hatch doesn't work properly in oil cracker (#1308)
* fix multi input hatch doesn't work properly in oil cracker * spotlessApply (#1309) Co-authored-by: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * crap * remove debug log Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java35
1 files changed, 28 insertions, 7 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
index dacf503128..1a1976efd5 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
@@ -24,6 +24,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_MultiInput;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
@@ -367,17 +368,37 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult
ArrayList<FluidStack> rList = new ArrayList<>();
for (GT_MetaTileEntity_Hatch_Input tHatch : mInputHatches) {
tHatch.mRecipeMap = getRecipeMap();
- if (isValidMetaTileEntity(tHatch) && tHatch.getFillableStack() != null) {
- if (!GT_Recipe.GT_Recipe_Map.sCrackingRecipes.isValidCatalystFluid(tHatch.getFillableStack()))
- rList.add(tHatch.getFillableStack());
+ if (tHatch instanceof GT_MetaTileEntity_Hatch_MultiInput) {
+ if (isValidMetaTileEntity(tHatch)) {
+ for (FluidStack tFluid : ((GT_MetaTileEntity_Hatch_MultiInput) tHatch).getStoredFluid()) {
+ if (tFluid != null && !GT_Recipe.GT_Recipe_Map.sCrackingRecipes.isValidCatalystFluid(tFluid)) {
+ rList.add(tFluid);
+ }
+ }
+ }
+ } else {
+ if (isValidMetaTileEntity(tHatch) && tHatch.getFillableStack() != null) {
+ if (!GT_Recipe.GT_Recipe_Map.sCrackingRecipes.isValidCatalystFluid(tHatch.getFillableStack()))
+ rList.add(tHatch.getFillableStack());
+ }
}
}
for (GT_MetaTileEntity_Hatch_Input tHatch : mMiddleInputHatches) {
tHatch.mRecipeMap = getRecipeMap();
- if (isValidMetaTileEntity(tHatch) && tHatch.getFillableStack() != null) {
- FluidStack tStack = tHatch.getFillableStack();
- if (GT_Recipe.GT_Recipe_Map.sCrackingRecipes.isValidCatalystFluid(tStack)) {
- rList.add(tStack);
+ if (tHatch instanceof GT_MetaTileEntity_Hatch_MultiInput) {
+ if (isValidMetaTileEntity(tHatch)) {
+ for (FluidStack tFluid : ((GT_MetaTileEntity_Hatch_MultiInput) tHatch).getStoredFluid()) {
+ if (tFluid != null && GT_Recipe.GT_Recipe_Map.sCrackingRecipes.isValidCatalystFluid(tFluid)) {
+ rList.add(tFluid);
+ }
+ }
+ }
+ } else {
+ if (isValidMetaTileEntity(tHatch) && tHatch.getFillableStack() != null) {
+ FluidStack tStack = tHatch.getFillableStack();
+ if (GT_Recipe.GT_Recipe_Map.sCrackingRecipes.isValidCatalystFluid(tStack)) {
+ rList.add(tStack);
+ }
}
}
}