From f2f6cdba41df3d37144f11ddefbbba850527b5b9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 12 Jun 2020 09:07:31 -0500 Subject: [PATCH] Remove world, pos override of dispatchTE, which requeries the TE and thus is laggier --- .../botania/api/internal/VanillaPacketDispatcher.java | 7 ------- .../botania/common/block/decor/BlockFloatingFlower.java | 2 +- .../java/vazkii/botania/common/block/mana/BlockPool.java | 4 +--- .../java/vazkii/botania/common/block/tile/TileAltar.java | 6 +++--- .../java/vazkii/botania/common/block/tile/TileBrewery.java | 2 +- .../vazkii/botania/common/block/tile/TileEnchanter.java | 2 +- .../vazkii/botania/common/block/tile/TileRuneAltar.java | 6 +++--- .../vazkii/botania/common/block/tile/TileTerraPlate.java | 4 ++-- .../vazkii/botania/common/block/tile/TileTinyPotato.java | 2 +- .../vazkii/botania/common/block/tile/mana/TileBellows.java | 2 +- .../vazkii/botania/common/block/tile/mana/TilePool.java | 2 +- .../vazkii/botania/common/block/tile/mana/TilePump.java | 2 +- .../botania/common/block/tile/mana/TileSpreader.java | 6 +++--- .../botania/common/block/tile/mana/TileTurntable.java | 2 +- .../java/vazkii/botania/common/entity/EntityManaBurst.java | 2 +- 15 files changed, 21 insertions(+), 30 deletions(-) diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index 894c8f595..53ae21a36 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -30,11 +30,4 @@ public final class VanillaPacketDispatcher { } } - public static void dispatchTEToNearbyPlayers(World world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); - if (tile != null) { - dispatchTEToNearbyPlayers(tile); - } - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 1a703141b..1953c172f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -95,7 +95,7 @@ public class BlockFloatingFlower extends BlockModWaterloggable { if (type != null && type != flower.getIslandType()) { if (!world.isRemote) { flower.setIslandType(type); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(te); } if (!player.abilities.isCreativeMode) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 727529971..c5556283c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -90,9 +90,7 @@ public class BlockPool extends BlockModWaterloggable implements IWandHUD, IWanda public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) { if (entity instanceof ItemEntity) { TilePool tile = (TilePool) world.getTileEntity(pos); - if (tile.collideEntityItem((ItemEntity) entity)) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); - } + tile.collideEntityItem((ItemEntity) entity); } } 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 ea489337e..88841f63a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -210,7 +210,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, public void trySetLastRecipe(PlayerEntity player) { tryToSetLastRecipe(player, itemHandler, lastRecipe); if (!isEmpty()) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } } @@ -265,7 +265,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, } if (didChange) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } } else { for (int i = 0; i < getSizeInventory(); i++) { @@ -362,7 +362,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, public void setFluid(Fluid fluid) { Preconditions.checkArgument(fluid == Fluids.WATER || fluid == Fluids.LAVA || fluid == Fluids.EMPTY); this.fluid = fluid; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 2612a9972..a64368b02 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -84,7 +84,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver, I } if (did) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); findRecipe(); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 43a2f4914..40926d21e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -381,7 +381,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl } public void sync() { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index e61dba8b5..a60e8a42c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -113,7 +113,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver, } if (did) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } return true; @@ -219,7 +219,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver, if (manaToGet != this.manaToGet) { world.playSound(null, pos, ModSounds.runeAltarStart, SoundCategory.BLOCKS, 1, 1); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } } @@ -239,7 +239,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver, public void trySetLastRecipe(PlayerEntity player) { TileAltar.tryToSetLastRecipe(player, itemHandler, lastRecipe); if (!isEmpty()) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 664f7ed21..678b19e1e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -89,7 +89,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickab .forEach(os -> os.registerTransfer(spark)); } if (mana > 0) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); PacketHandler.sendToNearby(world, getPos(), new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.TERRA_PLATE, getPos().getX(), getPos().getY(), getPos().getZ())); } @@ -106,7 +106,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickab world.playSound(null, item.getPosX(), item.getPosY(), item.getPosZ(), ModSounds.terrasteelCraft, SoundCategory.BLOCKS, 1, 1); mana = 0; world.updateComparatorOutputLevel(pos, getBlockState().getBlock()); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index 33c8e4fa0..7b4f83806 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -123,7 +123,7 @@ public class TileTinyPotato extends TileSimpleInventory implements ITickableTile @Override public void markDirty() { super.markDirty(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java index 92ec5df23..e3670c92f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java @@ -149,7 +149,7 @@ public class TileBellows extends TileMod implements ITickableTileEntity { boolean diff = this.active != active; this.active = active; if (diff) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } } } 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 534cdfa2a..8ea41be6d 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 @@ -395,7 +395,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt public void onWanded(PlayerEntity player) { if (player == null || player.isSneaking()) { outputting = !outputting; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 4132c0312..2dfc6535b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -107,7 +107,7 @@ public class TilePump extends TileMod implements ITickableTileEntity { boolean diff = this.active != active; this.active = active; if (diff) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } } } 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 e7340c35e..7971b2d14 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 @@ -269,7 +269,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if (receiverLastTick != receiver && !world.isRemote) { requestsClientUpdate = true; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } redstoneLastTick = redstone; @@ -424,7 +424,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, checkForReceiver(); requestsClientUpdate = true; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, getPos()); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } } } @@ -632,7 +632,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, @Override public void markDirty() { checkForReceiver(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index 27cb55c9c..ebec1dce0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -82,7 +82,7 @@ public class TileTurntable extends TileMod implements ITickableTileEntity { } else { speed = speed == 6 ? 1 : speed + 1; } - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index bd0ef97b9..6a7f2fa8e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -625,7 +625,7 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { if (tile instanceof IThrottledPacket) { ((IThrottledPacket) tile).markDispatchable(); } else { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers((TileEntity) tile); } }