From e04bbcba84b59d973afc4cade71a9bbc2e6d3c74 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 19 Jul 2015 23:25:45 -0700 Subject: [PATCH] Fix #757 Particles rendering in other dimensions --- .../forestry/apiculture/BeekeepingLogic.java | 2 +- .../multiblock/AlvearyController.java | 2 +- .../multiblock/TileAlvearyClimatiser.java | 2 +- .../multiblock/TileAlvearySwarmer.java | 2 +- .../arboriculture/gadgets/TileFruitPod.java | 2 +- .../arboriculture/gadgets/TileLeaves.java | 4 +-- .../arboriculture/gadgets/TileStairs.java | 2 +- .../java/forestry/core/config/Defaults.java | 2 -- .../java/forestry/core/gadgets/Engine.java | 2 +- .../forestry/core/gadgets/TileAnalyzer.java | 4 +-- .../forestry/core/gadgets/TileForestry.java | 2 +- .../java/forestry/core/proxy/ProxyCommon.java | 4 +-- .../forestry/core/proxy/ProxyNetwork.java | 29 ++++++++++--------- .../farming/multiblock/FarmController.java | 2 +- .../forestry/mail/gadgets/MachineTrader.java | 2 +- 15 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index b9ce832f6..86ebd27b4 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -148,7 +148,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { this.active = active; if (!housing.getWorld().isRemote) { - Proxies.net.sendNetworkPacket(new PacketBeekeepingLogicActive(housing)); + Proxies.net.sendNetworkPacket(new PacketBeekeepingLogicActive(housing), housing.getWorld()); } } diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java index a475f2b99..41ecd5575 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -342,7 +342,7 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple @Override public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess) { PacketGuiUpdate packet = new PacketGuiUpdate(this); - Proxies.net.sendNetworkPacket(packet); + Proxies.net.sendNetworkPacket(packet, worldObj); if (oldAccess == EnumAccess.SHARED || newAccess == EnumAccess.SHARED) { // pipes connected to this need to update diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java index 561a7f6d8..90ce946a8 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java @@ -125,7 +125,7 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IEner if (worldObj.isRemote) { worldObj.func_147479_m(xCoord, yCoord, zCoord); } else { - Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this)); + Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this), worldObj); } } diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java index ecd72752b..0907f6124 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java @@ -224,7 +224,7 @@ public class TileAlvearySwarmer extends TileAlvearyWithGui implements ISidedInve this.active = active; if (!worldObj.isRemote) { - Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this)); + Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this), worldObj); } } diff --git a/src/main/java/forestry/arboriculture/gadgets/TileFruitPod.java b/src/main/java/forestry/arboriculture/gadgets/TileFruitPod.java index 18a6f2e76..4d7742b6d 100755 --- a/src/main/java/forestry/arboriculture/gadgets/TileFruitPod.java +++ b/src/main/java/forestry/arboriculture/gadgets/TileFruitPod.java @@ -135,7 +135,7 @@ public class TileFruitPod extends TileEntity implements IFruitBearer, IStreamabl } private void sendNetworkUpdateRipening() { - Proxies.net.sendNetworkPacket(new PacketRipeningUpdate(this)); + Proxies.net.sendNetworkPacket(new PacketRipeningUpdate(this), worldObj); } public void fromRipeningPacket(int newMaturity) { diff --git a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java index 2fa243253..46cf7b86b 100755 --- a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java @@ -321,7 +321,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru } public void sendNetworkUpdate() { - Proxies.net.sendNetworkPacket(new PacketTileStream(this)); + Proxies.net.sendNetworkPacket(new PacketTileStream(this), worldObj); } private void sendNetworkUpdateRipening() { @@ -332,7 +332,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru colourFruits = newColourFruits; PacketRipeningUpdate ripeningUpdate = new PacketRipeningUpdate(this); - Proxies.net.sendNetworkPacket(ripeningUpdate); + Proxies.net.sendNetworkPacket(ripeningUpdate, worldObj); } private static final short hasFruitFlag = 1; diff --git a/src/main/java/forestry/arboriculture/gadgets/TileStairs.java b/src/main/java/forestry/arboriculture/gadgets/TileStairs.java index 3b1a032fc..64c0c8d7f 100755 --- a/src/main/java/forestry/arboriculture/gadgets/TileStairs.java +++ b/src/main/java/forestry/arboriculture/gadgets/TileStairs.java @@ -72,7 +72,7 @@ public class TileStairs extends TileEntity implements IStreamable { } public void sendNetworkUpdate() { - Proxies.net.sendNetworkPacket(new PacketTileStream(this)); + Proxies.net.sendNetworkPacket(new PacketTileStream(this), worldObj); } @Override diff --git a/src/main/java/forestry/core/config/Defaults.java b/src/main/java/forestry/core/config/Defaults.java index e42e51296..27dfe7f49 100755 --- a/src/main/java/forestry/core/config/Defaults.java +++ b/src/main/java/forestry/core/config/Defaults.java @@ -27,8 +27,6 @@ public class Defaults { public static final int FLAG_BLOCK_UPDATE = 1; public static final int FLAG_BLOCK_SYNCH = 2; - public static final int NET_MAX_UPDATE_DISTANCE = 50; - public static final int BUCKET_VOLUME = 1000; public static final int FLUID_PER_HONEY_DROP = 100; diff --git a/src/main/java/forestry/core/gadgets/Engine.java b/src/main/java/forestry/core/gadgets/Engine.java index 1174e93cc..963858837 100755 --- a/src/main/java/forestry/core/gadgets/Engine.java +++ b/src/main/java/forestry/core/gadgets/Engine.java @@ -175,7 +175,7 @@ public abstract class Engine extends TileBase implements IEnergyConnection, IAct this.active = active; if (!worldObj.isRemote) { - Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this)); + Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this), worldObj); } } diff --git a/src/main/java/forestry/core/gadgets/TileAnalyzer.java b/src/main/java/forestry/core/gadgets/TileAnalyzer.java index 9a4e01214..fdbd8043a 100755 --- a/src/main/java/forestry/core/gadgets/TileAnalyzer.java +++ b/src/main/java/forestry/core/gadgets/TileAnalyzer.java @@ -150,7 +150,7 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui if (added) { setInventorySlotContents(SLOT_ANALYZE, null); PacketItemStackDisplay packet = new PacketItemStackDisplay(this, getIndividualOnDisplay()); - Proxies.net.sendNetworkPacket(packet); + Proxies.net.sendNetworkPacket(packet, worldObj); } getErrorLogic().setCondition(!added, EnumErrorCode.NOSPACE); @@ -186,7 +186,7 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui setInventorySlotContents(SLOT_ANALYZE, inputStack); slot.setStackInSlot(null); PacketItemStackDisplay packet = new PacketItemStackDisplay(this, getIndividualOnDisplay()); - Proxies.net.sendNetworkPacket(packet); + Proxies.net.sendNetworkPacket(packet, worldObj); return true; } diff --git a/src/main/java/forestry/core/gadgets/TileForestry.java b/src/main/java/forestry/core/gadgets/TileForestry.java index bfa5b01b0..6e5ef5d1c 100755 --- a/src/main/java/forestry/core/gadgets/TileForestry.java +++ b/src/main/java/forestry/core/gadgets/TileForestry.java @@ -165,7 +165,7 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE /* INetworkedEntity */ public final void sendNetworkUpdate() { PacketTileStream packet = new PacketTileStream(this); - Proxies.net.sendNetworkPacket(packet); + Proxies.net.sendNetworkPacket(packet, worldObj); } @Override diff --git a/src/main/java/forestry/core/proxy/ProxyCommon.java b/src/main/java/forestry/core/proxy/ProxyCommon.java index 612317e94..c0e39fc4e 100755 --- a/src/main/java/forestry/core/proxy/ProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ProxyCommon.java @@ -209,7 +209,7 @@ public class ProxyCommon { } public void playSoundFX(World world, int x, int y, int z, Block block) { - Proxies.net.sendNetworkPacket(new PacketFXSignal(PacketFXSignal.SoundFXType.LEAF, x, y, z, block, 0)); + Proxies.net.sendNetworkPacket(new PacketFXSignal(PacketFXSignal.SoundFXType.LEAF, x, y, z, block, 0), world); } public void playSoundFX(World world, int x, int y, int z, String sound, float volume, float pitch) { @@ -244,7 +244,7 @@ public class ProxyCommon { public void sendFXSignal(PacketFXSignal.VisualFXType visualFX, PacketFXSignal.SoundFXType soundFX, World world, int xCoord, int yCoord, int zCoord, Block block, int i) { if (Proxies.common.isSimulating(world)) { - Proxies.net.sendNetworkPacket(new PacketFXSignal(visualFX, soundFX, xCoord, yCoord, zCoord, block, i)); + Proxies.net.sendNetworkPacket(new PacketFXSignal(visualFX, soundFX, xCoord, yCoord, zCoord, block, i), world); } } diff --git a/src/main/java/forestry/core/proxy/ProxyNetwork.java b/src/main/java/forestry/core/proxy/ProxyNetwork.java index a9a6a23f7..a91c23181 100755 --- a/src/main/java/forestry/core/proxy/ProxyNetwork.java +++ b/src/main/java/forestry/core/proxy/ProxyNetwork.java @@ -13,40 +13,43 @@ package forestry.core.proxy; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; -import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.util.FakePlayer; import forestry.Forestry; -import forestry.core.config.Defaults; import forestry.core.network.ForestryPacket; import forestry.core.network.ILocatedPacket; public class ProxyNetwork { - public

