diff --git a/src/main/java/forestry/api/apiculture/IBeekeepingLogic.java b/src/main/java/forestry/api/apiculture/IBeekeepingLogic.java index 3c7a5c43e..c18aac502 100644 --- a/src/main/java/forestry/api/apiculture/IBeekeepingLogic.java +++ b/src/main/java/forestry/api/apiculture/IBeekeepingLogic.java @@ -36,6 +36,12 @@ public interface IBeekeepingLogic extends INbtWritable, INbtReadable { */ void doWork(); + /** + * Force the logic to refresh any cached values and error states. + * Call this when a player opens the gui so that all errors are up to date. + */ + void clearCachedValues(); + /* CLIENT */ diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index 7bfd93c33..a90417576 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -197,6 +197,8 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { if (!ItemStack.areItemStacksEqual(this.queenStack, queenStack)) { this.queen = BeeManager.beeRoot.getMember(queenStack); this.queenStack = queenStack; + hasFlowersCache.clear(); + queenCanWorkCache.clear(); } if (errorLogic.setCondition(queen == null, EnumErrorCode.NO_QUEEN)) { @@ -235,6 +237,13 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { } } + @Override + public void clearCachedValues() { + hasFlowersCache.clear(); + queenCanWorkCache.clear(); + canWork(); + } + private void queenWorkTick(IBee queen) { if (queen == null) { beeProgress = 0; @@ -505,6 +514,11 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { return queenCanWorkCached; } + + public void clear() { + queenCanWorkCached.clear(); + queenCanWorkCooldown = 0; + } } private static class PollenHandler { diff --git a/src/main/java/forestry/apiculture/FakeBeekeepingLogic.java b/src/main/java/forestry/apiculture/FakeBeekeepingLogic.java index 02f72a340..b72108893 100644 --- a/src/main/java/forestry/apiculture/FakeBeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/FakeBeekeepingLogic.java @@ -37,6 +37,11 @@ public class FakeBeekeepingLogic implements IBeekeepingLogic { } + @Override + public void clearCachedValues() { + + } + @Override public void syncToClient() { diff --git a/src/main/java/forestry/apiculture/HasFlowersCache.java b/src/main/java/forestry/apiculture/HasFlowersCache.java index b8b36c2b2..21ebc9d38 100644 --- a/src/main/java/forestry/apiculture/HasFlowersCache.java +++ b/src/main/java/forestry/apiculture/HasFlowersCache.java @@ -97,6 +97,11 @@ public class HasFlowersCache implements INbtWritable, INbtReadable, IStreamable return returnVal; } + public void clear() { + flowerCoords.clear(); + cooldown = 0; + } + @Nonnull public List getFlowerCoords() { return Collections.unmodifiableList(flowerCoords); diff --git a/src/main/java/forestry/apiculture/gui/ContainerAlveary.java b/src/main/java/forestry/apiculture/gui/ContainerAlveary.java index 4056cc46f..31a86432b 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerAlveary.java +++ b/src/main/java/forestry/apiculture/gui/ContainerAlveary.java @@ -22,6 +22,8 @@ public class ContainerAlveary extends ContainerTile { public ContainerAlveary(InventoryPlayer player, TileAlveary tile) { super(tile, player, 8, 108); ContainerBeeHelper.addSlots(this, tile, false); + + tile.getBeekeepingLogic().clearCachedValues(); } private int beeProgress = -1; diff --git a/src/main/java/forestry/apiculture/gui/ContainerBeeHousing.java b/src/main/java/forestry/apiculture/gui/ContainerBeeHousing.java index 881738bbf..84f1ab145 100644 --- a/src/main/java/forestry/apiculture/gui/ContainerBeeHousing.java +++ b/src/main/java/forestry/apiculture/gui/ContainerBeeHousing.java @@ -22,6 +22,8 @@ public class ContainerBeeHousing extends ContainerTile imple public ContainerBeeHousing(InventoryPlayer player, TileBeeHousingBase tile, boolean hasFrames) { super(tile, player, 8, 108); ContainerBeeHelper.addSlots(this, tile, hasFrames); + + tile.getBeekeepingLogic().clearCachedValues(); } private int beeProgress = -1; diff --git a/src/main/java/forestry/apiculture/gui/ContainerMinecartBeehouse.java b/src/main/java/forestry/apiculture/gui/ContainerMinecartBeehouse.java index 6973917f8..2be98f700 100644 --- a/src/main/java/forestry/apiculture/gui/ContainerMinecartBeehouse.java +++ b/src/main/java/forestry/apiculture/gui/ContainerMinecartBeehouse.java @@ -21,6 +21,8 @@ public class ContainerMinecartBeehouse extends ContainerEntity