mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-20 12:19:50 +00:00
Moved PacketTickets to a NetDataList packet.
This commit is contained in:
1 parent
4e38b42796
commit
c5744d7e6f
5 files changed
+38
-68
No files matched your search
@@ -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<IMwChunkOverlay> getChunksOverlay(int dim, double centerX, double centerZ, double minX, double minZ, double maxX, double maxZ) {
|
||||
ArrayList<IMwChunkOverlay> overlays = new ArrayList<IMwChunkOverlay>();
|
||||
@@ -229,7 +228,7 @@ public class OverlayLoadedChunks implements IMwDataProvider {
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void setupTable(HashSet<TicketData> tickets){
|
||||
public void setupTable(ArrayList<TicketData> 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<TicketData> arr = new ArrayList<TicketData>();
|
||||
for (ISerializable s : rawdata.array)
|
||||
arr.add((TicketData)s);
|
||||
|
||||
this.setupTable(arr);
|
||||
|
||||
break;
|
||||
}
|
||||
default:
|
||||
return false;
|
||||
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -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<PacketBase>
|
||||
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));
|
||||
}
|
||||
|
||||
@@ -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<TicketData>(ChunkManager.INSTANCE.getTickets())), player);
|
||||
}
|
||||
|
||||
else if (maintype == Message.LIST_TIMING_TILEENTS){
|
||||
|
||||
@@ -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<TicketData> tickets = new HashSet<TicketData>();
|
||||
|
||||
public PacketTickets(){}
|
||||
public PacketTickets(HashSet<TicketData> 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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user