From d183abfd11e8d29f9c0c62db42ae4bade76c3fc1 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 7 Jun 2015 21:09:20 -0700 Subject: [PATCH] Fix GUI glitch with the Alveary (no progress bar) --- .../java/forestry/apiculture/gadgets/TileAlveary.java | 4 ++++ .../forestry/apiculture/gadgets/TileAlvearyPlain.java | 11 +++++++---- src/main/java/forestry/farming/gadgets/TileFarm.java | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlveary.java b/src/main/java/forestry/apiculture/gadgets/TileAlveary.java index 1600f9a0c..c14e0d9a4 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlveary.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlveary.java @@ -146,6 +146,10 @@ public abstract class TileAlveary extends TileForestry implements IAlvearyCompon if (getInternalInventory() instanceof FakeInventoryAdapter) { createInventory(); } + + if (worldObj != null && !worldObj.isRemote) { + setNeedsNetworkUpdate(); + } } @Override diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java index 6e30a1142..bb52b0a2d 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java @@ -358,7 +358,7 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IB @Override public ItemStack decrStackSize(int slotIndex, int amount) { ItemStack itemStack = super.decrStackSize(slotIndex, amount); - if (isMaster() && slotIndex == SLOT_QUEEN) { + if (slotIndex == SLOT_QUEEN) { handleQueenChange(); } return itemStack; @@ -367,15 +367,18 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IB @Override public void setInventorySlotContents(int slotIndex, ItemStack itemStack) { super.setInventorySlotContents(slotIndex, itemStack); - if (isMaster() && slotIndex == SLOT_QUEEN) { + if (slotIndex == SLOT_QUEEN) { handleQueenChange(); } } private void handleQueenChange() { if (!Proxies.common.isSimulating(worldObj)) { - ItemStack itemStack = getStackInSlot(SLOT_QUEEN); - displayQueen = BeeManager.beeRoot.getMember(itemStack); + TileAlvearyPlain master = (TileAlvearyPlain) getCentralTE(); + if (master != null) { + ItemStack itemStack = getStackInSlot(SLOT_QUEEN); + master.displayQueen = BeeManager.beeRoot.getMember(itemStack); + } } } diff --git a/src/main/java/forestry/farming/gadgets/TileFarm.java b/src/main/java/forestry/farming/gadgets/TileFarm.java index a9de54fde..77e168a8b 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarm.java +++ b/src/main/java/forestry/farming/gadgets/TileFarm.java @@ -182,7 +182,7 @@ public abstract class TileFarm extends TileForestry implements IFarmComponent { this.isMaster = true; if (worldObj != null && !worldObj.isRemote) { - sendNetworkUpdate(); + setNeedsNetworkUpdate(); } }