From 11f5b710890caff0fc04591a7d271bc92497facc Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Fri, 29 Oct 2021 15:14:33 -0300 Subject: [PATCH] update directly instead of relying on forge events --- src/main/java/appeng/fluids/parts/PartFluidStorageBus.java | 4 +++- src/main/java/appeng/me/cache/GridStorageCache.java | 4 ++-- src/main/java/appeng/parts/misc/PartStorageBus.java | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java index 1fe93c0e7..30889ed16 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java +++ b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java @@ -25,8 +25,10 @@ import java.util.Objects; import javax.annotation.Nonnull; +import appeng.api.networking.storage.IStorageGrid; import appeng.api.storage.channels.IItemStorageChannel; import appeng.fluids.helper.IConfigurableFluidInventory; +import appeng.me.cache.GridStorageCache; import appeng.util.ConfigManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -415,7 +417,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni try { // force grid to update handlers... - this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() ); + (( GridStorageCache ) this.getProxy().getGrid().getCache( IStorageGrid.class )).cellUpdate( null ); } catch( final GridAccessException ignore ) { diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java index f771a2d31..47778cba7 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/src/main/java/appeng/me/cache/GridStorageCache.java @@ -94,7 +94,7 @@ public class GridStorageCache implements IStorageGrid this.removeCellProvider( cc, tracker ); this.inactiveCellProviders.remove( cc ); - this.getGrid().postEvent( new MENetworkCellArrayUpdate() ); + cellUpdate( null ); tracker.applyChanges(); } @@ -119,7 +119,7 @@ public class GridStorageCache implements IStorageGrid final ICellContainer cc = (ICellContainer) machine; this.inactiveCellProviders.add( cc ); - this.getGrid().postEvent( new MENetworkCellArrayUpdate() ); + cellUpdate( null ); if( node.isActive() ) { diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index c8156779d..171f4ed33 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartStorageBus.java @@ -23,6 +23,8 @@ import java.util.Collections; import java.util.List; import java.util.Objects; +import appeng.api.networking.storage.IStorageGrid; +import appeng.me.cache.GridStorageCache; import appeng.tile.misc.TileInterface; import appeng.tile.networking.TileCableBus; import appeng.util.ConfigManager; @@ -600,7 +602,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC try { // force grid to update handlers... - this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() ); + (( GridStorageCache ) this.getProxy().getGrid().getCache( IStorageGrid.class )).cellUpdate( null ); } catch( final GridAccessException e ) {