mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-22 13:09:53 +00:00
Loaded chunks sending is now splitted in 500 chunks packets to prevent overloading the 250.
A "clear array" is sent prior to the data and data is cumulativly added to the array.
This commit is contained in:
1 parent
7f5491ece1
commit
a732947920
12 files changed
+52
-17
No files matched your search
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -35,8 +35,8 @@ public class ChunkManager implements IMessageHandler{
|
||||
private HashMap<CoordinatesChunk, StatsChunk> chunkMeanTime = new HashMap<CoordinatesChunk, StatsChunk>();
|
||||
public ArrayList<TicketData> tickets = new ArrayList<TicketData>();
|
||||
|
||||
public void setLoadedChunks(ArrayList<ISerializable> data){
|
||||
chunksLoad.clear();
|
||||
public void addLoadedChunks(ArrayList<ISerializable> 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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -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<? extends ISerializable> 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);
|
||||
|
||||
@@ -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){
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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<? extends ISerializable> stats){
|
||||
public static NetDataList create(Message msg, ArrayList<? extends ISerializable> data){
|
||||
public static NetDataList create(Message msg, List<? extends ISerializable> data){
|
||||
//Packet250Metadata packet = new Packet250Metadata();
|
||||
Packet250CustomPayload packet = new Packet250CustomPayload();
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user