aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus
diff options
context:
space:
mode:
authorYannick Marcotte-Gourde <yannickmg@gmail.com>2024-08-14 00:34:38 -0400
committerGitHub <noreply@github.com>2024-08-14 06:34:38 +0200
commitd167ee2f8a4ff9d73cbc56f0fb6338fb1fc236f9 (patch)
tree3ef2a0979eff8fca8a118f49063de6fd615009bb /src/main/java/gtPlusPlus
parent1bb8b83e53c1d4242d2791bf75597deb02404e8c (diff)
downloadGT5-Unofficial-d167ee2f8a4ff9d73cbc56f0fb6338fb1fc236f9.tar.gz
GT5-Unofficial-d167ee2f8a4ff9d73cbc56f0fb6338fb1fc236f9.tar.bz2
GT5-Unofficial-d167ee2f8a4ff9d73cbc56f0fb6338fb1fc236f9.zip
Single-block Steam Boiler item handling improvements (#2871)
* Refactored GT_MetaTileEntity_Boiler_Bronze::updateFuel * Refactored GT_MetaTileEntity_Boiler_Lava::addUIWidgets * GT_MetaTileEntity_Boiler: Set item filter on fluid & fuel slots * GT_MetaTileEntity_Boiler: Made automation handling more consistent and respect slot filters * Remove deprecated fuel & ash slots from solar boilers * Removed overrides identical to super * Streamline coal boiler combustion logic
Diffstat (limited to 'src/main/java/gtPlusPlus')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
index b27c1a759a..6200a37872 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
@@ -6,6 +6,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidTankInfo;
import org.apache.commons.lang3.ArrayUtils;
+import org.jetbrains.annotations.NotNull;
import com.gtnewhorizons.modularui.api.drawable.IDrawable;
import com.gtnewhorizons.modularui.api.drawable.UITexture;
@@ -211,6 +212,11 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
}
@Override
+ protected boolean isItemValidFuel(@NotNull ItemStack stack) {
+ return getBurnTime(stack) > 0;
+ }
+
+ @Override
// Since this type of machine can have different water and steam capacities, we need to override getTankInfo() to
// support returning those different capacities.
public FluidTankInfo[] getTankInfo(ForgeDirection aSide) {
@@ -219,15 +225,8 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
}
@Override
- public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
- ItemStack aStack) {
- return aIndex == 1 || aIndex == 3;
- }
-
- @Override
- public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side,
- ItemStack aStack) {
- return aIndex == 2;
+ protected boolean isAutomatable() {
+ return true;
}
@Override