From 8e499b710da9bca5a11e1a6b804447e32f0a97d5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 13 Jun 2020 10:38:26 -0500 Subject: [PATCH] Remove a bunch of redundant markdirty and updateComparator calls, the former causing network spam and the latter just being unnecessary --- build.gradle | 4 ++-- src/main/java/vazkii/botania/common/block/BlockAltar.java | 4 ---- src/main/java/vazkii/botania/common/block/BlockHourglass.java | 2 -- .../java/vazkii/botania/common/block/BlockSparkChanger.java | 3 --- .../java/vazkii/botania/common/block/mana/BlockEnchanter.java | 1 - .../java/vazkii/botania/common/block/mana/BlockSpreader.java | 2 -- src/main/java/vazkii/botania/common/block/tile/TileAltar.java | 4 +--- .../java/vazkii/botania/common/block/tile/TileCraftCrate.java | 1 - .../vazkii/botania/common/block/tile/TileIncensePlate.java | 2 +- .../vazkii/botania/common/block/tile/TileSparkChanger.java | 2 -- .../java/vazkii/botania/common/block/tile/mana/TilePool.java | 1 - 11 files changed, 4 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index eac79a4d5..ddfc9d049 100644 --- a/build.gradle +++ b/build.gradle @@ -103,8 +103,8 @@ test { dependencies { minecraft "net.minecraftforge:forge:${mc_version}-31.1.24" - compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-32.168:api") - runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-32.168") + compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-35.185:api") + runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-35.185") compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2:api") runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2") diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 0e50d42a1..a592d08d3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -122,7 +122,6 @@ public class BlockAltar extends BlockMod { } tile.setFluid(Fluids.EMPTY); - world.updateComparatorOutputLevel(pos, this); world.getChunkProvider().getLightManager().checkBlock(pos); return ActionResultType.SUCCESS; @@ -135,7 +134,6 @@ public class BlockAltar extends BlockMod { } tile.setFluid(Fluids.WATER); - world.updateComparatorOutputLevel(pos, this); world.getChunkProvider().getLightManager().checkBlock(pos); } @@ -147,7 +145,6 @@ public class BlockAltar extends BlockMod { } tile.setFluid(Fluids.LAVA); - world.updateComparatorOutputLevel(pos, this); world.getChunkProvider().getLightManager().checkBlock(pos); } @@ -167,7 +164,6 @@ public class BlockAltar extends BlockMod { if (altar.getFluid() == Fluids.EMPTY) { altar.setFluid(Fluids.WATER); } - world.updateComparatorOutputLevel(pos, this); } } } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 7372b3d3d..b5aef42e5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -86,13 +86,11 @@ public class BlockHourglass extends BlockModWaterloggable implements IManaTrigge if (hgStack.isEmpty() && TileHourglass.getStackItemTime(stack) > 0) { hourglass.getItemHandler().setStackInSlot(0, stack.copy()); - hourglass.markDirty(); stack.setCount(0); return ActionResultType.SUCCESS; } else if (!hgStack.isEmpty()) { ItemHandlerHelper.giveItemToPlayer(player, hgStack); hourglass.getItemHandler().setStackInSlot(0, ItemStack.EMPTY); - hourglass.markDirty(); return ActionResultType.SUCCESS; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 396f39d86..5ec430a3d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -73,13 +73,10 @@ public class BlockSparkChanger extends BlockModWaterloggable { ItemStack cstack = changer.getItemHandler().getStackInSlot(0); if (!cstack.isEmpty()) { changer.getItemHandler().setStackInSlot(0, ItemStack.EMPTY); - world.updateComparatorOutputLevel(pos, this); - changer.markDirty(); ItemHandlerHelper.giveItemToPlayer(player, cstack); return ActionResultType.SUCCESS; } else if (!pstack.isEmpty() && pstack.getItem() instanceof ItemSparkUpgrade) { changer.getItemHandler().setStackInSlot(0, pstack.split(1)); - world.updateComparatorOutputLevel(pos, this); changer.markDirty(); return ActionResultType.SUCCESS; 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 cb9f42c4a..91309afad 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -99,7 +99,6 @@ public class BlockEnchanter extends BlockMod implements IWandable, IWandHUD { 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); } } 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 4b3ca9453..96b1753e2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -151,11 +151,9 @@ public class BlockSpreader extends BlockModWaterloggable implements IWandable, I } spreader.getItemHandler().setStackInSlot(0, heldItem.copy()); - spreader.markDirty(); } else if (!lens.isEmpty() && !wool) { ItemHandlerHelper.giveItemToPlayer(player, lens); spreader.getItemHandler().setStackInSlot(0, ItemStack.EMPTY); - spreader.markDirty(); } if (wool && spreader.paddingColor == null) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index 88841f63a..105c2a9e1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -124,13 +124,11 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, if (!drainWater.isEmpty() && drainWater.getFluid() == Fluids.WATER && drainWater.getAmount() == FluidAttributes.BUCKET_VOLUME) { setFluid(Fluids.WATER); - world.updateComparatorOutputLevel(pos, getBlockState().getBlock()); fluidHandler.drain(new FluidStack(Fluids.WATER, FluidAttributes.BUCKET_VOLUME), IFluidHandler.FluidAction.EXECUTE); item.setItem(fluidHandler.getContainer()); return true; } else if (!drainLava.isEmpty() && drainLava.getFluid() == Fluids.LAVA && drainLava.getAmount() == FluidAttributes.BUCKET_VOLUME) { setFluid(Fluids.LAVA); - world.updateComparatorOutputLevel(pos, getBlockState().getBlock()); fluidHandler.drain(new FluidStack(Fluids.LAVA, FluidAttributes.BUCKET_VOLUME), IFluidHandler.FluidAction.EXECUTE); item.setItem(fluidHandler.getContainer()); return true; @@ -163,7 +161,6 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, world.addEntity(outputItem); setFluid(Fluids.EMPTY); - world.updateComparatorOutputLevel(pos, getBlockState().getBlock()); world.addBlockEvent(getPos(), getBlockState().getBlock(), CRAFT_EFFECT_EVENT, 0); }); @@ -363,6 +360,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, Preconditions.checkArgument(fluid == Fluids.WATER || fluid == Fluids.LAVA || fluid == Fluids.EMPTY); this.fluid = fluid; VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); + world.updateComparatorOutputLevel(getPos(), getBlockState().getBlock()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 505b3dc4a..260de8817 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -161,7 +161,6 @@ public class TileCraftCrate extends TileOpenCrate { } itemHandler.setStackInSlot(i, ItemStack.EMPTY); } - markDirty(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java index cdc362af9..55d9f7546 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -110,7 +110,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ITickableTi } if (comparatorOutput != newComparator) { comparatorOutput = newComparator; - world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); + world.updateComparatorOutputLevel(pos, getBlockState().getBlock()); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index 86a83200a..0c99ecbee 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -70,8 +70,6 @@ public class TileSparkChanger extends TileSimpleInventory { transfers.clear(); } itemHandler.setStackInSlot(0, sparkStack); - world.updateComparatorOutputLevel(pos, getBlockState().getBlock()); - markDirty(); } } 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 8ea41be6d..db738c2d8 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 @@ -120,7 +120,6 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt this.mana = Math.max(0, Math.min(getCurrentMana() + mana, manaCap)); if (old != this.mana) { markDirty(); - world.updateComparatorOutputLevel(pos, getBlockState().getBlock()); markDispatchable(); } }