mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-22 05:02:17 +00:00
All main screens are now pushed to Swing.
Data is still synced upon request from the corresponding command. Refactoring of packet names.
This commit is contained in:
1 parent
f5243d02c3
commit
c79c7734e8
19 files changed
+171
-107
No files matched your search
@@ -4,7 +4,7 @@ import java.util.HashMap;
|
||||
|
||||
import mcp.mobius.opis.commands.IOpisCommand;
|
||||
import mcp.mobius.opis.data.managers.EntityManager;
|
||||
import mcp.mobius.opis.network.server.Packet_DataScreenAmountEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_DataListAmountEntities;
|
||||
import net.minecraft.command.CommandBase;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -42,7 +42,7 @@ public class CommandAmountEntities extends CommandBase implements IOpisCommand{
|
||||
ents = EntityManager.getCumulativeEntities(false);
|
||||
|
||||
if (icommandsender instanceof EntityPlayer)
|
||||
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataScreenAmountEntities.create(ents));
|
||||
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataListAmountEntities.create(ents));
|
||||
else{
|
||||
for (String s : ents.keySet())
|
||||
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(String.format("%s : %s", s, ents.get(s))));
|
||||
|
||||
@@ -7,7 +7,7 @@ import java.util.HashMap;
|
||||
import mcp.mobius.opis.commands.IOpisCommand;
|
||||
import mcp.mobius.opis.data.holders.TickHandlerStats;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
import mcp.mobius.opis.network.server.Packet_DataScreenTimingHandlers;
|
||||
import mcp.mobius.opis.network.server.Packet_DataListTimingHandlers;
|
||||
import net.minecraft.command.CommandBase;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
@@ -39,7 +39,7 @@ public class CommandHandler extends CommandBase implements IOpisCommand {
|
||||
//((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataScreenTimingHandlers.create(stats));
|
||||
|
||||
if (icommandsender instanceof EntityPlayerMP)
|
||||
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataScreenTimingHandlers.create(stats));
|
||||
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataListTimingHandlers.create(stats));
|
||||
else{
|
||||
for (TickHandlerStats s : stats)
|
||||
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(String.format("%s : %.2f", s.getName(), s.getGeometricMean())));
|
||||
|
||||
@@ -7,7 +7,7 @@ import mcp.mobius.opis.commands.IOpisCommand;
|
||||
import mcp.mobius.opis.data.holders.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.EntityStats;
|
||||
import mcp.mobius.opis.data.managers.EntityManager;
|
||||
import mcp.mobius.opis.network.server.Packet_DataScreenTimingEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_DataListTimingEntities;
|
||||
import net.minecraft.command.CommandBase;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -38,7 +38,7 @@ public class CommandTimingEntities extends CommandBase implements IOpisCommand {
|
||||
public void processCommand(ICommandSender icommandsender, String[] astring) {
|
||||
ArrayList<EntityStats> ents = new ArrayList<EntityStats>();
|
||||
if (astring.length == 0){
|
||||
ents = EntityManager.getTopEntities(20);
|
||||
ents = EntityManager.getTopEntities(100);
|
||||
}
|
||||
else{
|
||||
try{
|
||||
@@ -47,7 +47,7 @@ public class CommandTimingEntities extends CommandBase implements IOpisCommand {
|
||||
}
|
||||
|
||||
if (icommandsender instanceof EntityPlayer)
|
||||
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataScreenTimingEntities.create(ents));
|
||||
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataListTimingEntities.create(ents));
|
||||
else{
|
||||
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText("[DIM X Z] Time NTEs"));
|
||||
for (EntityStats stat : ents){
|
||||
|
||||
@@ -5,7 +5,7 @@ import java.util.ArrayList;
|
||||
import mcp.mobius.opis.commands.IOpisCommand;
|
||||
import mcp.mobius.opis.data.holders.TileEntityStats;
|
||||
import mcp.mobius.opis.data.managers.TileEntityManager;
|
||||
import mcp.mobius.opis.network.server.Packet_TileEntitiesTopList;
|
||||
import mcp.mobius.opis.network.server.Packet_DataListTimingTileEnts;
|
||||
import net.minecraft.command.CommandBase;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -45,7 +45,7 @@ public class CommandTimingTileEntities extends CommandBase implements IOpisComma
|
||||
}
|
||||
|
||||
if (icommandsender instanceof EntityPlayer)
|
||||
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_TileEntitiesTopList.create(tes));
|
||||
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataListTimingTileEnts.create(tes));
|
||||
else{
|
||||
for (TileEntityStats stat : tes){
|
||||
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(stat.toString()));
|
||||
|
||||
@@ -1,36 +1,31 @@
|
||||
package mcp.mobius.opis.data.client;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
import javax.swing.table.DefaultTableModel;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import mcp.mobius.opis.data.holders.EntityStats;
|
||||
import mcp.mobius.opis.data.holders.TickHandlerStats;
|
||||
import mcp.mobius.opis.data.holders.TileEntityStats;
|
||||
import mcp.mobius.opis.gui.swing.SwingUI;
|
||||
import mcp.mobius.opis.tools.ModIdentification;
|
||||
|
||||
public class DataCache {
|
||||
|
||||
private static DataCache _instance = new DataCache();
|
||||
public static DataCache instance() { return _instance; };
|
||||
|
||||
private HashMap<String, Integer> amountEntities = new HashMap<String, Integer>();
|
||||
private HashMap<String, Integer> amountEntities = new HashMap<String, Integer>();
|
||||
private ArrayList<TickHandlerStats> timingHandlers = new ArrayList<TickHandlerStats>();
|
||||
private ArrayList<EntityStats> timingEntities = new ArrayList<EntityStats>();
|
||||
private ArrayList<TileEntityStats> timingTileEnts = new ArrayList<TileEntityStats>();
|
||||
|
||||
public void setAmountEntities(HashMap<String, Integer> stats){
|
||||
this.amountEntities = stats;
|
||||
|
||||
DefaultTableModel model = new DefaultTableModel(
|
||||
new Object[][] {
|
||||
{null, null},
|
||||
},
|
||||
new String[] {
|
||||
"Type", "Amount"
|
||||
}
|
||||
) {
|
||||
Class[] columnTypes = new Class[] {
|
||||
String.class, Integer.class
|
||||
};
|
||||
public Class getColumnClass(int columnIndex) {
|
||||
return columnTypes[columnIndex];
|
||||
}
|
||||
};
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)SwingUI.instance().getTableEntityList().getModel();
|
||||
|
||||
for (int i = 0; i < model.getRowCount(); i++)
|
||||
model.removeRow(i);
|
||||
@@ -42,7 +37,6 @@ public class DataCache {
|
||||
totalEntities += DataCache.instance().getAmountEntities().get(type);
|
||||
}
|
||||
|
||||
SwingUI.instance().getTableEntityList().setModel(model);
|
||||
SwingUI.instance().getLabelAmountValue().setText(String.valueOf(totalEntities));
|
||||
model.fireTableDataChanged();
|
||||
}
|
||||
@@ -51,5 +45,84 @@ public class DataCache {
|
||||
return this.amountEntities;
|
||||
}
|
||||
|
||||
public void setTimingHandler(ArrayList<TickHandlerStats> timingHandlers){
|
||||
this.timingHandlers = timingHandlers;
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)SwingUI.instance().getTableTimingHandler().getModel();
|
||||
|
||||
for (int i = 0; i < model.getRowCount(); i++)
|
||||
model.removeRow(i);
|
||||
|
||||
for (TickHandlerStats stat : DataCache.instance().getTimingHandlers()){
|
||||
model.addRow(new Object[] {stat.getName(), String.format("%.3f \u00B5s", stat.getGeometricMean())});
|
||||
}
|
||||
|
||||
model.fireTableDataChanged();
|
||||
}
|
||||
|
||||
public ArrayList<TickHandlerStats> getTimingHandlers(){
|
||||
return this.timingHandlers;
|
||||
}
|
||||
|
||||
public void setTimingEntities(ArrayList<EntityStats> timingEntities){
|
||||
this.timingEntities = timingEntities;
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)SwingUI.instance().getTableTimingEnt().getModel();
|
||||
|
||||
for (int i = 0; i < model.getRowCount(); i++)
|
||||
model.removeRow(i);
|
||||
|
||||
for (EntityStats stat : DataCache.instance().getTimingEntities()){
|
||||
model.addRow(new Object[] {stat.getName(),
|
||||
stat.getID(),
|
||||
stat.getCoord().dim,
|
||||
String.format("[ %4d %4d %4d ]", stat.getCoord().x, stat.getCoord().y, stat.getCoord().z),
|
||||
String.format("%.3f \u00B5s", stat.getGeometricMean()),
|
||||
String.valueOf(stat.getNData())});
|
||||
}
|
||||
|
||||
for (int i = 0; i < model.getRowCount(); i++)
|
||||
model.removeRow(i);
|
||||
|
||||
model.fireTableDataChanged();
|
||||
|
||||
}
|
||||
|
||||
public ArrayList<EntityStats> getTimingEntities(){
|
||||
return this.timingEntities;
|
||||
}
|
||||
|
||||
public void setTimingTileEnts(ArrayList<TileEntityStats> timingTileEnts){
|
||||
this.timingTileEnts = timingTileEnts;
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)SwingUI.instance().getTableTimingTE().getModel();
|
||||
|
||||
for (int i = 0; i < model.getRowCount(); i++)
|
||||
model.removeRow(i);
|
||||
|
||||
for (TileEntityStats stat : DataCache.instance().getTimingTileEnts()){
|
||||
ItemStack is;
|
||||
String name = String.format("te.%d.%d", stat.getID(), stat.getMeta());
|
||||
String modID = "<UNKNOWN>";
|
||||
|
||||
try{
|
||||
is = new ItemStack(stat.getID(), 1, stat.getMeta());
|
||||
name = is.getDisplayName();
|
||||
modID = ModIdentification.idFromStack(is);
|
||||
} catch (Exception e) { }
|
||||
|
||||
model.addRow(new Object[] {
|
||||
name,
|
||||
modID,
|
||||
stat.getCoordinates().dim,
|
||||
String.format("[ %4d %4d %4d ]", stat.getCoordinates().x, stat.getCoordinates().y, stat.getCoordinates().z),
|
||||
String.format("%.3f \u00B5s",stat.getGeometricMean())});
|
||||
}
|
||||
|
||||
model.fireTableDataChanged();
|
||||
}
|
||||
|
||||
public ArrayList<TileEntityStats> getTimingTileEnts(){
|
||||
return this.timingTileEnts;
|
||||
}
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -166,12 +166,20 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{
|
||||
tableTimingTE = new JTable();
|
||||
tableTimingTE.setModel(new DefaultTableModel(
|
||||
new Object[][] {
|
||||
{null, null},
|
||||
{null, null, null, null, null},
|
||||
},
|
||||
new String[] {
|
||||
"New column", "New column"
|
||||
"Type", "Mod", "Dim", "Pos", "Update Time"
|
||||
}
|
||||
));
|
||||
) {
|
||||
Class[] columnTypes = new Class[] {
|
||||
String.class, String.class, Integer.class, Object.class, String.class
|
||||
};
|
||||
public Class getColumnClass(int columnIndex) {
|
||||
return columnTypes[columnIndex];
|
||||
}
|
||||
});
|
||||
tableTimingTE.setAutoCreateRowSorter(true);
|
||||
scrollPaneTimingTE.setViewportView(tableTimingTE);
|
||||
|
||||
panelTimingEnt = new JPanel();
|
||||
@@ -184,12 +192,20 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{
|
||||
tableTimingEnt = new JTable();
|
||||
tableTimingEnt.setModel(new DefaultTableModel(
|
||||
new Object[][] {
|
||||
{null, null},
|
||||
{null, null, null, null, null, null},
|
||||
},
|
||||
new String[] {
|
||||
"New column", "New column"
|
||||
"Type", "ID", "Dim", "Pos", "Update Time", "Data"
|
||||
}
|
||||
));
|
||||
) {
|
||||
Class[] columnTypes = new Class[] {
|
||||
String.class, Integer.class, Integer.class, Object.class, String.class, Integer.class
|
||||
};
|
||||
public Class getColumnClass(int columnIndex) {
|
||||
return columnTypes[columnIndex];
|
||||
}
|
||||
});
|
||||
tableTimingEnt.setAutoCreateRowSorter(true);
|
||||
scrollPaneTimingEnt.setViewportView(tableTimingEnt);
|
||||
|
||||
panelTimingHandler = new JPanel();
|
||||
@@ -205,9 +221,17 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{
|
||||
{null, null},
|
||||
},
|
||||
new String[] {
|
||||
"New column", "New column"
|
||||
"Name", "Update Time"
|
||||
}
|
||||
));
|
||||
) {
|
||||
Class[] columnTypes = new Class[] {
|
||||
String.class, String.class
|
||||
};
|
||||
public Class getColumnClass(int columnIndex) {
|
||||
return columnTypes[columnIndex];
|
||||
}
|
||||
});
|
||||
tableTimingHandler.setAutoCreateRowSorter(true);
|
||||
scrollPaneTimingHandler.setViewportView(tableTimingHandler);
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ import mcp.mobius.opis.data.holders.EntityStats;
|
||||
import mcp.mobius.opis.data.managers.EntityManager;
|
||||
import mcp.mobius.opis.network.server.Packet_DataListChunkEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_DataScreenAmountEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_DataListAmountEntities;
|
||||
|
||||
public class DataReqHandler {
|
||||
|
||||
@@ -47,11 +47,11 @@ public class DataReqHandler {
|
||||
} else if (data[1].equals("amount_ent")){
|
||||
if (data[2].equals("filtered")){
|
||||
HashMap<String, Integer> ents = EntityManager.getCumulativeEntities(false);
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_DataScreenAmountEntities.create(ents), player);
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_DataListAmountEntities.create(ents), player);
|
||||
return;
|
||||
} else if (data[2].equals("unfiltered")){
|
||||
HashMap<String, Integer> ents = EntityManager.getCumulativeEntities(true);
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_DataScreenAmountEntities.create(ents), player);
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_DataListAmountEntities.create(ents), player);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,16 +29,16 @@ import mcp.mobius.opis.network.server.Packet_ClearSelection;
|
||||
import mcp.mobius.opis.network.server.Packet_ClientCommand;
|
||||
import mcp.mobius.opis.network.server.Packet_DataListChunkEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_DataScreenAmountEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_DataScreenTimingEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_DataScreenTimingHandlers;
|
||||
import mcp.mobius.opis.network.server.Packet_DataListAmountEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_DataListTimingEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_DataListTimingHandlers;
|
||||
import mcp.mobius.opis.network.server.Packet_LoadedChunks;
|
||||
import mcp.mobius.opis.network.server.Packet_MeanTime;
|
||||
import mcp.mobius.opis.network.server.Packet_ModMeanTime;
|
||||
import mcp.mobius.opis.network.server.Packet_TPS;
|
||||
import mcp.mobius.opis.network.server.Packet_Tickets;
|
||||
import mcp.mobius.opis.network.server.Packet_TileEntitiesChunkList;
|
||||
import mcp.mobius.opis.network.server.Packet_TileEntitiesTopList;
|
||||
import mcp.mobius.opis.network.server.Packet_DataListTimingTileEnts;
|
||||
import mcp.mobius.opis.overlay.OverlayLoadedChunks;
|
||||
import mcp.mobius.opis.overlay.OverlayMeanTime;
|
||||
import mcp.mobius.opis.overlay.OverlayStatus;
|
||||
@@ -90,11 +90,6 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
OverlayMeanTime.instance().setupTable(castedPacket.entities);
|
||||
}
|
||||
|
||||
else if (header == Packets.TILEENTITIES_TOPLIST){
|
||||
Packet_TileEntitiesTopList castedPacket = new Packet_TileEntitiesTopList(packet);
|
||||
modOpis.proxy.displayTileEntityList(castedPacket.entities);
|
||||
}
|
||||
|
||||
else if (header == Packets.TICKETS){
|
||||
Packet_Tickets castedPacket = new Packet_Tickets(packet);
|
||||
OverlayLoadedChunks.instance().setupTable(castedPacket.tickets);
|
||||
@@ -138,21 +133,26 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
OverlayEntityPerChunk.instance().setupEntTable();
|
||||
}
|
||||
|
||||
else if (header == Packets.DATA_SCREEN_TIMING_ENTITIES){
|
||||
Packet_DataScreenTimingEntities castedPacket = new Packet_DataScreenTimingEntities(packet);
|
||||
modOpis.proxy.displayEntityList(castedPacket.entities);
|
||||
else if (header == Packets.DATA_LIST_TIMING_TILEENTS){
|
||||
Packet_DataListTimingTileEnts castedPacket = new Packet_DataListTimingTileEnts(packet);
|
||||
DataCache.instance().setTimingTileEnts(castedPacket.entities);
|
||||
}
|
||||
|
||||
else if (header == Packets.DATA_LIST_TIMING_ENTITIES){
|
||||
Packet_DataListTimingEntities castedPacket = new Packet_DataListTimingEntities(packet);
|
||||
DataCache.instance().setTimingEntities(castedPacket.entities);
|
||||
}
|
||||
|
||||
else if (header == Packets.DATA_SCREEN_AMOUNT_ENTITIES){
|
||||
Packet_DataScreenAmountEntities castedPacket = new Packet_DataScreenAmountEntities(packet);
|
||||
DataCache.instance().setAmountEntities(castedPacket.entities);
|
||||
}
|
||||
|
||||
else if (header == Packets.DATA_SCREEN_TIMING_HANDLERS){
|
||||
Packet_DataScreenTimingHandlers castedPacket = new Packet_DataScreenTimingHandlers(packet);
|
||||
modOpis.proxy.displayHandlerList(castedPacket.stats);
|
||||
else if (header == Packets.DATA_LIST_TIMING_HANDLERS){
|
||||
Packet_DataListTimingHandlers castedPacket = new Packet_DataListTimingHandlers(packet);
|
||||
DataCache.instance().setTimingHandler(castedPacket.stats);
|
||||
}
|
||||
|
||||
else if (header == Packets.DATA_LIST_AMOUNT_ENTITIES){
|
||||
Packet_DataListAmountEntities castedPacket = new Packet_DataListAmountEntities(packet);
|
||||
DataCache.instance().setAmountEntities(castedPacket.entities);
|
||||
}
|
||||
|
||||
else if (header == Packets.CLR_SELECTION){
|
||||
Packet_ClearSelection castedPacket = new Packet_ClearSelection(packet);
|
||||
modOpis.selectedBlock = null;
|
||||
|
||||
@@ -17,7 +17,7 @@ public class Packets {
|
||||
|
||||
public static byte REQ_TES_IN_CHUNK = 0x20; // C => S
|
||||
public static byte TILEENTITIES_CHUNKLIST = 0x21; // S => C
|
||||
public static byte TILEENTITIES_TOPLIST = 0x22; // S => C
|
||||
public static byte DATA_LIST_TIMING_TILEENTS = 0x22; // S => C
|
||||
|
||||
public static byte TPS = 0x23;
|
||||
public static byte MODMEANTIME = 0x24; // S => C
|
||||
@@ -29,9 +29,9 @@ public class Packets {
|
||||
|
||||
public static byte DATA_OVERLAY_CHUNK_ENTITIES = 0x40;
|
||||
public static byte DATA_LIST_CHUNK_ENTITIES = 0x41;
|
||||
public static byte DATA_SCREEN_TIMING_ENTITIES = 0x42;
|
||||
public static byte DATA_SCREEN_AMOUNT_ENTITIES = 0x43;
|
||||
public static byte DATA_SCREEN_TIMING_HANDLERS = 0x44;
|
||||
public static byte DATA_LIST_TIMING_ENTITIES = 0x42;
|
||||
public static byte DATA_LIST_AMOUNT_ENTITIES = 0x43;
|
||||
public static byte DATA_LIST_TIMING_HANDLERS = 0x44;
|
||||
|
||||
|
||||
public static byte REQ_DATA = 0x50; // C => S
|
||||
|
||||
+3
-3
@@ -11,12 +11,12 @@ import mcp.mobius.opis.network.Packets;
|
||||
import net.minecraft.network.packet.Packet;
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
|
||||
public class Packet_DataScreenAmountEntities {
|
||||
public class Packet_DataListAmountEntities {
|
||||
|
||||
public byte header;
|
||||
public HashMap<String, Integer> entities = new HashMap<String, Integer>();
|
||||
|
||||
public Packet_DataScreenAmountEntities(Packet250CustomPayload packet) {
|
||||
public Packet_DataListAmountEntities(Packet250CustomPayload packet) {
|
||||
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
|
||||
|
||||
try{
|
||||
@@ -36,7 +36,7 @@ public class Packet_DataScreenAmountEntities {
|
||||
DataOutputStream outputStream = new DataOutputStream(bos);
|
||||
|
||||
try{
|
||||
outputStream.writeByte(Packets.DATA_SCREEN_AMOUNT_ENTITIES);
|
||||
outputStream.writeByte(Packets.DATA_LIST_AMOUNT_ENTITIES);
|
||||
outputStream.writeInt(entities.keySet().size());
|
||||
for (String name : entities.keySet()){
|
||||
packet.writeString(name, outputStream);
|
||||
+3
-3
@@ -11,12 +11,12 @@ import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
import mcp.mobius.opis.data.holders.EntityStats;
|
||||
import mcp.mobius.opis.network.Packets;
|
||||
|
||||
public class Packet_DataScreenTimingEntities {
|
||||
public class Packet_DataListTimingEntities {
|
||||
|
||||
public byte header;
|
||||
public ArrayList<EntityStats> entities = new ArrayList<EntityStats>();
|
||||
|
||||
public Packet_DataScreenTimingEntities(Packet250CustomPayload packet) {
|
||||
public Packet_DataListTimingEntities(Packet250CustomPayload packet) {
|
||||
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
|
||||
|
||||
try{
|
||||
@@ -33,7 +33,7 @@ public class Packet_DataScreenTimingEntities {
|
||||
DataOutputStream outputStream = new DataOutputStream(bos);
|
||||
|
||||
try{
|
||||
outputStream.writeByte(Packets.DATA_SCREEN_TIMING_ENTITIES);
|
||||
outputStream.writeByte(Packets.DATA_LIST_TIMING_ENTITIES);
|
||||
outputStream.writeInt(stats.size());
|
||||
for (EntityStats data : stats)
|
||||
data.writeToStream(outputStream);
|
||||
+3
-3
@@ -11,13 +11,13 @@ import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
import mcp.mobius.opis.data.holders.TickHandlerStats;
|
||||
import mcp.mobius.opis.network.Packets;
|
||||
|
||||
public class Packet_DataScreenTimingHandlers {
|
||||
public class Packet_DataListTimingHandlers {
|
||||
|
||||
|
||||
public byte header;
|
||||
public ArrayList<TickHandlerStats> stats = new ArrayList<TickHandlerStats>();
|
||||
|
||||
public Packet_DataScreenTimingHandlers(Packet250CustomPayload packet) {
|
||||
public Packet_DataListTimingHandlers(Packet250CustomPayload packet) {
|
||||
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
|
||||
|
||||
try{
|
||||
@@ -34,7 +34,7 @@ public class Packet_DataScreenTimingHandlers {
|
||||
DataOutputStream outputStream = new DataOutputStream(bos);
|
||||
|
||||
try{
|
||||
outputStream.writeByte(Packets.DATA_SCREEN_TIMING_HANDLERS);
|
||||
outputStream.writeByte(Packets.DATA_LIST_TIMING_HANDLERS);
|
||||
outputStream.writeInt(stats.size());
|
||||
for (TickHandlerStats data : stats)
|
||||
data.writeToStream(outputStream);
|
||||
+3
-3
@@ -12,12 +12,12 @@ import mcp.mobius.opis.data.holders.TileEntityStats;
|
||||
import mcp.mobius.opis.network.Packets;
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
|
||||
public class Packet_TileEntitiesTopList {
|
||||
public class Packet_DataListTimingTileEnts {
|
||||
|
||||
public byte header;
|
||||
public ArrayList<TileEntityStats> entities = new ArrayList<TileEntityStats>();
|
||||
|
||||
public Packet_TileEntitiesTopList(Packet250CustomPayload packet) {
|
||||
public Packet_DataListTimingTileEnts(Packet250CustomPayload packet) {
|
||||
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
|
||||
|
||||
try{
|
||||
@@ -34,7 +34,7 @@ public class Packet_TileEntitiesTopList {
|
||||
DataOutputStream outputStream = new DataOutputStream(bos);
|
||||
|
||||
try{
|
||||
outputStream.writeByte(Packets.TILEENTITIES_TOPLIST);
|
||||
outputStream.writeByte(Packets.DATA_LIST_TIMING_TILEENTS);
|
||||
outputStream.writeInt(stats.size());
|
||||
for (TileEntityStats data : stats)
|
||||
data.writeToStream(outputStream);
|
||||
@@ -18,11 +18,7 @@ import mcp.mobius.opis.gui.font.Fonts;
|
||||
import mcp.mobius.opis.gui.font.TrueTypeFont;
|
||||
import mcp.mobius.opis.gui.screens.ScreenBase;
|
||||
import mcp.mobius.opis.gui.screens.ScreenChunks;
|
||||
import mcp.mobius.opis.gui.screens.ScreenEntity;
|
||||
import mcp.mobius.opis.gui.screens.ScreenEntityAmount;
|
||||
import mcp.mobius.opis.gui.screens.ScreenMods;
|
||||
import mcp.mobius.opis.gui.screens.ScreenTickHandler;
|
||||
import mcp.mobius.opis.gui.screens.ScreenTileEntity;
|
||||
import mcp.mobius.opis.overlay.OverlayLoadedChunks;
|
||||
import mcp.mobius.opis.overlay.OverlayMeanTime;
|
||||
import mcp.mobius.opis.overlay.entperchunk.OverlayEntityPerChunk;
|
||||
@@ -49,31 +45,6 @@ public class ProxyClient extends ProxyServer {
|
||||
fontMC8 = Fonts.createFont(new ResourceLocation("opis", "fonts/LiberationMono-Bold.ttf"), 14, true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayTileEntityList(ArrayList<TileEntityStats> stats){
|
||||
ScreenBase screenTEs = new ScreenTileEntity(null, stats);
|
||||
screenTEs.display();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayEntityList(ArrayList<EntityStats> stats){
|
||||
ScreenBase screenEnts = new ScreenEntity(null, stats);
|
||||
screenEnts.display();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayHandlerList(ArrayList<TickHandlerStats> stats){
|
||||
ScreenBase screenHandlers = new ScreenTickHandler(null, stats);
|
||||
screenHandlers.display();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void displayEntityAmount(HashMap<String, Integer> stats){
|
||||
ScreenBase screenEnts = new ScreenEntityAmount(null, stats);
|
||||
screenEnts.display();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayChunkList(ArrayList<ChunkStats> stats){
|
||||
ScreenBase screenChunks = new ScreenChunks(null, stats);
|
||||
|
||||
@@ -16,10 +16,6 @@ public class ProxyServer {
|
||||
public HashMap<Player, Integer> playerDimension = new HashMap<Player, Integer>();
|
||||
|
||||
public void init(){}
|
||||
public void displayTileEntityList(ArrayList<TileEntityStats> stats){}
|
||||
public void displayEntityList(ArrayList<EntityStats> stats){}
|
||||
public void displayHandlerList(ArrayList<TickHandlerStats> stats){}
|
||||
public void displayChunkList(ArrayList<ChunkStats> stats){}
|
||||
public void displayModList(ArrayList<ModStats> stats){}
|
||||
public void displayEntityAmount(HashMap<String, Integer> stats){}
|
||||
}
|
||||
Reference in new issue
Block a user