From b018985a54f48eaedfd921e6977836dd196a7bf0 Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Fri, 29 Oct 2021 15:12:11 -0300 Subject: [PATCH] update directly instead of relying on forge events --- gradle.properties | 2 +- 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 +++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9681a5c42..701e754fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ aechannel=stable aebuild=7 aegroup=appeng aebasename=appliedenergistics2 -trousers=omni-fixes-v47c +trousers=omni-fixes-v47d ######################################################### # Versions # diff --git a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java index 62f5a422e..7173dbbe6 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java +++ b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java @@ -25,7 +25,9 @@ import java.util.Objects; import javax.annotation.Nonnull; +import appeng.api.networking.storage.IStorageGrid; import appeng.fluids.helper.IConfigurableFluidInventory; +import appeng.me.cache.GridStorageCache; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -374,7 +376,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 3800e0243..108a07ffd 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 500544fed..030b2437b 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 com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository; @@ -557,7 +559,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 ) {