From c5744d7e6f3c9ade22e0ecfea9e1dd39d63766bd Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Mon, 12 May 2014 20:28:54 +0200 Subject: [PATCH] Moved PacketTickets to a NetDataList packet. --- .../opis/gui/overlay/OverlayLoadedChunks.java | 42 +++++++++++----- .../mobius/opis/network/PacketManager.java | 4 +- .../opis/network/ServerMessageHandler.java | 5 +- .../network/packets/server/PacketTickets.java | 49 ------------------- .../mcp/mobius/opis/proxy/ProxyClient.java | 6 ++- 5 files changed, 38 insertions(+), 68 deletions(-) delete mode 100644 src/main/java/mcp/mobius/opis/network/packets/server/PacketTickets.java diff --git a/src/main/java/mcp/mobius/opis/gui/overlay/OverlayLoadedChunks.java b/src/main/java/mcp/mobius/opis/gui/overlay/OverlayLoadedChunks.java index 1600a18..460ceb4 100644 --- a/src/main/java/mcp/mobius/opis/gui/overlay/OverlayLoadedChunks.java +++ b/src/main/java/mcp/mobius/opis/gui/overlay/OverlayLoadedChunks.java @@ -5,6 +5,8 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Set; +import javax.swing.table.DefaultTableModel; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; @@ -15,10 +17,13 @@ import mapwriter.api.IMwChunkOverlay; import mapwriter.api.IMwDataProvider; import mapwriter.map.MapView; import mapwriter.map.mapmode.MapMode; +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.basetypes.SerialInt; import mcp.mobius.opis.data.holders.basetypes.TicketData; +import mcp.mobius.opis.data.holders.stats.StatsChunk; import mcp.mobius.opis.data.managers.ChunkManager; import mcp.mobius.opis.gui.events.MouseEvent; import mcp.mobius.opis.gui.interfaces.CType; @@ -29,13 +34,16 @@ import mcp.mobius.opis.gui.widgets.LayoutCanvas; import mcp.mobius.opis.gui.widgets.WidgetGeometry; import mcp.mobius.opis.gui.widgets.tableview.TableRow; import mcp.mobius.opis.gui.widgets.tableview.ViewTable; +import mcp.mobius.opis.network.PacketBase; import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.PacketReqChunks; import mcp.mobius.opis.network.packets.client.PacketReqData; +import mcp.mobius.opis.swing.widgets.JTableStats; -public class OverlayLoadedChunks implements IMwDataProvider { - +public enum OverlayLoadedChunks implements IMwDataProvider, IMessageHandler { + INSTANCE; + public class TicketTable extends ViewTable{ MapView mapView; MapMode mapMode; @@ -105,18 +113,9 @@ public class OverlayLoadedChunks implements IMwDataProvider { //private OverlayLoadedChunks(){}; CoordinatesChunk selectedChunk = null; - private static OverlayLoadedChunks _instance; public boolean showList = false; public LayoutCanvas canvas = null; - private OverlayLoadedChunks(){} - - public static OverlayLoadedChunks instance(){ - if(_instance == null) - _instance = new OverlayLoadedChunks(); - return _instance; - } - @Override public ArrayList getChunksOverlay(int dim, double centerX, double centerZ, double minX, double minZ, double maxX, double maxZ) { ArrayList overlays = new ArrayList(); @@ -229,7 +228,7 @@ public class OverlayLoadedChunks implements IMwDataProvider { } @SideOnly(Side.CLIENT) - public void setupTable(HashSet tickets){ + public void setupTable(ArrayList tickets){ if (this.canvas == null) this.canvas = new LayoutCanvas(); @@ -265,4 +264,23 @@ public class OverlayLoadedChunks implements IMwDataProvider { } return false; } + + @Override + public boolean handleMessage(Message msg, PacketBase rawdata) { + switch(msg){ + case LIST_CHUNK_TICKETS:{ + ArrayList arr = new ArrayList(); + for (ISerializable s : rawdata.array) + arr.add((TicketData)s); + + this.setupTable(arr); + + break; + } + default: + return false; + + } + return true; + } } diff --git a/src/main/java/mcp/mobius/opis/network/PacketManager.java b/src/main/java/mcp/mobius/opis/network/PacketManager.java index 50ed9ee..ed8a993 100644 --- a/src/main/java/mcp/mobius/opis/network/PacketManager.java +++ b/src/main/java/mcp/mobius/opis/network/PacketManager.java @@ -53,7 +53,6 @@ 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 mcp.mobius.opis.network.packets.server.PacketTickets; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -89,8 +88,7 @@ public class PacketManager extends FMLIndexedMessageToMessageCodec INSTANCE.addDiscriminator(3, NetDataList.class); INSTANCE.addDiscriminator(4, NetDataValue.class); INSTANCE.addDiscriminator(5, PacketChunks.class); - INSTANCE.addDiscriminator(6, PacketTickets.class); - INSTANCE.addDiscriminator(7, PacketDataOverlayChunkEntities.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 dd56a82..f82159c 100644 --- a/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java +++ b/src/main/java/mcp/mobius/opis/network/ServerMessageHandler.java @@ -40,8 +40,8 @@ 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.network.packets.server.PacketTickets; import mcp.mobius.opis.swing.SelectedTab; +import mcp.mobius.opis.data.holders.basetypes.TicketData; public class ServerMessageHandler { @@ -82,7 +82,8 @@ public class ServerMessageHandler { } else if (maintype == Message.LIST_CHUNK_TICKETS){ - PacketManager.sendToPlayer(new PacketTickets(ChunkManager.INSTANCE.getTickets()), player); + //PacketManager.sendToPlayer(new PacketTickets(ChunkManager.INSTANCE.getTickets()), player); + PacketManager.validateAndSend(new NetDataList(Message.LIST_CHUNK_TICKETS, new ArrayList(ChunkManager.INSTANCE.getTickets())), player); } else if (maintype == Message.LIST_TIMING_TILEENTS){ diff --git a/src/main/java/mcp/mobius/opis/network/packets/server/PacketTickets.java b/src/main/java/mcp/mobius/opis/network/packets/server/PacketTickets.java deleted file mode 100644 index fe75fd1..0000000 --- a/src/main/java/mcp/mobius/opis/network/packets/server/PacketTickets.java +++ /dev/null @@ -1,49 +0,0 @@ -package mcp.mobius.opis.network.packets.server; - -import java.util.HashSet; - -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.api.MessageHandlerRegistrar; -import mcp.mobius.opis.data.holders.basetypes.TicketData; -import mcp.mobius.opis.gui.overlay.OverlayLoadedChunks; -import mcp.mobius.opis.network.PacketBase; - -public class PacketTickets extends PacketBase { - - public HashSet tickets = new HashSet(); - - public PacketTickets(){} - public PacketTickets(HashSet data){ - this.tickets = data; - } - - @Override - public void encode(ByteArrayDataOutput output) { - output.writeInt(tickets.size()); - for (TicketData ticket : tickets) - ticket.writeToStream(output); - - } - - @Override - public void decode(ByteArrayDataInput input) { - int ntickets = input.readInt(); - - for (int i = 0; i < ntickets; i++) - tickets.add(TicketData.readFromStream(input)); - - } - - @SideOnly(Side.CLIENT) - public void actionClient(World world, EntityPlayer player){ - OverlayLoadedChunks.instance().setupTable(this.tickets); - } - -} diff --git a/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java b/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java index 98290e9..4ebd5ed 100644 --- a/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java +++ b/src/main/java/mcp/mobius/opis/proxy/ProxyClient.java @@ -60,7 +60,7 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{ @Override public void init(){ //MwAPI.registerDataProvider("Loaded chunks", OverlayLoadedChunks.instance); - MwAPI.registerDataProvider("Loaded chunks", OverlayLoadedChunks.instance()); + MwAPI.registerDataProvider("Loaded chunks", OverlayLoadedChunks.INSTANCE); MwAPI.registerDataProvider("Mean time", OverlayMeanTime.instance()); MwAPI.registerDataProvider("Ent per chunk", OverlayEntityPerChunk.instance()); @@ -201,7 +201,9 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{ MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_LOADED_CLEAR, ChunkManager.INSTANCE); MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_STRINGUPD, StringCache.INSTANCE); - MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_STRINGUPD_FULL, StringCache.INSTANCE); + MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_STRINGUPD_FULL, StringCache.INSTANCE); + + MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_TICKETS, OverlayLoadedChunks.INSTANCE); } @Override