From 50d0d917da393149b3b0ca6e76584f6df1fabd5d Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Mon, 12 May 2014 21:32:39 +0200 Subject: [PATCH] Moved the PacketDataOverlayChunkEntities to the DataNetList. --- .../mobius/opis/data/holders/DataType.java | 2 + .../holders/newtypes/DataChunkEntities.java | 34 +++++++++++ .../entperchunk/OverlayEntityPerChunk.java | 11 ++++ .../mobius/opis/network/PacketManager.java | 2 - .../opis/network/ServerMessageHandler.java | 9 +-- .../PacketDataOverlayChunkEntities.java | 57 ------------------- .../mcp/mobius/opis/proxy/ProxyClient.java | 4 +- 7 files changed, 54 insertions(+), 65 deletions(-) create mode 100644 src/main/java/mcp/mobius/opis/data/holders/newtypes/DataChunkEntities.java delete mode 100644 src/main/java/mcp/mobius/opis/network/packets/server/PacketDataOverlayChunkEntities.java diff --git a/src/main/java/mcp/mobius/opis/data/holders/DataType.java b/src/main/java/mcp/mobius/opis/data/holders/DataType.java index c3a937b..028e5fa 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/DataType.java +++ b/src/main/java/mcp/mobius/opis/data/holders/DataType.java @@ -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), diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataChunkEntities.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataChunkEntities.java new file mode 100644 index 0000000..5bcd570 --- /dev/null +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataChunkEntities.java @@ -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; + } + +} diff --git a/src/main/java/mcp/mobius/opis/gui/overlay/entperchunk/OverlayEntityPerChunk.java b/src/main/java/mcp/mobius/opis/gui/overlay/entperchunk/OverlayEntityPerChunk.java index bd02f46..a2ef634 100644 --- a/src/main/java/mcp/mobius/opis/gui/overlay/entperchunk/OverlayEntityPerChunk.java +++ b/src/main/java/mcp/mobius/opis/gui/overlay/entperchunk/OverlayEntityPerChunk.java @@ -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 chunkStatus = new HashMap(); + for (ISerializable s : rawdata.array){ + chunkStatus.put(((DataChunkEntities)s).chunk, ((DataChunkEntities)s).entities); + } + this.overlayData = chunkStatus; + this.reduceData(); + this.setupChunkTable(); + } + default: return false; } diff --git a/src/main/java/mcp/mobius/opis/network/PacketManager.java b/src/main/java/mcp/mobius/opis/network/PacketManager.java index ed8a993..5bbf0f7 100644 --- a/src/main/java/mcp/mobius/opis/network/PacketManager.java +++ b/src/main/java/mcp/mobius/opis/network/PacketManager.java @@ -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 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)); } diff --git a/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java b/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java index f82159c..55b245d 100644 --- a/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java +++ b/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java @@ -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> entities = EntityManager.INSTANCE.getAllEntitiesPerChunk(); - HashMap perChunk = new HashMap(); + //HashMap perChunk = new HashMap(); + ArrayList perChunk = new ArrayList(); 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); } } diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/PacketDataOverlayChunkEntities.java b/src/main/java/mcp/mobius/opis/network/packets/server/PacketDataOverlayChunkEntities.java deleted file mode 100644 index 719fbcb..0000000 --- a/src/main/java/mcp/mobius/opis/network/packets/server/PacketDataOverlayChunkEntities.java +++ /dev/null @@ -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 chunkStatus = new HashMap(); - - public PacketDataOverlayChunkEntities(){} - public PacketDataOverlayChunkEntities(HashMap 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(); - } - -} diff --git a/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java b/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java index 962e420..23b07ed 100644 --- a/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java +++ b/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java @@ -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);