mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-21 04:32:28 +00:00
Moved the PacketDataOverlayChunkEntities to the DataNetList.
This commit is contained in:
1 parent
4772fa14ad
commit
50d0d917da
7 files changed
+54
-65
No files matched your search
@@ -22,6 +22,7 @@ import mcp.mobius.opis.data.holders.newtypes.DataByteSize;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataBlockRender;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataBlockTick;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataChunk;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataChunkEntities;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataDimension;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntityPerClass;
|
||||
@@ -63,6 +64,7 @@ public enum DataType {
|
||||
DATABLOCKTILEENTITY (DataBlockTileEntity.class),
|
||||
DATABLOCKTILEENTITYPERCLASS (DataBlockTileEntityPerClass.class),
|
||||
DATACHUNK (DataChunk.class),
|
||||
DATACHUNKENTITIES (DataChunkEntities.class),
|
||||
DATADIMENSION (DataDimension.class),
|
||||
DATAENTITY (DataEntity.class),
|
||||
DATAENTITYPERCLASS (DataEntityPerClass.class),
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
package mcp.mobius.opis.data.holders.newtypes;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
import com.google.common.io.ByteArrayDataOutput;
|
||||
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.managers.EntityManager;
|
||||
import mcp.mobius.opis.data.managers.TileEntityManager;
|
||||
|
||||
public class DataChunkEntities implements ISerializable{
|
||||
|
||||
public int entities;
|
||||
public CoordinatesChunk chunk;
|
||||
|
||||
public DataChunkEntities(CoordinatesChunk chunk, int entities){
|
||||
this.chunk = chunk;
|
||||
this.entities = entities;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToStream(ByteArrayDataOutput stream){
|
||||
this.chunk.writeToStream(stream);
|
||||
stream.writeInt(this.entities);
|
||||
}
|
||||
|
||||
public static DataChunkEntities readFromStream(ByteArrayDataInput stream){
|
||||
DataChunkEntities retVal = new DataChunkEntities(CoordinatesChunk.readFromStream(stream), stream.readInt());
|
||||
return retVal;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -17,6 +17,7 @@ import mcp.mobius.opis.api.IMessageHandler;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataChunkEntities;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.gui.events.MouseEvent;
|
||||
import mcp.mobius.opis.gui.interfaces.CType;
|
||||
@@ -285,6 +286,16 @@ public enum OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler {
|
||||
this.setupEntTable();
|
||||
break;
|
||||
}
|
||||
case OVERLAY_CHUNK_ENTITIES:{
|
||||
HashMap<CoordinatesChunk, Integer> chunkStatus = new HashMap<CoordinatesChunk, Integer>();
|
||||
for (ISerializable s : rawdata.array){
|
||||
chunkStatus.put(((DataChunkEntities)s).chunk, ((DataChunkEntities)s).entities);
|
||||
}
|
||||
this.overlayData = chunkStatus;
|
||||
this.reduceData();
|
||||
this.setupChunkTable();
|
||||
}
|
||||
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -52,7 +52,6 @@ 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 mcp.mobius.opis.network.packets.server.PacketChunks;
|
||||
import mcp.mobius.opis.network.packets.server.PacketDataOverlayChunkEntities;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
@@ -88,7 +87,6 @@ public class PacketManager extends FMLIndexedMessageToMessageCodec<PacketBase>
|
||||
INSTANCE.addDiscriminator(3, NetDataList.class);
|
||||
INSTANCE.addDiscriminator(4, NetDataValue.class);
|
||||
INSTANCE.addDiscriminator(5, PacketChunks.class);
|
||||
INSTANCE.addDiscriminator(6, PacketDataOverlayChunkEntities.class);
|
||||
|
||||
channels.putAll(NetworkRegistry.INSTANCE.newChannel("Opis", INSTANCE));
|
||||
}
|
||||
|
||||
@@ -25,6 +25,7 @@ import mcp.mobius.opis.data.holders.basetypes.SerialLong;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialString;
|
||||
import mcp.mobius.opis.data.holders.basetypes.TargetEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataBlockTick;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataChunkEntities;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
@@ -39,7 +40,6 @@ 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 mcp.mobius.opis.network.packets.server.PacketDataOverlayChunkEntities;
|
||||
import mcp.mobius.opis.swing.SelectedTab;
|
||||
import mcp.mobius.opis.data.holders.basetypes.TicketData;
|
||||
|
||||
@@ -238,12 +238,13 @@ public class ServerMessageHandler {
|
||||
public void handleOverlayChunkEntities(CoordinatesChunk coord, EntityPlayerMP player){
|
||||
|
||||
HashMap<CoordinatesChunk, ArrayList<DataEntity>> entities = EntityManager.INSTANCE.getAllEntitiesPerChunk();
|
||||
HashMap<CoordinatesChunk, Integer> perChunk = new HashMap<CoordinatesChunk, Integer>();
|
||||
//HashMap<CoordinatesChunk, Integer> perChunk = new HashMap<CoordinatesChunk, Integer>();
|
||||
ArrayList<DataChunkEntities> perChunk = new ArrayList<DataChunkEntities>();
|
||||
|
||||
for (CoordinatesChunk chunk : entities.keySet())
|
||||
perChunk.put(chunk, entities.get(chunk).size());
|
||||
perChunk.add(new DataChunkEntities(chunk, entities.get(chunk).size()));
|
||||
|
||||
PacketManager.sendToPlayer(new PacketDataOverlayChunkEntities(perChunk), player);
|
||||
PacketManager.validateAndSend(new NetDataList(Message.OVERLAY_CHUNK_ENTITIES, perChunk), player);
|
||||
}
|
||||
|
||||
}
|
||||
-57
@@ -1,57 +0,0 @@
|
||||
package mcp.mobius.opis.network.packets.server;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
import com.google.common.io.ByteArrayDataOutput;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.gui.overlay.OverlayLoadedChunks;
|
||||
import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk;
|
||||
import mcp.mobius.opis.network.PacketBase;
|
||||
|
||||
public class PacketDataOverlayChunkEntities extends PacketBase {
|
||||
|
||||
public HashMap<CoordinatesChunk, Integer> chunkStatus = new HashMap<CoordinatesChunk, Integer>();
|
||||
|
||||
public PacketDataOverlayChunkEntities(){}
|
||||
public PacketDataOverlayChunkEntities(HashMap<CoordinatesChunk, Integer> chunks){
|
||||
this.chunkStatus = chunks;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void encode(ByteArrayDataOutput output) {
|
||||
/*
|
||||
output.writeInt(chunkStatus.size());
|
||||
for (CoordinatesChunk chunk : chunkStatus.keySet()){
|
||||
chunk.writeToStream(output);
|
||||
output.writeInt(chunkStatus.get(chunk));
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
@Override
|
||||
public void decode(ByteArrayDataInput input) {
|
||||
/*
|
||||
int nchunks = input.readInt();
|
||||
|
||||
for (int i = 0; i <= nchunks; i++){
|
||||
CoordinatesChunk chunk = CoordinatesChunk.readFromStream(input);
|
||||
this.chunkStatus.put(chunk, input.readInt());
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void actionClient(World world, EntityPlayer player){
|
||||
OverlayEntityPerChunk.INSTANCE.overlayData = this.chunkStatus;
|
||||
OverlayEntityPerChunk.INSTANCE.reduceData();
|
||||
OverlayEntityPerChunk.INSTANCE.setupChunkTable();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -192,8 +192,8 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.CLIENT_START_PROFILING, modOpis.proxy);
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.CLIENT_SHOW_RENDER_TICK, modOpis.proxy);
|
||||
|
||||
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_ENTITIES, OverlayEntityPerChunk.INSTANCE);
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.OVERLAY_CHUNK_ENTITIES, OverlayEntityPerChunk.INSTANCE);
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_ENTITIES, OverlayEntityPerChunk.INSTANCE);
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_TICKETS, OverlayLoadedChunks.INSTANCE);
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_TILEENTS, OverlayMeanTime.INSTANCE);
|
||||
|
||||
|
||||
Reference in new issue
Block a user