mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-17 02:55:20 +00:00
Ticket request is now handled by a Req package.
This commit is contained in:
1 parent
6a7d6f0d73
commit
1925d6f47d
5 files changed
+9
-53
No files matched your search
@@ -31,6 +31,7 @@ import mcp.mobius.opis.network.server.Packet_DataList;
|
||||
import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_LoadedChunks;
|
||||
import mcp.mobius.opis.network.server.Packet_MeanTime;
|
||||
import mcp.mobius.opis.network.server.Packet_Tickets;
|
||||
import mcp.mobius.opis.overlay.OverlayStatus;
|
||||
import mcp.mobius.opis.server.PlayerTracker;
|
||||
|
||||
@@ -71,6 +72,10 @@ public class DataReqHandler {
|
||||
PlayerTracker.instance().playerDimension.put(player, ((SerializableInt)param1).value);
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_LoadedChunks.create(ChunkManager.getLoadedChunks(((SerializableInt)param1).value)), player);
|
||||
}
|
||||
|
||||
else if ((maintype == DataReq.LIST) && (subtype == DataReq.CHUNK) && (target == DataReq.TICKETS)){
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_Tickets.create(ChunkManager.getTickets()), player);
|
||||
}
|
||||
|
||||
else if ((maintype == DataReq.LIST) && (subtype == DataReq.TIMING) && (target == DataReq.TILETENTS)){
|
||||
ArrayList<TileEntityStats> timingTileEnts = TileEntityManager.getTopEntities(100);
|
||||
|
||||
@@ -18,7 +18,6 @@ import mcp.mobius.opis.data.managers.EntityManager;
|
||||
import mcp.mobius.opis.data.managers.TileEntityManager;
|
||||
import mcp.mobius.opis.network.client.Packet_ReqChunks;
|
||||
import mcp.mobius.opis.network.client.Packet_ReqData;
|
||||
import mcp.mobius.opis.network.client.Packet_ReqTickets;
|
||||
import mcp.mobius.opis.network.enums.DataReq;
|
||||
import mcp.mobius.opis.network.server.Packet_Chunks;
|
||||
import mcp.mobius.opis.network.server.Packet_ClientCommand;
|
||||
@@ -143,14 +142,7 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
}
|
||||
|
||||
void onPacketToServer(INetworkManager manager, Packet250CustomPayload packet, Player player, Byte header) {
|
||||
if (header == Packets.REQ_TICKETS){
|
||||
Packet_ReqTickets castedPacket = new Packet_ReqTickets(packet);
|
||||
if (this.isOp(player)){
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_Tickets.create(ChunkManager.getTickets()), player);
|
||||
}
|
||||
}
|
||||
|
||||
else if (header == Packets.REQ_CHUNKS){
|
||||
if (header == Packets.REQ_CHUNKS){
|
||||
Packet_ReqChunks castedPacket = new Packet_ReqChunks(packet);
|
||||
if (this.isOp(player)){
|
||||
ArrayList<Chunk> list = new ArrayList();
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
package mcp.mobius.opis.network.client;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import mcp.mobius.opis.network.Packets;
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
|
||||
public class Packet_ReqTickets {
|
||||
|
||||
public byte header;
|
||||
|
||||
public Packet_ReqTickets(Packet250CustomPayload packet) {
|
||||
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
|
||||
|
||||
try{
|
||||
this.header = inputStream.readByte();
|
||||
} catch (IOException e){}
|
||||
}
|
||||
|
||||
public static Packet250CustomPayload create(){
|
||||
Packet250CustomPayload packet = new Packet250CustomPayload();
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
|
||||
DataOutputStream outputStream = new DataOutputStream(bos);
|
||||
|
||||
try{
|
||||
outputStream.writeByte(Packets.REQ_TICKETS);
|
||||
}catch(IOException e){}
|
||||
|
||||
packet.channel = "Opis";
|
||||
packet.data = bos.toByteArray();
|
||||
packet.length = bos.size();
|
||||
|
||||
return packet;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -28,7 +28,8 @@ public enum DataReq {
|
||||
HANDLERS("handlers"),
|
||||
TRUE("true"),
|
||||
FALSE("false"),
|
||||
LOADED("loaded");
|
||||
LOADED("loaded"),
|
||||
TICKETS("tickets");
|
||||
|
||||
private String text;
|
||||
|
||||
|
||||
@@ -33,7 +33,6 @@ import mcp.mobius.opis.gui.widgets.tableview.TableRow;
|
||||
import mcp.mobius.opis.gui.widgets.tableview.ViewTable;
|
||||
import mcp.mobius.opis.network.client.Packet_ReqChunks;
|
||||
import mcp.mobius.opis.network.client.Packet_ReqData;
|
||||
import mcp.mobius.opis.network.client.Packet_ReqTickets;
|
||||
import mcp.mobius.opis.network.enums.DataReq;
|
||||
|
||||
public class OverlayLoadedChunks implements IMwDataProvider {
|
||||
@@ -202,7 +201,7 @@ public class OverlayLoadedChunks implements IMwDataProvider {
|
||||
public void onOverlayActivated(MapView mapview) {
|
||||
this.selectedChunk = null;
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.LIST, DataReq.CHUNK, DataReq.LOADED, new SerializableInt(mapview.getDimension())));
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqTickets.create());
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.LIST, DataReq.CHUNK, DataReq.TICKETS));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user