From bd32ba09a34d4f3242d46dc786191384e4bf3850 Mon Sep 17 00:00:00 2001 From: miozune Date: Sun, 10 Dec 2023 01:35:34 +0900 Subject: Fix input hatches for large turbine & boiler not accepting fluids (#2400) * Fix input hatches for large turbine & boiler not accepting fluids * Also adjust plasma turbine --- .../GT_MetaTileEntity_MultiBlockBase.java | 11 ++++++++++- .../machines/multi/GT_MetaTileEntity_DieselEngine.java | 5 ++--- .../machines/multi/GT_MetaTileEntity_LargeBoiler.java | 5 +++++ .../multi/GT_MetaTileEntity_LargeTurbine_Gas.java | 5 +++++ .../GT_MetaTileEntity_LargeTurbine_GasAdvanced.java | 5 +++++ .../multi/GT_MetaTileEntity_LargeTurbine_Plasma.java | 16 ++++++++++++++++ 6 files changed, 43 insertions(+), 4 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index d2d3c347a0..d23042bb61 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -1589,7 +1589,16 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity } protected void setHatchRecipeMap(GT_MetaTileEntity_Hatch_Input hatch) { - hatch.mRecipeMap = getRecipeMap(); + if (filtersFluid()) { + hatch.mRecipeMap = getRecipeMap(); + } + } + + /** + * @return If this multi filters fluid input for hatches based on recipemap. + */ + protected boolean filtersFluid() { + return true; } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java index cc4c4f7a84..6c77dc7f0d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java @@ -40,7 +40,6 @@ 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_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; @@ -160,8 +159,8 @@ public class GT_MetaTileEntity_DieselEngine } @Override - protected void setHatchRecipeMap(GT_MetaTileEntity_Hatch_Input hatch) { - // Prevent fluid hatch rejecting oxygen + protected boolean filtersFluid() { + return false; } /** diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java index ea10795744..ae740447c8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java @@ -251,6 +251,11 @@ public abstract class GT_MetaTileEntity_LargeBoiler return RecipeMaps.largeBoilerFakeFuels; } + @Override + protected boolean filtersFluid() { + return false; + } + @Override @NotNull public CheckRecipeResult checkProcessing() { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java index 572a609458..980ffa3eab 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java @@ -96,6 +96,11 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT return -1; } + @Override + protected boolean filtersFluid() { + return false; + } + @Override public Block getCasingBlock() { return GregTech_API.sBlockCasings4; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java index b12c1ca93d..4926655476 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java @@ -96,6 +96,11 @@ public class GT_MetaTileEntity_LargeTurbine_GasAdvanced extends GT_MetaTileEntit return -2; } + @Override + protected boolean filtersFluid() { + return false; + } + @Override public Block getCasingBlock() { return GregTech_API.sBlockCasings8; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java index cbaf0e34ad..5f4f7d83fa 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java @@ -26,6 +26,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; @@ -93,6 +94,21 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar return new GT_MetaTileEntity_LargeTurbine_Plasma(mName); } + @Override + public RecipeMap getRecipeMap() { + return RecipeMaps.plasmaFuels; + } + + @Override + public int getRecipeCatalystPriority() { + return -1; + } + + @Override + protected boolean filtersFluid() { + return false; + } + @Override public Block getCasingBlock() { return GregTech_API.sBlockCasings4; -- cgit