From b53d8e8945863112e518d7f726ef8fede83dd8d9 Mon Sep 17 00:00:00 2001 From: miozune Date: Wed, 21 Dec 2022 02:01:47 +0900 Subject: Don't allow inserting item into solar boiler for fuel and ash slots (#1568) --- .../tileentities/boilers/GT_MetaTileEntity_Boiler.java | 12 ++++++++++-- .../boilers/GT_MetaTileEntity_Boiler_Solar.java | 13 +++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/common') diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java index 67e18cf1b0..9eb861ad06 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java @@ -444,8 +444,8 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa .widget(new SlotWidget(inventoryHandler, 1) .setPos(43, 61) .setBackground(getGUITextureSet().getItemSlot(), getOverlaySlotOut())) - .widget(new SlotWidget(inventoryHandler, 2).setPos(115, 61).setBackground(getFuelSlotBackground())) - .widget(new SlotWidget(inventoryHandler, 3).setPos(115, 25).setBackground(getAshSlotBackground())) + .widget(createFuelSlot()) + .widget(createAshSlot()) .widget(new ProgressBar() .setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getCapacity()) .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_STEAM, 10) @@ -478,6 +478,14 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa .setSize(18, 18)); } + protected SlotWidget createFuelSlot() { + return (SlotWidget) new SlotWidget(inventoryHandler, 2).setPos(115, 61).setBackground(getFuelSlotBackground()); + } + + protected SlotWidget createAshSlot() { + return (SlotWidget) new SlotWidget(inventoryHandler, 3).setPos(115, 25).setBackground(getAshSlotBackground()); + } + @Override public GUITextureSet getGUITextureSet() { return GUITextureSet.STEAM.apply(getSteamVariant()); diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java index d86fd544e7..978e70e5ab 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java @@ -6,6 +6,7 @@ import static mcp.mobius.waila.api.SpecialChars.GOLD; import static mcp.mobius.waila.api.SpecialChars.RESET; import com.gtnewhorizons.modularui.api.drawable.IDrawable; +import com.gtnewhorizons.modularui.common.widget.SlotWidget; import gregtech.api.enums.Dyes; import gregtech.api.enums.SteamVariant; import gregtech.api.enums.Textures.BlockIcons; @@ -294,6 +295,18 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { return new IDrawable[] {GT_UITextures.TRANSPARENT}; } + @Override + protected SlotWidget createFuelSlot() { + // todo: remove this slot after some time + return super.createFuelSlot().setAccess(true, false); + } + + @Override + protected SlotWidget createAshSlot() { + // todo: remove this slot after some time + return super.createAshSlot().setAccess(true, false); + } + @Override public void getWailaBody( ItemStack itemStack, List currentTip, IWailaDataAccessor accessor, IWailaConfigHandler config) { -- cgit