void sendNetworkPacket(P packet) { - if (packet == null) { + public

void sendNetworkPacket(P packet, World world) { + if (packet == null || !(world instanceof WorldServer)) { return; } int x = packet.getPosX(); int y = packet.getPosY(); int z = packet.getPosZ(); - World[] worlds = DimensionManager.getWorlds(); - for (World world : worlds) { - for (int j = 0; j < world.playerEntities.size(); j++) { - EntityPlayerMP player = (EntityPlayerMP) world.playerEntities.get(j); - if (isPlayerInRange(player, x, y, z)) { + WorldServer worldServer = (WorldServer) world; + int viewDistance = (worldServer.func_73046_m().getConfigurationManager().getViewDistance() + 1) * 16; + + for (Object playerObj : world.playerEntities) { + if (playerObj instanceof EntityPlayerMP) { + EntityPlayerMP player = (EntityPlayerMP) playerObj; + + if (isPlayerInRange(player, viewDistance, x, y, z)) { Forestry.packetHandler.sendPacket(packet.getPacket(), player); } } } } - private static boolean isPlayerInRange(EntityPlayerMP player, int x, int y, int z) { - return Math.abs(player.posX - x) <= Defaults.NET_MAX_UPDATE_DISTANCE && - Math.abs(player.posY - y) <= Defaults.NET_MAX_UPDATE_DISTANCE && - Math.abs(player.posZ - z) <= Defaults.NET_MAX_UPDATE_DISTANCE; + private static boolean isPlayerInRange(EntityPlayerMP player, int viewDistance, int x, int y, int z) { + double distX = player.posX - x; + double distY = player.posY - y; + double distZ = player.posZ - z; + return (distX * distX) + (distY * distY) + (distZ * distZ) < (viewDistance * viewDistance); } public void sendToPlayer(ForestryPacket packet, EntityPlayer entityplayer) { diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index 08350da03..aad29c408 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -334,7 +334,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen @Override public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess) { PacketGuiUpdate packet = new PacketGuiUpdate(this); - Proxies.net.sendNetworkPacket(packet); + Proxies.net.sendNetworkPacket(packet, worldObj); if (oldAccess == EnumAccess.SHARED || newAccess == EnumAccess.SHARED) { // pipes connected to this need to update diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index bf5df89ae..276519e2a 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -265,7 +265,7 @@ public class MachineTrader extends TileBase { String newAddressName = newAddress.getName(); if (newAddressName != null && newAddressName.equals(addressName)) { PacketTraderAddress packetResponse = new PacketTraderAddress(this, addressName); - Proxies.net.sendNetworkPacket(packetResponse); + Proxies.net.sendNetworkPacket(packetResponse, worldObj); } } }