From 12d91ce3022c8e685f7c3a32f6bc31242512bf59 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Thu, 9 Apr 2015 21:50:21 +0100 Subject: [PATCH] Dispatch SubTileEntity packets manually rather than relying on markBlockForUpdate. Good for performance, should close #734 --- .../api/internal/VanillaPacketDispatcher.java | 32 +++++++++++++++++++ .../java/vazkii/botania/api/package-info.java | 2 +- .../botania/api/subtile/SubTileEntity.java | 3 +- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java new file mode 100644 index 000000000..9520e286e --- /dev/null +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -0,0 +1,32 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Apr 9, 2015, 9:38:44 PM (GMT)] + */ +package vazkii.botania.api.internal; + +import java.util.List; + +import vazkii.botania.common.core.helper.MathHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; + +public final class VanillaPacketDispatcher { + + public static void dispatchTEToNearbyPlayers(TileEntity tile) { + World world = tile.getWorldObj(); + List players = world.playerEntities; + for(EntityPlayer player : players) + if(MathHelper.pointDistancePlane(player.posX, player.posZ, tile.xCoord + 0.5, tile.zCoord + 0.5) < 64 && player instanceof EntityPlayerMP) + ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(tile.getDescriptionPacket()); + } + +} diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 91a0eee4c..13db380be 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "37", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "38", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index 6598cfe90..30dd5b7fe 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -23,6 +23,7 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandBindable; import cpw.mods.fml.relauncher.Side; @@ -81,7 +82,7 @@ public class SubTileEntity { public void readFromPacketNBT(NBTTagCompound cmp) { } public void sync() { - supertile.getWorldObj().markBlockForUpdate(supertile.xCoord, supertile.yCoord, supertile.zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(supertile); } public String getUnlocalizedName() {