diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-05-15 21:24:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-15 21:24:09 +0200 |
| commit | 6feb32e8eecd39b8140df4dc3c0fafc989420bc0 (patch) | |
| tree | b7d05c815dc387aed400fc2896ae33833bd8a368 /src/main/java/gregtech/api/metatileentity/implementations | |
| parent | f81b0b4b5a0d2e74c9cbb420e74b9e217d0cc6ec (diff) | |
| parent | 9239ed33b195a59561e9a74bd7063640a97ab514 (diff) | |
| download | GT5-Unofficial-6feb32e8eecd39b8140df4dc3c0fafc989420bc0.tar.gz GT5-Unofficial-6feb32e8eecd39b8140df4dc3c0fafc989420bc0.tar.bz2 GT5-Unofficial-6feb32e8eecd39b8140df4dc3c0fafc989420bc0.zip | |
Merge pull request #533 from GTNewHorizons/update-fluid-display
Allow client to proactively request fluid display updates
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
2 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java index d940ff6602..7d79d2b93f 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java @@ -579,7 +579,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B } @Override - protected void updateFluidDisplayItem() { + public void updateFluidDisplayItem() { super.updateFluidDisplayItem(); if (displaysInputFluid()) { int tDisplayStackSlot = OTHER_SLOT_COUNT + mInputSlotCount + mOutputItems.length; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java index a4e13ae321..6a65eaf5d8 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java @@ -3,6 +3,7 @@ package gregtech.api.metatileentity.implementations; import gregtech.api.enums.ItemList; import gregtech.api.gui.GT_Container_BasicTank; import gregtech.api.gui.GT_GUIContainer_BasicTank; +import gregtech.api.interfaces.IHasFluidDisplayItem; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Utility; @@ -18,7 +19,7 @@ import net.minecraftforge.fluids.FluidTankInfo; * <p/> * This is the main construct for my generic Tanks. Filling and emptying behavior have to be implemented manually */ -public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_TieredMachineBlock { +public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_TieredMachineBlock implements IHasFluidDisplayItem { public FluidStack mFluid; protected int mOpenerCount; @@ -190,7 +191,8 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier } } - protected void updateFluidDisplayItem() { + @Override + public void updateFluidDisplayItem() { if (displaysItemStack() && getStackDisplaySlot() >= 0 && getStackDisplaySlot() < mInventory.length) { if (getDisplayedFluid() == null) { if (ItemList.Display_Fluid.isStackEqual(mInventory[getStackDisplaySlot()], true, true)) |