Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bumped the range on sending packets to 128.

Browse source
This commit is contained in:
Kyprus 2012-05-30 14:06:28 -04:00
parent 5022848678
commit b3afe87210
7 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/net/minecraft/src/buildcraft/core/DefaultProps.java
View file

@ -15,6 +15,7 @@ public class DefaultProps {
public static int WORLD_HEIGHT = 256;
public static String NET_CHANNEL_NAME = "BC";
public static int NETWORK_UPDATE_RANGE = 128;
public static int WOODEN_GEAR_ID = 3800;
public static int STONE_GEAR_ID = 3801;

7
common/net/minecraft/src/buildcraft/core/TileBuildCraft.java
View file

@ -29,8 +29,8 @@ public abstract class TileBuildCraft extends TileEntity implements ISynchronized
@SuppressWarnings("rawtypes")
private static Map<Class, TilePacketWrapper> descriptionWrappers = new HashMap<Class, TilePacketWrapper>();
private TilePacketWrapper descriptionPacket;
private TilePacketWrapper updatePacket;
private final TilePacketWrapper descriptionPacket;
private final TilePacketWrapper updatePacket;
private boolean init = false;
@ -72,7 +72,7 @@ public abstract class TileBuildCraft extends TileEntity implements ISynchronized
if (this instanceof ISynchronizedTile)
CoreProxy.sendToPlayers(
((ISynchronizedTile) this).getUpdatePacket(), worldObj,
xCoord, yCoord, zCoord, 50, mod_BuildCraftCore.instance);
xCoord, yCoord, zCoord, DefaultProps.NETWORK_UPDATE_RANGE, mod_BuildCraftCore.instance);
}
@Override
@ -80,6 +80,7 @@ public abstract class TileBuildCraft extends TileEntity implements ISynchronized
return new PacketTileUpdate(this).getPacket();
}
@Override
public PacketPayload getPacketPayload() {
return updatePacket.toPayload(this);
}

3
common/net/minecraft/src/buildcraft/factory/TileAssemblyTable.java
View file

@ -18,6 +18,7 @@ import net.minecraft.src.buildcraft.api.Orientations;
import net.minecraft.src.buildcraft.api.TileNetworkData;
import net.minecraft.src.buildcraft.core.AssemblyRecipe;
import net.minecraft.src.buildcraft.core.CoreProxy;
import net.minecraft.src.buildcraft.core.DefaultProps;
import net.minecraft.src.buildcraft.core.StackUtil;
import net.minecraft.src.buildcraft.core.Utils;
import net.minecraft.src.buildcraft.core.network.PacketIds;
@ -382,7 +383,7 @@ public class TileAssemblyTable extends TileEntity implements IInventory, IPipeCo
packet.posY = yCoord;
packet.posZ = zCoord;
CoreProxy.sendToPlayers(packet.getPacket(), worldObj,
(int) player.posX, (int) player.posY, (int) player.posZ, 100,
(int) player.posX, (int) player.posY, (int) player.posZ, DefaultProps.NETWORK_UPDATE_RANGE,
mod_BuildCraftSilicon.instance);
}
}

15
common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java
View file

@ -22,6 +22,7 @@ import net.minecraft.src.buildcraft.api.Orientations;
import net.minecraft.src.buildcraft.api.SafeTimeTracker;
import net.minecraft.src.buildcraft.api.TileNetworkData;
import net.minecraft.src.buildcraft.core.CoreProxy;
import net.minecraft.src.buildcraft.core.DefaultProps;
import net.minecraft.src.buildcraft.core.GuiIds;
import net.minecraft.src.buildcraft.core.network.PacketIds;
import net.minecraft.src.buildcraft.core.network.PacketUpdate;
@ -44,7 +45,7 @@ public class PipeLogicDiamond extends PipeLogic {
private static TilePacketWrapper networkPacket;
private SafeTimeTracker tracker = new SafeTimeTracker();
private final SafeTimeTracker tracker = new SafeTimeTracker();
public PipeLogicDiamond () {
if (networkPacket == null)
@ -88,8 +89,8 @@ public class PipeLogicDiamond extends PipeLogic {
if (APIProxy.isServerSide())
for (int p = 0; p < 6; ++p)
CoreProxy.sendToPlayers(
getContentsPacket(p), worldObj, xCoord,
yCoord, zCoord, 50, mod_BuildCraftTransport.instance);
getContentsPacket(p), worldObj, xCoord, yCoord, zCoord,
DefaultProps.NETWORK_UPDATE_RANGE, mod_BuildCraftTransport.instance);
return stack;
}
@ -109,8 +110,8 @@ public class PipeLogicDiamond extends PipeLogic {
if (APIProxy.isServerSide())
for (int p = 0; p < 6; ++p)
CoreProxy.sendToPlayers(
getContentsPacket(p), worldObj, xCoord,
yCoord, zCoord, 50, mod_BuildCraftTransport.instance);
getContentsPacket(p), worldObj, xCoord, yCoord, zCoord,
DefaultProps.NETWORK_UPDATE_RANGE, mod_BuildCraftTransport.instance);
}
@Override
@ -119,8 +120,8 @@ public class PipeLogicDiamond extends PipeLogic {
if (APIProxy.isServerSide())
for (int p = 0; p < 6; ++p)
CoreProxy.sendToPlayers(
getContentsPacket(p), worldObj, xCoord,
yCoord, zCoord, 50, mod_BuildCraftTransport.instance);
getContentsPacket(p), worldObj, xCoord, yCoord, zCoord,
DefaultProps.NETWORK_UPDATE_RANGE, mod_BuildCraftTransport.instance);
}
@Override

