diff --git a/mcp/mobius/opis/commands/client/CommandClientShowRenderTick.java b/mcp/mobius/opis/commands/client/CommandClientShowRenderTick.java index b03da77..fa2e732 100644 --- a/mcp/mobius/opis/commands/client/CommandClientShowRenderTick.java +++ b/mcp/mobius/opis/commands/client/CommandClientShowRenderTick.java @@ -1,5 +1,7 @@ package mcp.mobius.opis.commands.client; +import cpw.mods.fml.common.network.Player; +import mcp.mobius.opis.network.OpisPacketHandler; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.server.NetDataCommand; import net.minecraft.command.CommandBase; @@ -20,7 +22,9 @@ public class CommandClientShowRenderTick extends CommandBase { @Override public void processCommand(ICommandSender icommandsender, String[] astring) { - ((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(NetDataCommand.create(Message.CLIENT_SHOW_RENDER_TICK)); + if (icommandsender instanceof Player) + OpisPacketHandler.validateAndSend(NetDataCommand.create(Message.CLIENT_SHOW_RENDER_TICK), (Player)icommandsender); + //((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(NetDataCommand.create(Message.CLIENT_SHOW_RENDER_TICK)); } @Override diff --git a/mcp/mobius/opis/commands/client/CommandClientStart.java b/mcp/mobius/opis/commands/client/CommandClientStart.java index d5a6ad9..cf9f45d 100644 --- a/mcp/mobius/opis/commands/client/CommandClientStart.java +++ b/mcp/mobius/opis/commands/client/CommandClientStart.java @@ -1,5 +1,7 @@ package mcp.mobius.opis.commands.client; +import cpw.mods.fml.common.network.Player; +import mcp.mobius.opis.network.OpisPacketHandler; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.server.NetDataCommand; import net.minecraft.command.CommandBase; @@ -20,7 +22,9 @@ public class CommandClientStart extends CommandBase { @Override public void processCommand(ICommandSender icommandsender, String[] astring) { - ((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(NetDataCommand.create(Message.CLIENT_START_PROFILING)); + if (icommandsender instanceof Player) + OpisPacketHandler.validateAndSend(NetDataCommand.create(Message.CLIENT_START_PROFILING), (Player)icommandsender); + //((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(NetDataCommand.create(Message.CLIENT_START_PROFILING)); } @Override diff --git a/mcp/mobius/opis/commands/client/CommandOpis.java b/mcp/mobius/opis/commands/client/CommandOpis.java index d927afd..4c102c3 100644 --- a/mcp/mobius/opis/commands/client/CommandOpis.java +++ b/mcp/mobius/opis/commands/client/CommandOpis.java @@ -40,7 +40,9 @@ public class CommandOpis extends CommandBase { } PlayerTracker.instance().playersSwing.add((Player)icommandsender); - ((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(NetDataCommand.create(Message.CLIENT_SHOW_SWING)); + //((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(NetDataCommand.create(Message.CLIENT_SHOW_SWING)); + if (icommandsender instanceof Player) + OpisPacketHandler.validateAndSend(NetDataCommand.create(Message.CLIENT_SHOW_SWING), (Player)icommandsender); OpisPacketHandler.sendFullUpdate((Player)icommandsender); } diff --git a/mcp/mobius/opis/commands/server/CommandReset.java b/mcp/mobius/opis/commands/server/CommandReset.java index 7096782..c651adf 100644 --- a/mcp/mobius/opis/commands/server/CommandReset.java +++ b/mcp/mobius/opis/commands/server/CommandReset.java @@ -12,6 +12,7 @@ import mcp.mobius.opis.data.managers.TickHandlerManager; import mcp.mobius.opis.data.managers.TileEntityManager; import mcp.mobius.opis.events.OpisServerTickHandler; import mcp.mobius.opis.events.PlayerTracker; +import mcp.mobius.opis.network.OpisPacketHandler; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.server.NetDataCommand; import net.minecraft.command.CommandBase; @@ -47,7 +48,9 @@ public class CommandReset extends CommandBase implements IOpisCommand { icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(String.format("\u00A7oInternal data reseted."))); - PacketDispatcher.sendPacketToAllPlayers(NetDataCommand.create(Message.CLIENT_CLEAR_SELECTION)); + //PacketDispatcher.sendPacketToAllPlayers(NetDataCommand.create(Message.CLIENT_CLEAR_SELECTION)); + if (icommandsender instanceof Player) + OpisPacketHandler.validateAndSend(NetDataCommand.create(Message.CLIENT_CLEAR_SELECTION), (Player)icommandsender); } @Override diff --git a/mcp/mobius/opis/data/managers/ChunkManager.java b/mcp/mobius/opis/data/managers/ChunkManager.java index 05ac992..2ad8d73 100644 --- a/mcp/mobius/opis/data/managers/ChunkManager.java +++ b/mcp/mobius/opis/data/managers/ChunkManager.java @@ -35,8 +35,8 @@ public class ChunkManager implements IMessageHandler{ private HashMap chunkMeanTime = new HashMap(); public ArrayList tickets = new ArrayList(); - public void setLoadedChunks(ArrayList data){ - chunksLoad.clear(); + public void addLoadedChunks(ArrayList data){ + //chunksLoad.clear(); for (ISerializable chunk : data){ chunksLoad.add((CoordinatesChunk)chunk); } @@ -144,9 +144,13 @@ public class ChunkManager implements IMessageHandler{ break; } case LIST_CHUNK_LOADED:{ - this.setLoadedChunks(rawdata.array); + this.addLoadedChunks(rawdata.array); break; } + case LIST_CHUNK_LOADED_CLEAR:{ + chunksLoad.clear(); + break; + } default: return false; } diff --git a/mcp/mobius/opis/events/OpisServerTickHandler.java b/mcp/mobius/opis/events/OpisServerTickHandler.java index 0404d13..0d24209 100644 --- a/mcp/mobius/opis/events/OpisServerTickHandler.java +++ b/mcp/mobius/opis/events/OpisServerTickHandler.java @@ -34,6 +34,7 @@ import mcp.mobius.opis.data.server.TickProfiler; import mcp.mobius.opis.gui.overlay.OverlayStatus; import mcp.mobius.opis.network.OpisPacketHandler; import mcp.mobius.opis.network.enums.Message; +import mcp.mobius.opis.network.packets.server.NetDataCommand; import mcp.mobius.opis.network.packets.server.NetDataList; import mcp.mobius.opis.network.packets.server.NetDataValue; import cpw.mods.fml.common.ITickHandler; @@ -160,7 +161,10 @@ public class OpisServerTickHandler implements ITickHandler { for (Player player : PlayerTracker.instance().playerOverlayStatus.keySet()){ if (PlayerTracker.instance().playerOverlayStatus.get(player) == OverlayStatus.CHUNKSTATUS){ - OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_CHUNK_LOADED, ChunkManager.instance().getLoadedChunks(PlayerTracker.instance().playerDimension.get(player))), player); + OpisPacketHandler.validateAndSend(NetDataCommand.create(Message.LIST_CHUNK_LOADED_CLEAR), player); + OpisPacketHandler.splitAndSend(Message.LIST_CHUNK_LOADED, ChunkManager.instance().getLoadedChunks(PlayerTracker.instance().playerDimension.get(player)), player); + + //OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_CHUNK_LOADED, ChunkManager.instance().getLoadedChunks(PlayerTracker.instance().playerDimension.get(player))), player); } diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index 1add8a5..21c4b00 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -183,12 +183,14 @@ public class OpisPacketHandler implements IPacketHandler { OpisPacketHandler.validateAndSend(capsule, player); } - /* - public static void sendPacketToAllSwing(Packet250CustomPayload packet){ - for (Player player : PlayerTracker.instance().playersSwing) - PacketDispatcher.sendPacketToPlayer(packet, player); + public static void splitAndSend(Message msg, ArrayList data, Player player){ + int i = 0; + while (i < data.size()){ + validateAndSend(NetDataList.create(msg, data.subList(i, Math.min(i + 500, data.size()))), player); + i += 500; + } + } - */ public static void sendChatMsg(String msg, Player player){ PacketDispatcher.sendPacketToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(msg)), player); diff --git a/mcp/mobius/opis/network/ServerMessageHandler.java b/mcp/mobius/opis/network/ServerMessageHandler.java index 6190fa7..45a0f20 100644 --- a/mcp/mobius/opis/network/ServerMessageHandler.java +++ b/mcp/mobius/opis/network/ServerMessageHandler.java @@ -38,6 +38,7 @@ import mcp.mobius.opis.data.server.WorldTickProfiler; import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.gui.overlay.OverlayStatus; import mcp.mobius.opis.network.enums.Message; +import mcp.mobius.opis.network.packets.server.NetDataCommand; import mcp.mobius.opis.network.packets.server.NetDataList; import mcp.mobius.opis.network.packets.server.Packet_DataOverlayChunkEntities; import mcp.mobius.opis.network.packets.server.NetDataValue; @@ -77,7 +78,8 @@ public class ServerMessageHandler { else if (maintype == Message.LIST_CHUNK_LOADED){ PlayerTracker.instance().playerOverlayStatus.put(player, OverlayStatus.CHUNKSTATUS); PlayerTracker.instance().playerDimension.put(player, ((SerialInt)param1).value); - OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_CHUNK_LOADED, ChunkManager.instance().getLoadedChunks(((SerialInt)param1).value)), player); + OpisPacketHandler.validateAndSend(NetDataCommand.create(Message.LIST_CHUNK_LOADED_CLEAR), player); + OpisPacketHandler.splitAndSend(Message.LIST_CHUNK_LOADED, ChunkManager.instance().getLoadedChunks(((SerialInt)param1).value), player); } else if (maintype == Message.LIST_CHUNK_TICKETS){ diff --git a/mcp/mobius/opis/network/enums/Message.java b/mcp/mobius/opis/network/enums/Message.java index 82e0b8e..b975dfb 100644 --- a/mcp/mobius/opis/network/enums/Message.java +++ b/mcp/mobius/opis/network/enums/Message.java @@ -9,6 +9,7 @@ public enum Message { LIST_CHUNK_TILEENTS, LIST_CHUNK_ENTITIES, LIST_CHUNK_LOADED, + LIST_CHUNK_LOADED_CLEAR, LIST_CHUNK_TICKETS, LIST_TIMING_TILEENTS, LIST_TIMING_ENTITIES, diff --git a/mcp/mobius/opis/network/packets/server/NetDataCommand.java b/mcp/mobius/opis/network/packets/server/NetDataCommand.java index a7a676e..67de294 100644 --- a/mcp/mobius/opis/network/packets/server/NetDataCommand.java +++ b/mcp/mobius/opis/network/packets/server/NetDataCommand.java @@ -12,6 +12,8 @@ import net.minecraft.network.packet.Packet250CustomPayload; public class NetDataCommand extends NetDataRaw{ + public NetDataCommand(){}; + public NetDataCommand(Packet250CustomPayload packet) { DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); try{ @@ -21,7 +23,7 @@ public class NetDataCommand extends NetDataRaw{ } - public static Packet250CustomPayload create(Message msg){ + public static NetDataCommand create(Message msg){ Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); @@ -35,7 +37,12 @@ public class NetDataCommand extends NetDataRaw{ packet.data = bos.toByteArray(); packet.length = bos.size(); - return packet; + NetDataCommand capsule = new NetDataCommand(); + capsule.msg = msg; + capsule.header = Packets.NETDATACOMMAND; + capsule.packet = packet; + + return capsule; } } diff --git a/mcp/mobius/opis/network/packets/server/NetDataList.java b/mcp/mobius/opis/network/packets/server/NetDataList.java index 09c2133..b82c647 100644 --- a/mcp/mobius/opis/network/packets/server/NetDataList.java +++ b/mcp/mobius/opis/network/packets/server/NetDataList.java @@ -7,6 +7,7 @@ import java.io.DataOutputStream; import java.io.IOException; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.List; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.holders.basetypes.AmountHolder; @@ -60,7 +61,7 @@ public class NetDataList extends NetDataRaw{ */ //public static Packet250Metadata create(DataReq dataReq, ArrayList stats){ - public static NetDataList create(Message msg, ArrayList data){ + public static NetDataList create(Message msg, List data){ //Packet250Metadata packet = new Packet250Metadata(); Packet250CustomPayload packet = new Packet250CustomPayload(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); diff --git a/mcp/mobius/opis/proxy/ProxyClient.java b/mcp/mobius/opis/proxy/ProxyClient.java index 3c71739..8e014db 100644 --- a/mcp/mobius/opis/proxy/ProxyClient.java +++ b/mcp/mobius/opis/proxy/ProxyClient.java @@ -114,6 +114,7 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{ MessageHandlerRegistrar.instance().registerHandler(Message.LIST_TIMING_CHUNK, ChunkManager.instance()); MessageHandlerRegistrar.instance().registerHandler(Message.LIST_CHUNK_LOADED, ChunkManager.instance()); + MessageHandlerRegistrar.instance().registerHandler(Message.LIST_CHUNK_LOADED_CLEAR, ChunkManager.instance()); } @Override