mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-22 05:02:17 +00:00
Done moving all the message handlers to their proper place.
ChunkManager is now a singleton instead of a collection of statics.
This commit is contained in:
1 parent
b3e0427ab8
commit
32cfa4800e
10 files changed
+108
-116
No files matched your search
@@ -46,10 +46,10 @@ public class CommandChunkList extends CommandBase implements IOpisCommand {
|
||||
ArrayList<StatsChunk> chunks = new ArrayList<StatsChunk>();
|
||||
|
||||
if (astring.length == 0)
|
||||
chunks = ChunkManager.getTopChunks(20);
|
||||
chunks = ChunkManager.instance().getTopChunks(20);
|
||||
else
|
||||
try{
|
||||
chunks = ChunkManager.getTopChunks(Integer.valueOf(astring.length));
|
||||
chunks = ChunkManager.instance().getTopChunks(Integer.valueOf(astring.length));
|
||||
}catch (Exception e){return;}
|
||||
|
||||
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText("[DIM X Z] Time NTEs"));
|
||||
|
||||
@@ -9,12 +9,15 @@ import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import mcp.mobius.opis.api.IMessageHandler;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.basetypes.TicketData;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsChunk;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.packets.server.NetDataRaw;
|
||||
import net.minecraft.world.ChunkCoordIntPair;
|
||||
import net.minecraft.world.WorldServer;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
@@ -22,36 +25,38 @@ import net.minecraft.world.gen.ChunkProviderServer;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
import net.minecraftforge.common.ForgeChunkManager.Ticket;
|
||||
|
||||
public class ChunkManager {
|
||||
public class ChunkManager implements IMessageHandler{
|
||||
|
||||
|
||||
private static ChunkManager _instance = new ChunkManager();
|
||||
public static ChunkManager instance(){return _instance;};
|
||||
private ChunkManager(){}
|
||||
|
||||
private static ArrayList<CoordinatesChunk> chunksLoad = new ArrayList<CoordinatesChunk>();
|
||||
private static HashMap<CoordinatesChunk, StatsChunk> chunkMeanTime = new HashMap<CoordinatesChunk, StatsChunk>();
|
||||
public static ArrayList<TicketData> tickets = new ArrayList<TicketData>();
|
||||
private ArrayList<CoordinatesChunk> chunksLoad = new ArrayList<CoordinatesChunk>();
|
||||
private HashMap<CoordinatesChunk, StatsChunk> chunkMeanTime = new HashMap<CoordinatesChunk, StatsChunk>();
|
||||
public ArrayList<TicketData> tickets = new ArrayList<TicketData>();
|
||||
|
||||
public static void setLoadedChunks(ArrayList<ISerializable> data){
|
||||
public void setLoadedChunks(ArrayList<ISerializable> data){
|
||||
chunksLoad.clear();
|
||||
for (ISerializable chunk : data){
|
||||
chunksLoad.add((CoordinatesChunk)chunk);
|
||||
}
|
||||
}
|
||||
|
||||
public static ArrayList<CoordinatesChunk> getLoadedChunks(){
|
||||
public ArrayList<CoordinatesChunk> getLoadedChunks(){
|
||||
return chunksLoad;
|
||||
}
|
||||
|
||||
public static void setChunkMeanTime(ArrayList<ISerializable> data){
|
||||
public void setChunkMeanTime(ArrayList<ISerializable> data){
|
||||
chunkMeanTime.clear();
|
||||
for (ISerializable stat : data)
|
||||
chunkMeanTime.put(((StatsChunk)stat).getChunk(), (StatsChunk)stat);
|
||||
}
|
||||
|
||||
public static HashMap<CoordinatesChunk, StatsChunk> getChunkMeanTime(){
|
||||
public HashMap<CoordinatesChunk, StatsChunk> getChunkMeanTime(){
|
||||
return chunkMeanTime;
|
||||
}
|
||||
|
||||
public static ArrayList<CoordinatesChunk> getLoadedChunks(int dimension){
|
||||
public ArrayList<CoordinatesChunk> getLoadedChunks(int dimension){
|
||||
HashSet<CoordinatesChunk> chunkStatus = new HashSet<CoordinatesChunk>();
|
||||
WorldServer world = DimensionManager.getWorld(dimension);
|
||||
if (world != null)
|
||||
@@ -69,7 +74,7 @@ public class ChunkManager {
|
||||
return new ArrayList<CoordinatesChunk>(chunkStatus);
|
||||
}
|
||||
|
||||
public static HashSet<TicketData> getTickets(){
|
||||
public HashSet<TicketData> getTickets(){
|
||||
HashSet<TicketData> tickets = new HashSet<TicketData>();
|
||||
for (int dim : DimensionManager.getIDs())
|
||||
for (Ticket ticket : DimensionManager.getWorld(dim).getPersistentChunks().values())
|
||||
@@ -78,7 +83,7 @@ public class ChunkManager {
|
||||
return tickets;
|
||||
}
|
||||
|
||||
public static ArrayList<StatsChunk> getChunksUpdateTime(){
|
||||
public ArrayList<StatsChunk> getChunksUpdateTime(){
|
||||
HashMap<CoordinatesChunk, StatsChunk> chunks = new HashMap<CoordinatesChunk, StatsChunk>();
|
||||
|
||||
for (StatsTileEntity stat : TileEntityManager.stats.values()){
|
||||
@@ -101,8 +106,8 @@ public class ChunkManager {
|
||||
return chunksUpdate;
|
||||
}
|
||||
|
||||
public static ArrayList<StatsChunk> getTopChunks(int quantity){
|
||||
ArrayList<StatsChunk> chunks = ChunkManager.getChunksUpdateTime();
|
||||
public ArrayList<StatsChunk> getTopChunks(int quantity){
|
||||
ArrayList<StatsChunk> chunks = this.getChunksUpdateTime();
|
||||
ArrayList<StatsChunk> outList = new ArrayList<StatsChunk>();
|
||||
Collections.sort(chunks);
|
||||
|
||||
@@ -112,7 +117,7 @@ public class ChunkManager {
|
||||
return outList;
|
||||
}
|
||||
|
||||
public static int getLoadedChunkAmount(){
|
||||
public int getLoadedChunkAmount(){
|
||||
int loadedChunks = 0;
|
||||
for (WorldServer world : DimensionManager.getWorlds()){
|
||||
int loadedChunksForDim = world.getChunkProvider().getLoadedChunkCount();
|
||||
@@ -123,11 +128,30 @@ public class ChunkManager {
|
||||
return loadedChunks;
|
||||
}
|
||||
|
||||
public static int getForcedChunkAmount(){
|
||||
public int getForcedChunkAmount(){
|
||||
int forcedChunks = 0;
|
||||
for (WorldServer world : DimensionManager.getWorlds()){
|
||||
forcedChunks += world.getPersistentChunks().size();
|
||||
}
|
||||
return forcedChunks;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handleMessage(Message msg, NetDataRaw rawdata) {
|
||||
switch(msg){
|
||||
case LIST_TIMING_CHUNK:{
|
||||
this.setChunkMeanTime(rawdata.array);
|
||||
break;
|
||||
}
|
||||
case LIST_CHUNK_LOADED:{
|
||||
this.setLoadedChunks(rawdata.array);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -77,8 +77,8 @@ public class OpisServerTickHandler implements ITickHandler {
|
||||
|
||||
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_UPLOAD, new SerialLong(PacketProfiler.instance().dataSizeOut)));
|
||||
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_DOWNLOAD, new SerialLong(PacketProfiler.instance().dataSizeIn)));
|
||||
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_CHUNK_FORCED, new SerialInt(ChunkManager.getForcedChunkAmount())));
|
||||
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_CHUNK_LOADED, new SerialInt(ChunkManager.getLoadedChunkAmount())));
|
||||
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_CHUNK_FORCED, new SerialInt(ChunkManager.instance().getForcedChunkAmount())));
|
||||
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_CHUNK_LOADED, new SerialInt(ChunkManager.instance().getLoadedChunkAmount())));
|
||||
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_TIMING_TICK, TickProfiler.instance().stats));
|
||||
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_TILEENTS, new SerialInt(TileEntityManager.getAmountTileEntities())));
|
||||
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_ENTITIES, new SerialInt(EntityManager.getAmountEntities())));
|
||||
@@ -145,12 +145,12 @@ public class OpisServerTickHandler implements ITickHandler {
|
||||
for (Player player : PlayerTracker.instance().playerOverlayStatus.keySet()){
|
||||
|
||||
if (PlayerTracker.instance().playerOverlayStatus.get(player) == OverlayStatus.CHUNKSTATUS){
|
||||
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_CHUNK_LOADED, ChunkManager.getLoadedChunks(PlayerTracker.instance().playerDimension.get(player))), player);
|
||||
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_CHUNK_LOADED, ChunkManager.instance().getLoadedChunks(PlayerTracker.instance().playerDimension.get(player))), player);
|
||||
|
||||
}
|
||||
|
||||
if (PlayerTracker.instance().playerOverlayStatus.get(player) == OverlayStatus.MEANTIME){
|
||||
ArrayList<StatsChunk> timingChunks = ChunkManager.getTopChunks(100);
|
||||
ArrayList<StatsChunk> timingChunks = ChunkManager.instance().getTopChunks(100);
|
||||
//OpisPacketHandler.validateAndSend(Packet_DataList.create(DataReq.LIST_TIMING_CHUNK, timingChunks), player);
|
||||
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_CHUNK, timingChunks), player);
|
||||
}
|
||||
|
||||
@@ -122,7 +122,7 @@ public class OverlayLoadedChunks implements IMwDataProvider {
|
||||
public ArrayList<IMwChunkOverlay> getChunksOverlay(int dim, double centerX, double centerZ, double minX, double minZ, double maxX, double maxZ) {
|
||||
ArrayList<IMwChunkOverlay> overlays = new ArrayList<IMwChunkOverlay>();
|
||||
|
||||
for (CoordinatesChunk chunk : ChunkManager.getLoadedChunks()){
|
||||
for (CoordinatesChunk chunk : ChunkManager.instance().getLoadedChunks()){
|
||||
overlays.add(new ChunkOverlay(chunk.chunkX, chunk.chunkZ, chunk.metadata == 0 ? false : true));
|
||||
}
|
||||
return overlays;
|
||||
@@ -133,7 +133,7 @@ public class OverlayLoadedChunks implements IMwDataProvider {
|
||||
int xChunk = bX >> 4;
|
||||
int zChunk = bZ >> 4;
|
||||
|
||||
for (CoordinatesChunk chunk : ChunkManager.getLoadedChunks()){
|
||||
for (CoordinatesChunk chunk : ChunkManager.instance().getLoadedChunks()){
|
||||
if (chunk.chunkX == xChunk && chunk.chunkZ == zChunk && chunk.metadata == 0)
|
||||
return ", Game loaded";
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ import mapwriter.api.IMwDataProvider;
|
||||
import mapwriter.map.MapView;
|
||||
import mapwriter.map.mapmode.MapMode;
|
||||
import mcp.mobius.opis.modOpis;
|
||||
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;
|
||||
@@ -37,8 +38,9 @@ import mcp.mobius.opis.gui.widgets.tableview.ViewTable;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.packets.client.Packet_ReqChunks;
|
||||
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
|
||||
import mcp.mobius.opis.network.packets.server.NetDataRaw;
|
||||
|
||||
public class OverlayMeanTime implements IMwDataProvider {
|
||||
public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{
|
||||
|
||||
public class EntitiesTable extends ViewTable{
|
||||
MapView mapView;
|
||||
@@ -144,16 +146,16 @@ public class OverlayMeanTime implements IMwDataProvider {
|
||||
double minTime = 9999;
|
||||
double maxTime = 0;
|
||||
|
||||
for (CoordinatesChunk chunk : ChunkManager.getChunkMeanTime().keySet()){
|
||||
minTime = Math.min(minTime, ChunkManager.getChunkMeanTime().get(chunk).getDataSum());
|
||||
maxTime = Math.max(maxTime, ChunkManager.getChunkMeanTime().get(chunk).getDataSum());
|
||||
for (CoordinatesChunk chunk : ChunkManager.instance().getChunkMeanTime().keySet()){
|
||||
minTime = Math.min(minTime, ChunkManager.instance().getChunkMeanTime().get(chunk).getDataSum());
|
||||
maxTime = Math.max(maxTime, ChunkManager.instance().getChunkMeanTime().get(chunk).getDataSum());
|
||||
}
|
||||
|
||||
for (CoordinatesChunk chunk : ChunkManager.getChunkMeanTime().keySet()){
|
||||
for (CoordinatesChunk chunk : ChunkManager.instance().getChunkMeanTime().keySet()){
|
||||
if (this.selectedChunk != null)
|
||||
overlays.add(new ChunkOverlay(chunk.chunkX, chunk.chunkZ, ChunkManager.getChunkMeanTime().get(chunk).tileEntities, ChunkManager.getChunkMeanTime().get(chunk).getDataSum(), minTime, maxTime, chunk.equals(this.selectedChunk)));
|
||||
overlays.add(new ChunkOverlay(chunk.chunkX, chunk.chunkZ, ChunkManager.instance().getChunkMeanTime().get(chunk).tileEntities, ChunkManager.instance().getChunkMeanTime().get(chunk).getDataSum(), minTime, maxTime, chunk.equals(this.selectedChunk)));
|
||||
else
|
||||
overlays.add(new ChunkOverlay(chunk.chunkX, chunk.chunkZ, ChunkManager.getChunkMeanTime().get(chunk).tileEntities, ChunkManager.getChunkMeanTime().get(chunk).getDataSum(), minTime, maxTime, false));
|
||||
overlays.add(new ChunkOverlay(chunk.chunkX, chunk.chunkZ, ChunkManager.instance().getChunkMeanTime().get(chunk).tileEntities, ChunkManager.instance().getChunkMeanTime().get(chunk).getDataSum(), minTime, maxTime, false));
|
||||
}
|
||||
return overlays;
|
||||
}
|
||||
@@ -164,11 +166,11 @@ public class OverlayMeanTime implements IMwDataProvider {
|
||||
int zChunk = bZ >> 4;
|
||||
CoordinatesChunk chunkCoord = new CoordinatesChunk(dim, xChunk, zChunk);
|
||||
|
||||
if (ChunkManager.getChunkMeanTime().containsKey(chunkCoord))
|
||||
if (ChunkManager.instance().getChunkMeanTime().containsKey(chunkCoord))
|
||||
if (modOpis.microseconds)
|
||||
return String.format("%.3f \u00B5s", ChunkManager.getChunkMeanTime().get(chunkCoord).getDataSum());
|
||||
return String.format("%.3f \u00B5s", ChunkManager.instance().getChunkMeanTime().get(chunkCoord).getDataSum());
|
||||
else
|
||||
return String.format(", %.5f ms", ChunkManager.getChunkMeanTime().get(chunkCoord).getDataSum()/1000.0);
|
||||
return String.format(", %.5f ms", ChunkManager.instance().getChunkMeanTime().get(chunkCoord).getDataSum()/1000.0);
|
||||
|
||||
else
|
||||
return "";
|
||||
@@ -182,7 +184,7 @@ public class OverlayMeanTime implements IMwDataProvider {
|
||||
int chunkZ = bZ >> 4;
|
||||
CoordinatesChunk clickedChunk = new CoordinatesChunk(dim, chunkX, chunkZ);
|
||||
|
||||
if (ChunkManager.getChunkMeanTime().containsKey(clickedChunk)){
|
||||
if (ChunkManager.instance().getChunkMeanTime().containsKey(clickedChunk)){
|
||||
if (this.selectedChunk == null)
|
||||
this.selectedChunk = clickedChunk;
|
||||
else if (this.selectedChunk.equals(clickedChunk))
|
||||
@@ -331,6 +333,21 @@ public class OverlayMeanTime implements IMwDataProvider {
|
||||
|
||||
if (chunks.size() > 0)
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqChunks.create(dim, chunks));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handleMessage(Message msg, NetDataRaw rawdata) {
|
||||
switch(msg){
|
||||
case LIST_CHUNK_TILEENTS:{
|
||||
this.setupTable(rawdata.array);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -15,6 +15,7 @@ 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;
|
||||
@@ -31,8 +32,9 @@ import mcp.mobius.opis.gui.widgets.tableview.ViewTable;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.packets.client.Packet_ReqChunks;
|
||||
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
|
||||
import mcp.mobius.opis.network.packets.server.NetDataRaw;
|
||||
|
||||
public class OverlayEntityPerChunk implements IMwDataProvider {
|
||||
public class OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler {
|
||||
|
||||
class ReducedData implements Comparable{
|
||||
CoordinatesChunk chunk;
|
||||
@@ -284,6 +286,22 @@ public class OverlayEntityPerChunk implements IMwDataProvider {
|
||||
|
||||
if (chunks.size() > 0)
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqChunks.create(dim, chunks));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handleMessage(Message msg, NetDataRaw rawdata) {
|
||||
switch(msg){
|
||||
case LIST_CHUNK_ENTITIES:{
|
||||
this.setEntStats(rawdata.array);
|
||||
this.setupEntTable();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,74 +0,0 @@
|
||||
package mcp.mobius.opis.network;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.logging.Level;
|
||||
|
||||
import javax.swing.event.TableModelEvent;
|
||||
import javax.swing.table.DefaultTableModel;
|
||||
|
||||
import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar;
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.api.IMessageHandler;
|
||||
import mcp.mobius.opis.data.client.DataCache;
|
||||
import mcp.mobius.opis.data.client.TickHandlerClientProfiler;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
|
||||
import mcp.mobius.opis.data.managers.ChunkManager;
|
||||
import mcp.mobius.opis.data.managers.MetaManager;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
import mcp.mobius.opis.events.OpisClientTickHandler;
|
||||
import mcp.mobius.opis.gui.overlay.OverlayMeanTime;
|
||||
import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
|
||||
import mcp.mobius.opis.network.packets.server.NetDataRaw;
|
||||
import mcp.mobius.opis.swing.SwingUI;
|
||||
import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialDouble;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialInt;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialLong;
|
||||
import mcp.mobius.opis.data.holders.basetypes.TicketData;
|
||||
import mcp.mobius.opis.network.enums.AccessLevel;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.enums.Packets;
|
||||
|
||||
public class ClientMessageHandler implements IMessageHandler{
|
||||
|
||||
private static ClientMessageHandler _instance;
|
||||
private ClientMessageHandler(){}
|
||||
|
||||
public static ClientMessageHandler instance(){
|
||||
if(_instance == null)
|
||||
_instance = new ClientMessageHandler();
|
||||
return _instance;
|
||||
}
|
||||
|
||||
public void handle(Message msg, ArrayList<ISerializable> data){
|
||||
|
||||
if (msg == Message.LIST_TIMING_CHUNK){
|
||||
ChunkManager.setChunkMeanTime(data);
|
||||
}
|
||||
|
||||
else if (msg == Message.LIST_CHUNK_ENTITIES){
|
||||
OverlayEntityPerChunk.instance().setEntStats(data);
|
||||
OverlayEntityPerChunk.instance().setupEntTable();
|
||||
}
|
||||
else if (msg == Message.LIST_CHUNK_TILEENTS){
|
||||
OverlayMeanTime.instance().setupTable(data);
|
||||
}
|
||||
|
||||
else if (msg == Message.LIST_CHUNK_LOADED){
|
||||
ChunkManager.setLoadedChunks(data);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handleMessage(Message msg, NetDataRaw rawdata) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -198,7 +198,7 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
ArrayList<StatsTickHandler> timingHandlers = TickHandlerManager.getCumulatedStats();
|
||||
ArrayList<StatsEntity> timingEntities = EntityManager.getTopEntities(100);
|
||||
ArrayList<StatsTileEntity> timingTileEnts = TileEntityManager.getTopEntities(100);
|
||||
ArrayList<StatsChunk> timingChunks = ChunkManager.getTopChunks(100);
|
||||
ArrayList<StatsChunk> timingChunks = ChunkManager.instance().getTopChunks(100);
|
||||
SerialDouble totalTimeTE = new SerialDouble(TileEntityManager.getTotalUpdateTime());
|
||||
SerialDouble totalTimeEnt = new SerialDouble(EntityManager.getTotalUpdateTime());
|
||||
SerialDouble totalTimeHandler = new SerialDouble(TickHandlerManager.getTotalUpdateTime());
|
||||
|
||||
@@ -62,7 +62,7 @@ public class ServerMessageHandler {
|
||||
}
|
||||
|
||||
else if (maintype == Message.OVERLAY_CHUNK_TIMING){
|
||||
ArrayList<StatsChunk> timingChunks = ChunkManager.getTopChunks(100);
|
||||
ArrayList<StatsChunk> timingChunks = ChunkManager.instance().getTopChunks(100);
|
||||
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_CHUNK, timingChunks), (Player)player);
|
||||
}
|
||||
|
||||
@@ -77,11 +77,11 @@ public class ServerMessageHandler {
|
||||
else if (maintype == Message.LIST_CHUNK_LOADED){
|
||||
PlayerTracker.instance().playerOverlayStatus.put(player, OverlayStatus.CHUNKSTATUS);
|
||||
PlayerTracker.instance().playerDimension.put(player, ((SerialInt)param1).value);
|
||||
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_CHUNK_LOADED, ChunkManager.getLoadedChunks(((SerialInt)param1).value)), player);
|
||||
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_CHUNK_LOADED, ChunkManager.instance().getLoadedChunks(((SerialInt)param1).value)), player);
|
||||
}
|
||||
|
||||
else if (maintype == Message.LIST_CHUNK_TICKETS){
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_Tickets.create(ChunkManager.getTickets()), player);
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_Tickets.create(ChunkManager.instance().getTickets()), player);
|
||||
}
|
||||
|
||||
else if (maintype == Message.LIST_TIMING_TILEENTS){
|
||||
@@ -106,7 +106,7 @@ public class ServerMessageHandler {
|
||||
}
|
||||
|
||||
else if (maintype == Message.LIST_TIMING_CHUNK){
|
||||
ArrayList<StatsChunk> timingChunks = ChunkManager.getTopChunks(100);
|
||||
ArrayList<StatsChunk> timingChunks = ChunkManager.instance().getTopChunks(100);
|
||||
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_CHUNK, timingChunks), (Player)player);
|
||||
}
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ import mcp.mobius.opis.data.holders.stats.StatsEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsMod;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
|
||||
import mcp.mobius.opis.data.managers.ChunkManager;
|
||||
import mcp.mobius.opis.data.managers.MetaManager;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
import mcp.mobius.opis.gui.font.Fonts;
|
||||
@@ -106,7 +107,13 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{
|
||||
|
||||
MessageHandlerRegistrar.instance().registerHandler(Message.CLIENT_CLEAR_SELECTION, modOpis.proxy);
|
||||
MessageHandlerRegistrar.instance().registerHandler(Message.CLIENT_START_PROFILING, modOpis.proxy);
|
||||
MessageHandlerRegistrar.instance().registerHandler(Message.CLIENT_SHOW_RENDER_TICK, modOpis.proxy);
|
||||
MessageHandlerRegistrar.instance().registerHandler(Message.CLIENT_SHOW_RENDER_TICK, modOpis.proxy);
|
||||
|
||||
MessageHandlerRegistrar.instance().registerHandler(Message.LIST_CHUNK_ENTITIES, OverlayEntityPerChunk.instance());
|
||||
MessageHandlerRegistrar.instance().registerHandler(Message.LIST_CHUNK_TILEENTS, OverlayMeanTime.instance());
|
||||
|
||||
MessageHandlerRegistrar.instance().registerHandler(Message.LIST_TIMING_CHUNK, ChunkManager.instance());
|
||||
MessageHandlerRegistrar.instance().registerHandler(Message.LIST_CHUNK_LOADED, ChunkManager.instance());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user