From 9c0b4ceac94fdc8249a653f7d032e6dfdb0545cf Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 11 Nov 2019 13:06:45 -0600 Subject: [PATCH] Fix a bunch of te's dropping contents on state change --- .../botania/common/block/BlockAltar.java | 10 ++++---- .../botania/common/block/BlockHourglass.java | 10 ++++---- .../common/block/BlockSparkChanger.java | 10 ++++---- .../block/corporea/BlockCorporeaBase.java | 10 ++++---- .../common/block/decor/BlockTinyPotato.java | 10 ++++---- .../common/block/mana/BlockBrewery.java | 4 +--- .../common/block/mana/BlockEnchanter.java | 15 ++++++------ .../botania/common/block/mana/BlockPrism.java | 10 ++++---- .../common/block/mana/BlockRuneAltar.java | 10 ++++---- .../common/block/mana/BlockSpreader.java | 24 ++++++++++--------- 10 files changed, 57 insertions(+), 56 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index ed7994a46..5447c4aa8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -207,11 +207,11 @@ public class BlockAltar extends BlockMod { @Override public void onReplaced(@Nonnull BlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState newState, boolean isMoving) { - TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); - - InventoryHelper.dropInventory(inv, world, state, pos); - - super.onReplaced(state, world, pos, newState, isMoving); + if (state.getBlock() != newState.getBlock()) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); + InventoryHelper.dropInventory(inv, world, state, pos); + super.onReplaced(state, world, pos, newState, isMoving); + } } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 3a3d9c86c..baf64595e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -117,11 +117,11 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, @Override public void onReplaced(@Nonnull BlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState newState, boolean isMoving) { - TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); - - InventoryHelper.dropInventory(inv, world, state, pos); - - super.onReplaced(state, world, pos, newState, isMoving); + if (state.getBlock() != newState.getBlock()) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); + InventoryHelper.dropInventory(inv, world, state, pos); + super.onReplaced(state, world, pos, newState, isMoving); + } } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 70f80d31a..ff941f76c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -88,11 +88,11 @@ public class BlockSparkChanger extends BlockMod { @Override public void onReplaced(@Nonnull BlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState newState, boolean isMoving) { - TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); - - InventoryHelper.dropInventory(inv, world, state, pos); - - super.onReplaced(state, world, pos, newState, isMoving); + if (state.getBlock() != newState.getBlock()) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); + InventoryHelper.dropInventory(inv, world, state, pos); + super.onReplaced(state, world, pos, newState, isMoving); + } } @Override diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 6f567c813..730a7bd40 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -28,11 +28,11 @@ public abstract class BlockCorporeaBase extends BlockMod { @Override public void onReplaced(@Nonnull BlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState newState, boolean isMoving) { - TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); - - InventoryHelper.dropInventory(inv, world, state, pos); - - super.onReplaced(state, world, pos, newState, isMoving); + if (state.getBlock() != newState.getBlock()) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); + InventoryHelper.dropInventory(inv, world, state, pos); + super.onReplaced(state, world, pos, newState, isMoving); + } } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index f6d0109b2..11442c748 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -54,11 +54,11 @@ public class BlockTinyPotato extends BlockMod { @Override public void onReplaced(@Nonnull BlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState newState, boolean isMoving) { - TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); - - InventoryHelper.dropInventory(inv, world, state, pos); - - super.onReplaced(state, world, pos, newState, isMoving); + if (state.getBlock() != newState.getBlock()) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); + InventoryHelper.dropInventory(inv, world, state, pos); + super.onReplaced(state, world, pos, newState, isMoving); + } } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index 3c811e5df..7fa6c127f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -77,11 +77,9 @@ public class BlockBrewery extends BlockMod implements IWandHUD { public void onReplaced(@Nonnull BlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState newState, boolean isMoving) { if(state.getBlock() != newState.getBlock()) { TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); - InventoryHelper.dropInventory(inv, world, state, pos); - + super.onReplaced(state, world, pos, newState, isMoving); } - super.onReplaced(state, world, pos, newState, isMoving); } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 612e11454..4d3884c6d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -91,15 +91,16 @@ public class BlockEnchanter extends BlockMod implements IWandable, IWandHUD { @Override public void onReplaced(@Nonnull BlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState newState, boolean isMoving) { - TileEnchanter enchanter = (TileEnchanter) world.getTileEntity(pos); + if (state.getBlock() != newState.getBlock()) { + TileEnchanter enchanter = (TileEnchanter) world.getTileEntity(pos); - if(!enchanter.itemToEnchant.isEmpty()) { - world.addEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), enchanter.itemToEnchant)); + if(!enchanter.itemToEnchant.isEmpty()) { + world.addEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), enchanter.itemToEnchant)); + } + + world.updateComparatorOutputLevel(pos, state.getBlock()); + super.onReplaced(state, world, pos, newState, isMoving); } - - world.updateComparatorOutputLevel(pos, state.getBlock()); - - super.onReplaced(state, world, pos, newState, isMoving); } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index b02689762..f33d3755a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -106,11 +106,11 @@ public class BlockPrism extends BlockMod implements IManaTrigger, IManaCollision @Override public void onReplaced(@Nonnull BlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState newState, boolean isMoving) { - TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); - - InventoryHelper.dropInventory(inv, world, state, pos); - - super.onReplaced(state, world, pos, newState, isMoving); + if (state.getBlock() != newState.getBlock()) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); + InventoryHelper.dropInventory(inv, world, state, pos); + super.onReplaced(state, world, pos, newState, isMoving); + } } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 14d9e842d..4fa0b2dd3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -79,11 +79,11 @@ public class BlockRuneAltar extends BlockMod implements IWandable { @Override public void onReplaced(@Nonnull BlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState newState, boolean isMoving) { - TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); - - InventoryHelper.dropInventory(inv, world, state, pos); - - super.onReplaced(state, world, pos, newState, isMoving); + if (state.getBlock() != newState.getBlock()) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); + InventoryHelper.dropInventory(inv, world, state, pos); + super.onReplaced(state, world, pos, newState, isMoving); + } } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index dd1704c58..9fb1b260f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -143,20 +143,22 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, IWir @Override public void onReplaced(@Nonnull BlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState newState, boolean isMoving) { - TileEntity tile = world.getTileEntity(pos); - if(!(tile instanceof TileSpreader)) - return; + if (state.getBlock() != newState.getBlock()) { + TileEntity tile = world.getTileEntity(pos); + if(!(tile instanceof TileSpreader)) + return; - TileSpreader inv = (TileSpreader) tile; + TileSpreader inv = (TileSpreader) tile; - if(inv.paddingColor != null) { - ItemStack padding = new ItemStack(ColorHelper.WOOL_MAP.get(inv.paddingColor)); - world.addEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), padding)); + if(inv.paddingColor != null) { + ItemStack padding = new ItemStack(ColorHelper.WOOL_MAP.get(inv.paddingColor)); + world.addEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), padding)); + } + + InventoryHelper.dropInventory(inv, world, state, pos); + + super.onReplaced(state, world, pos, newState, isMoving); } - - InventoryHelper.dropInventory(inv, world, state, pos); - - super.onReplaced(state, world, pos, newState, isMoving); } @Override