From 4d7defad63cd5d113ec3425b64832f15f978f6e5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 12 Jun 2020 09:02:44 -0500 Subject: [PATCH] Remove some more unneeded syncs --- .../api/internal/VanillaPacketDispatcher.java | 15 ++++++++------- .../botania/common/block/mana/BlockPool.java | 2 +- .../common/block/tile/mana/TileDistributor.java | 2 -- .../botania/common/block/tile/mana/TilePool.java | 5 ++--- .../botania/common/block/tile/mana/TilePump.java | 2 +- .../botania/common/entity/EntityPoolMinecart.java | 5 +---- .../botania/common/item/ItemBlackLotus.java | 1 - .../vazkii/botania/common/item/ItemSpark.java | 1 - 8 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index 31fcb0543..894c8f595 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -19,13 +19,14 @@ import net.minecraft.world.server.ServerWorld; public final class VanillaPacketDispatcher { public static void dispatchTEToNearbyPlayers(TileEntity tile) { - SUpdateTileEntityPacket packet = tile.getUpdatePacket(); - BlockPos pos = tile.getPos(); - - if (packet != null && tile.getWorld() instanceof ServerWorld) { - ((ServerChunkProvider) tile.getWorld().getChunkProvider()).chunkManager - .getTrackingPlayers(new ChunkPos(pos), false) - .forEach(e -> e.connection.sendPacket(packet)); + if (tile.getWorld() instanceof ServerWorld) { + SUpdateTileEntityPacket packet = tile.getUpdatePacket(); + if (packet != null) { + BlockPos pos = tile.getPos(); + ((ServerChunkProvider) tile.getWorld().getChunkProvider()).chunkManager + .getTrackingPlayers(new ChunkPos(pos), false) + .forEach(e -> e.connection.sendPacket(packet)); + } } } 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 555426ff2..727529971 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -125,7 +125,7 @@ public class BlockPool extends BlockModWaterloggable implements IWandHUD, IWanda @Override public boolean onUsedByWand(PlayerEntity player, ItemStack stack, World world, BlockPos pos, Direction side) { - ((TilePool) world.getTileEntity(pos)).onWanded(player, stack); + ((TilePool) world.getTileEntity(pos)).onWanded(player); return true; } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index 0b92815ed..f697e1a4b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -70,8 +70,6 @@ public class TileDistributor extends TileMod implements IManaReceiver, ITickable int manaForEach = mana / tiles; for (IManaReceiver pool : validPools) { pool.receiveMana(manaForEach); - TileEntity tile = (TileEntity) pool; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, tile.getPos()); } } } 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 46a5f0be9..534cdfa2a 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 @@ -392,12 +392,11 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt } - public void onWanded(PlayerEntity player, ItemStack wand) { + public void onWanded(PlayerEntity player) { if (player == null || player.isSneaking()) { outputting = !outputting; + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } - - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } @OnlyIn(Dist.CLIENT) 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 5df66ede9..4132c0312 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 @@ -25,7 +25,7 @@ public class TilePump extends TileMod implements ITickableTileEntity { private static final String TAG_ACTIVE = "active"; public float innerRingPos; - public boolean active = false; + private boolean active = false; public boolean hasCart = false; public boolean hasCartOnTop = false; public float moving = 0F; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index e54572fe2..9aa161ccc 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -180,11 +180,8 @@ public class EntityPoolMinecart extends AbstractMinecartEntity { } if (did) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, posP_); pump.hasCart = true; - if (!pump.active) { - pump.setActive(true); - } + pump.setActive(true); } if (can) { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 7034be0d4..2a7b6c8f0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -55,7 +55,6 @@ public class ItemBlackLotus extends Item implements IManaDissolvable { if (!item.world.isRemote) { pool.receiveMana(t2 ? MANA_PER_T2 : MANA_PER); stack.shrink(1); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.world, tile.getPos()); PacketHandler.sendToNearby(item.world, item, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.BLACK_LOTUS_DISSOLVE, item.getPosX(), tile.getPos().getY() + 0.5, item.getPosZ())); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index b4567114b..2e82e4491 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -45,7 +45,6 @@ public class ItemSpark extends Item implements IManaGivingItem { spark.setPosition(pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5); world.addEntity(spark); attach.attachSpark(spark); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } return ActionResultType.SUCCESS; }