diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-10-22 11:53:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-22 11:53:19 +0200 |
| commit | 943c37a40d0810017966603b69f6a0f4f80a2b16 (patch) | |
| tree | 79d1fd3e18127a6b88a76c69634925127071b7e8 /src | |
| parent | c5378f1c3f73a2dd5c373e97ad4ebcb74ae2efc9 (diff) | |
| parent | 7e421ba5da769ac6b1b06215538004979070900c (diff) | |
| download | GT5-Unofficial-943c37a40d0810017966603b69f6a0f4f80a2b16.tar.gz GT5-Unofficial-943c37a40d0810017966603b69f6a0f4f80a2b16.tar.bz2 GT5-Unofficial-943c37a40d0810017966603b69f6a0f4f80a2b16.zip | |
Merge pull request #702 from GTNewHorizons/start-upon-fluid-manipulation
Try start processing immediately upon manual fluid manipulation
Diffstat (limited to 'src')
3 files changed, 11 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java b/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java index 5d2a9321c4..fbae0b6752 100644 --- a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java +++ b/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java @@ -204,7 +204,10 @@ public class GT_Container_BasicMachine extends GT_Container_BasicTank { } GT_MetaTileEntity_BasicTank tTank = (GT_MetaTileEntity_BasicTank) mTileEntity.getMetaTileEntity(); IFluidAccess tFillableAccess = IFluidAccess.from(tTank, true); - return handleFluidSlotClick(tFillableAccess, aPlayer, aMouseclick == 0, true, true); + ItemStack tToken = handleFluidSlotClick(tFillableAccess, aPlayer, aMouseclick == 0, true, true); + if (mTileEntity.isServerSide() && tToken != null) + mTileEntity.markInventoryBeenModified(); + return tToken; } else { return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer); } diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IHasInventory.java b/src/main/java/gregtech/api/interfaces/tileentity/IHasInventory.java index 437d896800..74ad58c407 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IHasInventory.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IHasInventory.java @@ -5,6 +5,8 @@ import net.minecraft.item.ItemStack; public interface IHasInventory extends ISidedInventory, IHasWorldObjectAndCoords { + default void markInventoryBeenModified() {} + /** * if the Inventory of this TileEntity got modified this tick */ diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 397d03e0df..41203c3ad2 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -1749,6 +1749,11 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE } @Override + public void markInventoryBeenModified() { + mInventoryChanged = true; + } + + @Override public void setGenericRedstoneOutput(boolean aOnOff) { mRedstone = aOnOff; } |