From e68db0064219368bf3b5aa691eae2b38f1fb523c Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Fri, 7 Nov 2014 00:16:55 -0500 Subject: [PATCH] Lightweight client count update message. Seems to fix WAILA update issues. --- .../storagedrawers/StorageDrawers.java | 2 ++ .../block/tile/TileEntityCompDrawers.java | 2 ++ .../block/tile/TileEntityDrawers.java | 21 ++++++++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java index c5197cb..9552376 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java @@ -5,6 +5,7 @@ import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; import com.jaquadro.minecraft.storagedrawers.config.OreDictRegistry; import com.jaquadro.minecraft.storagedrawers.core.*; import com.jaquadro.minecraft.storagedrawers.network.BlockClickMessage; +import com.jaquadro.minecraft.storagedrawers.network.CountUpdateMessage; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; @@ -51,6 +52,7 @@ public class StorageDrawers network = NetworkRegistry.INSTANCE.newSimpleChannel(MOD_ID); network.registerMessage(BlockClickMessage.Handler.class, BlockClickMessage.class, 0, Side.SERVER); + network.registerMessage(CountUpdateMessage.Handler.class, CountUpdateMessage.class, 1, Side.CLIENT); compRegistry = new CompTierRegistry(); oreDictRegistry = new OreDictRegistry(); diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityCompDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityCompDrawers.java index 8c35744..4424bf9 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityCompDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityCompDrawers.java @@ -229,6 +229,8 @@ public class TileEntityCompDrawers extends TileEntityDrawersBase implements ISto pooledCount = count; } + + @Override public void markDirty () { for (int i = 0; i < 3; i++) { diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java index 92fb985..5ad0eff 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java @@ -3,6 +3,9 @@ package com.jaquadro.minecraft.storagedrawers.block.tile; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; import com.jaquadro.minecraft.storagedrawers.inventory.InventoryStack; +import com.jaquadro.minecraft.storagedrawers.network.CountUpdateMessage; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.simpleimpl.IMessage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; @@ -124,6 +127,9 @@ public class TileEntityDrawers extends TileEntityDrawersBase implements IStorage inventoryStacks[slot] = null; } + if (!worldObj.isRemote) + syncClientCount(slot); + return stack; } @@ -169,6 +175,9 @@ public class TileEntityDrawers extends TileEntityDrawersBase implements IStorage data[slot].count += countAdded; stack.stackSize -= countAdded; + if (!worldObj.isRemote) + syncClientCount(slot); + return countAdded; } @@ -233,7 +242,17 @@ public class TileEntityDrawers extends TileEntityDrawersBase implements IStorage @Override public void clientUpdateCount (int slot, int count) { - data[slot].count = count; + if (data[slot].count != count) { + data[slot].count = count; + getWorldObj().func_147479_m(xCoord, yCoord, zCoord); // markBlockForRenderUpdate + } + } + + protected void syncClientCount (int slot) { + IMessage message = new CountUpdateMessage(xCoord, yCoord, zCoord, slot, data[slot].count); + NetworkRegistry.TargetPoint targetPoint = new NetworkRegistry.TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 500); + + StorageDrawers.network.sendToAllAround(message, targetPoint); } @Override