8
common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java
View file

@ -30,22 +30,20 @@ import net.minecraft.src.buildcraft.api.EntityPassiveItem;
import net.minecraft.src.buildcraft.api.IPipeEntry;
import net.minecraft.src.buildcraft.api.Orientations;
import net.minecraft.src.buildcraft.api.Position;
import net.minecraft.src.buildcraft.api.TileNetworkData;
import net.minecraft.src.buildcraft.api.Trigger;
import net.minecraft.src.buildcraft.core.CoreProxy;
import net.minecraft.src.buildcraft.core.DefaultProps;
import net.minecraft.src.buildcraft.core.IMachine;
import net.minecraft.src.buildcraft.core.StackUtil;
import net.minecraft.src.buildcraft.core.Utils;
import net.minecraft.src.buildcraft.core.network.PacketIds;
import net.minecraft.src.buildcraft.core.network.PacketPipeTransportContent;
import net.minecraft.src.buildcraft.core.network.PacketUpdate;
import net.minecraft.src.buildcraft.core.network.TilePacketWrapper;
public class PipeTransportItems extends PipeTransport {
public boolean allowBouncing = false;
public TreeMap<Integer, EntityData> travelingEntities = new TreeMap<Integer, EntityData> ();
private Vector <EntityData> entitiesToLoad = new Vector <EntityData> ();
private final Vector <EntityData> entitiesToLoad = new Vector <EntityData> ();
// TODO: generalize the use of this hook in particular for obsidian pipe
public IItemTravelingHook travelHook;
@ -98,7 +96,7 @@ public class PipeTransportItems extends PipeTransport {
if (APIProxy.isServerSide())
if (item.synchroTracker.markTimeIfDelay(worldObj, 6 * BuildCraftCore.updateFactor))
CoreProxy.sendToPlayers(createItemPacket(item, orientation),
worldObj, xCoord, yCoord, zCoord, 50,
worldObj, xCoord, yCoord, zCoord, DefaultProps.NETWORK_UPDATE_RANGE,
mod_BuildCraftTransport.instance);
if (travelingEntities.size() > BuildCraftTransport.groupItemsTrigger) {

3
common/net/minecraft/src/buildcraft/transport/PipeTransportPower.java
View file

@ -20,6 +20,7 @@ import net.minecraft.src.buildcraft.api.SafeTimeTracker;
import net.minecraft.src.buildcraft.api.TileNetworkData;
import net.minecraft.src.buildcraft.api.Trigger;
import net.minecraft.src.buildcraft.core.CoreProxy;
import net.minecraft.src.buildcraft.core.DefaultProps;
import net.minecraft.src.buildcraft.core.IMachine;
import net.minecraft.src.buildcraft.core.Utils;
@ -159,7 +160,7 @@ public class PipeTransportPower extends PipeTransport {
if (tracker.markTimeIfDelay(worldObj, 2 * BuildCraftCore.updateFactor))
CoreProxy
.sendToPlayers(this.container.getUpdatePacket(),
worldObj, xCoord, yCoord, zCoord, 40,
worldObj, xCoord, yCoord, zCoord, DefaultProps.NETWORK_UPDATE_RANGE,
mod_BuildCraftCore.instance);
}

3
common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java
View file

@ -36,6 +36,7 @@ import net.minecraft.src.buildcraft.api.TileNetworkData;
import net.minecraft.src.buildcraft.api.Trigger;
import net.minecraft.src.buildcraft.core.BlockIndex;
import net.minecraft.src.buildcraft.core.CoreProxy;
import net.minecraft.src.buildcraft.core.DefaultProps;
import net.minecraft.src.buildcraft.core.IDropControlInventory;
import net.minecraft.src.buildcraft.core.ITileBufferHolder;
import net.minecraft.src.buildcraft.core.PersistentTile;
@ -96,7 +97,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor,
if (APIProxy.isServerSide())
if (networkSyncTracker.markTimeIfDelay(worldObj, delay))
CoreProxy.sendToPlayers(getUpdatePacket(), worldObj, xCoord,
yCoord, zCoord, 40, mod_BuildCraftCore.instance);
yCoord, zCoord, DefaultProps.NETWORK_UPDATE_RANGE, mod_BuildCraftCore.instance);
}
@Override