diff --git a/mcp/mobius/opis/network/DataReqHandler.java b/mcp/mobius/opis/network/DataReqHandler.java index e5a2eac..135a2a3 100644 --- a/mcp/mobius/opis/network/DataReqHandler.java +++ b/mcp/mobius/opis/network/DataReqHandler.java @@ -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 timingTileEnts = TileEntityManager.getTopEntities(100); diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index 745b0d2..4a5c971 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -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 list = new ArrayList(); diff --git a/mcp/mobius/opis/network/client/Packet_ReqTickets.java b/mcp/mobius/opis/network/client/Packet_ReqTickets.java deleted file mode 100644 index 9a0bc3d..0000000 --- a/mcp/mobius/opis/network/client/Packet_ReqTickets.java +++ /dev/null @@ -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; - } - - -} diff --git a/mcp/mobius/opis/network/enums/DataReq.java b/mcp/mobius/opis/network/enums/DataReq.java index d6c88ea..891e52d 100644 --- a/mcp/mobius/opis/network/enums/DataReq.java +++ b/mcp/mobius/opis/network/enums/DataReq.java @@ -28,7 +28,8 @@ public enum DataReq { HANDLERS("handlers"), TRUE("true"), FALSE("false"), - LOADED("loaded"); + LOADED("loaded"), + TICKETS("tickets"); private String text; diff --git a/mcp/mobius/opis/overlay/OverlayLoadedChunks.java b/mcp/mobius/opis/overlay/OverlayLoadedChunks.java index ebc2625..7e71caf 100644 --- a/mcp/mobius/opis/overlay/OverlayLoadedChunks.java +++ b/mcp/mobius/opis/overlay/OverlayLoadedChunks.java @@ -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