From a9291566266807cf73802bb742a19e6f12ca8d7c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 2 Mar 2016 10:30:46 -0600 Subject: [PATCH] Fix overeager TE refreshing. Closes #152 and potentially fixes #71 --- .../vazkii/botania/common/block/tile/TileOpenCrate.java | 8 +++++++- .../vazkii/botania/common/block/tile/mana/TilePool.java | 6 +++++- .../botania/common/block/tile/mana/TileSpreader.java | 6 +++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 973fe91b4..7a2e8448e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -18,6 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.lib.LibBlockNames; @@ -25,7 +27,11 @@ public class TileOpenCrate extends TileSimpleInventory { @Override public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { - return true; + if(oldState.getBlock() != newState.getBlock()) + return true; + if(oldState.getBlock() != ModBlocks.pool || newState.getBlock() != ModBlocks.pool) + return true; + return oldState.getValue(BotaniaStateProps.CRATE_VARIANT) != newState.getValue(BotaniaStateProps.CRATE_VARIANT); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 941c3a207..11511d4e6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -106,7 +106,11 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc @Override public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { - return true; + if(oldState.getBlock() != newState.getBlock()) + return true; + if(oldState.getBlock() != ModBlocks.pool || newState.getBlock() != ModBlocks.pool) + return true; + return oldState.getValue(BotaniaStateProps.POOL_VARIANT) != newState.getValue(BotaniaStateProps.POOL_VARIANT); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 67518be86..392e941f3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -143,7 +143,11 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, @Override public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { - return true; + if(oldState.getBlock() != newState.getBlock()) + return true; + if(oldState.getBlock() != ModBlocks.pool || newState.getBlock() != ModBlocks.pool) + return true; + return oldState.getValue(BotaniaStateProps.SPREADER_VARIANT) != newState.getValue(BotaniaStateProps.SPREADER_VARIANT); } @Override