mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-20 20:22:39 +00:00
Massive refactoring to remove all the old data system.
This commit is contained in:
1 parent
d150c22b82
commit
8bfd237ca0
23 files changed
+54
-314
No files matched your search
@@ -7,7 +7,6 @@ import cpw.mods.fml.common.network.Player;
|
||||
import mcp.mobius.opis.commands.IOpisCommand;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsEntity;
|
||||
import mcp.mobius.opis.data.managers.EntityManager;
|
||||
import mcp.mobius.opis.events.PlayerTracker;
|
||||
import mcp.mobius.opis.network.OpisPacketHandler;
|
||||
|
||||
@@ -5,7 +5,6 @@ import java.util.ArrayList;
|
||||
import cpw.mods.fml.common.network.Player;
|
||||
import mcp.mobius.opis.commands.IOpisCommand;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTileEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
|
||||
import mcp.mobius.opis.data.managers.TileEntityManager;
|
||||
import mcp.mobius.opis.events.PlayerTracker;
|
||||
import mcp.mobius.opis.network.OpisPacketHandler;
|
||||
|
||||
@@ -35,9 +35,6 @@ import mcp.mobius.opis.data.holders.basetypes.SerialInt;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialLong;
|
||||
import mcp.mobius.opis.data.holders.stats.StatAbstract;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsChunk;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsPlayer;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
|
||||
import mcp.mobius.opis.helpers.ModIdentification;
|
||||
import mcp.mobius.opis.network.enums.AccessLevel;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
package mcp.mobius.opis.data.holders.stats;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import net.minecraft.world.ChunkCoordIntPair;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
|
||||
public class StatsChunkMedian extends StatAbstract{
|
||||
|
||||
public StatsChunkMedian(){}
|
||||
|
||||
public StatsChunkMedian(CoordinatesChunk chunk){
|
||||
this.chunk = chunk;
|
||||
this.coord = chunk.asCoordinatesBlock();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToStream(DataOutputStream stream) throws IOException{
|
||||
this.chunk.writeToStream(stream);
|
||||
}
|
||||
|
||||
public static StatsChunkMedian readFromStream(DataInputStream stream) throws IOException {
|
||||
CoordinatesChunk chunk = CoordinatesChunk.readFromStream(stream);
|
||||
StatsChunkMedian chunkStats = new StatsChunkMedian(chunk);
|
||||
return chunkStats;
|
||||
}
|
||||
|
||||
public String toString(){
|
||||
return String.format("%.3f µs", this.getGeometricMean());
|
||||
}
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
package mcp.mobius.opis.data.holders.stats;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import net.minecraft.network.packet.Packet;
|
||||
|
||||
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
|
||||
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
|
||||
public class StatsEntity extends StatAbstract implements ISerializable {
|
||||
|
||||
private int entId;
|
||||
private double cachedMedian = -1.0;
|
||||
|
||||
public StatsEntity(int entId, String name, int dim, double x, double y, double z){
|
||||
this.entId = entId;
|
||||
this.name = name;
|
||||
this.coord = new CoordinatesBlock(dim, x, y, z);
|
||||
this.chunk = this.coord.asCoordinatesChunk();
|
||||
}
|
||||
|
||||
public StatsEntity(int entId, String name, CoordinatesBlock coord){
|
||||
this.entId = entId;
|
||||
this.name = name;
|
||||
this.coord = coord;
|
||||
this.chunk = this.coord.asCoordinatesChunk();
|
||||
}
|
||||
|
||||
public int getID(){ return this.entId; }
|
||||
|
||||
public double getMedian(){
|
||||
if (this.cachedMedian < 0.0){
|
||||
int ndata = (int)this.dstat.getN();
|
||||
if (ndata == 1)
|
||||
return this.dstat.getElement(0);
|
||||
|
||||
if (ndata % 2 == 1)
|
||||
return this.dstat.getSortedValues()[ndata/2];
|
||||
|
||||
if (ndata % 2 == 0)
|
||||
return (this.dstat.getSortedValues()[ndata/2 - 1] + this.dstat.getSortedValues()[ndata/2]) / 2;
|
||||
}
|
||||
return this.cachedMedian;
|
||||
}
|
||||
|
||||
public String toString(){
|
||||
return String.format("%.3f µs", this.getGeometricMean());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToStream(DataOutputStream stream) throws IOException{
|
||||
this.coord.writeToStream(stream);
|
||||
stream.writeInt(this.entId);
|
||||
Packet.writeString(this.name, stream);
|
||||
stream.writeDouble(this.getGeometricMean());
|
||||
stream.writeLong(this.getDataPoints());
|
||||
}
|
||||
|
||||
public static StatsEntity readFromStream(DataInputStream stream) throws IOException {
|
||||
CoordinatesBlock coord = CoordinatesBlock.readFromStream(stream);
|
||||
StatsEntity stats = new StatsEntity(stream.readInt(), Packet.readString(stream, 255), coord);
|
||||
stats.setGeometricMean(stream.readDouble());
|
||||
stats.setDataPoints(stream.readLong());
|
||||
return stats;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
package mcp.mobius.opis.data.holders.stats;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.network.packet.Packet;
|
||||
|
||||
public class StatsPlayer extends StatAbstract {
|
||||
|
||||
int eid;
|
||||
|
||||
public StatsPlayer(EntityPlayer player){
|
||||
this.eid = player.entityId;
|
||||
this.name = player.username;
|
||||
this.coord = new CoordinatesBlock(player.worldObj.provider.dimensionId, player.posX, player.posY, player.posZ);
|
||||
this.chunk = this.coord.asCoordinatesChunk();
|
||||
}
|
||||
|
||||
public StatsPlayer(String name, int eid, CoordinatesBlock coord){
|
||||
this.eid = eid;
|
||||
this.name = name;
|
||||
this.coord = coord;
|
||||
this.chunk = coord.asCoordinatesChunk();
|
||||
}
|
||||
|
||||
public int getEID(){
|
||||
return this.eid;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToStream(DataOutputStream stream) throws IOException {
|
||||
stream.writeInt(this.eid);
|
||||
this.coord.writeToStream(stream);
|
||||
Packet.writeString(this.name, stream);
|
||||
}
|
||||
|
||||
public static StatsPlayer readFromStream(DataInputStream stream) throws IOException {
|
||||
int eid = stream.readInt();
|
||||
CoordinatesBlock coords = CoordinatesBlock.readFromStream(stream);
|
||||
String name = Packet.readString(stream, 255);
|
||||
return new StatsPlayer(name, eid, coords);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,84 +0,0 @@
|
||||
package mcp.mobius.opis.data.holders.stats;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import net.minecraft.network.packet.Packet;
|
||||
|
||||
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
|
||||
|
||||
public class StatsTileEntity extends StatAbstract implements ISerializable {
|
||||
|
||||
private int blockID;
|
||||
private short blockMeta;
|
||||
private double cachedMedian = -1.0;
|
||||
|
||||
|
||||
public StatsTileEntity(CoordinatesBlock coord, int blockID, short blockMeta){
|
||||
this.coord = coord;
|
||||
this.chunk = coord.asCoordinatesChunk();
|
||||
//this.name = teclass;
|
||||
this.blockID = blockID;
|
||||
this.blockMeta = blockMeta;
|
||||
}
|
||||
|
||||
public int getID(){
|
||||
return this.blockID;
|
||||
}
|
||||
|
||||
public short getMeta(){
|
||||
return this.blockMeta;
|
||||
}
|
||||
|
||||
public void setBlock(int ID, short meta){
|
||||
this.blockID = ID;
|
||||
this.blockMeta = meta;
|
||||
}
|
||||
|
||||
public double getMedian(){
|
||||
if (this.cachedMedian < 0.0){
|
||||
int ndata = (int)this.dstat.getN();
|
||||
if (ndata == 1)
|
||||
return this.dstat.getElement(0);
|
||||
|
||||
if (ndata % 2 == 1)
|
||||
return this.dstat.getSortedValues()[ndata/2];
|
||||
|
||||
if (ndata % 2 == 0)
|
||||
return (this.dstat.getSortedValues()[ndata/2 - 1] + this.dstat.getSortedValues()[ndata/2]) / 2;
|
||||
}
|
||||
return this.cachedMedian;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToStream(DataOutputStream stream) throws IOException{
|
||||
this.coord.writeToStream(stream);
|
||||
//Packet.writeString(this.name, stream);
|
||||
stream.writeInt(this.blockID);
|
||||
stream.writeShort(this.blockMeta);
|
||||
stream.writeDouble(this.getGeometricMean());
|
||||
}
|
||||
|
||||
public static StatsTileEntity readFromStream(DataInputStream stream) throws IOException {
|
||||
CoordinatesBlock coord = CoordinatesBlock.readFromStream(stream);
|
||||
int blockID = stream.readInt();
|
||||
short blockMeta = stream.readShort();
|
||||
//String classname = Packet.readString(stream, 255);
|
||||
StatsTileEntity stat = new StatsTileEntity(coord, blockID, blockMeta);
|
||||
stat.setGeometricMean(stream.readDouble());
|
||||
return stat;
|
||||
}
|
||||
|
||||
/*
|
||||
public String toString(){
|
||||
return String.format("[%d:%d] %s %s", this.blockID, this.blockMeta, this.coord, this.getGeometricMean());
|
||||
}
|
||||
*/
|
||||
public String toString(){
|
||||
return String.format("%.3f µs", this.getGeometricMean());
|
||||
}
|
||||
}
|
||||
@@ -18,8 +18,6 @@ import mcp.mobius.opis.data.holders.basetypes.TicketData;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTileEntity;
|
||||
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.data.profilers.ProfilerEntityUpdate;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerTileEntityUpdate;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
|
||||
@@ -36,8 +36,6 @@ import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsPlayer;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerEntityUpdate;
|
||||
import mcp.mobius.opis.helpers.Teleport;
|
||||
|
||||
@@ -67,8 +65,8 @@ public enum EntityManager {
|
||||
}
|
||||
|
||||
/* Returns all the entities in all dimensions (without timing data) */
|
||||
public ArrayList<StatsEntity> getAllEntities(){
|
||||
ArrayList<StatsEntity> entities = new ArrayList<StatsEntity>();
|
||||
public ArrayList<DataEntity> getAllEntities(){
|
||||
ArrayList<DataEntity> entities = new ArrayList<DataEntity>();
|
||||
for (int i : DimensionManager.getIDs()){
|
||||
entities.addAll(this.getEntitiesInDim(i));
|
||||
}
|
||||
@@ -76,8 +74,8 @@ public enum EntityManager {
|
||||
}
|
||||
|
||||
/* Returns all the entities in the given dimension (without timing data) */
|
||||
public ArrayList<StatsEntity> getEntitiesInDim(int dim){
|
||||
ArrayList<StatsEntity> entities = new ArrayList<StatsEntity>();
|
||||
public ArrayList<DataEntity> getEntitiesInDim(int dim){
|
||||
ArrayList<DataEntity> entities = new ArrayList<DataEntity>();
|
||||
|
||||
World world = DimensionManager.getWorld(dim);
|
||||
if (world == null) return entities;
|
||||
@@ -86,16 +84,15 @@ public enum EntityManager {
|
||||
|
||||
for (int i = 0; i < copyList.size(); i++){
|
||||
Entity ent = (Entity)copyList.get(i);
|
||||
//entities.add(new EntityStats(ent.entityId, ent.getClass().getName(), ent.dimension, ent.posX, ent.posY, ent.posZ));
|
||||
entities.add(new StatsEntity(ent.entityId, getEntityName(ent), ent.dimension, ent.posX, ent.posY, ent.posZ));
|
||||
entities.add(new DataEntity().fill(ent));
|
||||
}
|
||||
|
||||
return entities;
|
||||
}
|
||||
|
||||
/* Returns a hashmap of all entities per chunk (not timing) */
|
||||
public HashMap<CoordinatesChunk, ArrayList<StatsEntity>> getAllEntitiesPerChunk(){
|
||||
HashMap<CoordinatesChunk, ArrayList<StatsEntity>> entities = new HashMap<CoordinatesChunk, ArrayList<StatsEntity>>();
|
||||
public HashMap<CoordinatesChunk, ArrayList<DataEntity>> getAllEntitiesPerChunk(){
|
||||
HashMap<CoordinatesChunk, ArrayList<DataEntity>> entities = new HashMap<CoordinatesChunk, ArrayList<DataEntity>>();
|
||||
for (int i : DimensionManager.getIDs()){
|
||||
entities.putAll(this.getEntitiesPerChunkInDim(i));
|
||||
}
|
||||
@@ -103,8 +100,8 @@ public enum EntityManager {
|
||||
}
|
||||
|
||||
/* Returns a hashmap of entities in the given dimension (not timing) */
|
||||
public HashMap<CoordinatesChunk, ArrayList<StatsEntity>> getEntitiesPerChunkInDim(int dim){
|
||||
HashMap<CoordinatesChunk, ArrayList<StatsEntity>> entities = new HashMap<CoordinatesChunk, ArrayList<StatsEntity>>();
|
||||
public HashMap<CoordinatesChunk, ArrayList<DataEntity>> getEntitiesPerChunkInDim(int dim){
|
||||
HashMap<CoordinatesChunk, ArrayList<DataEntity>> entities = new HashMap<CoordinatesChunk, ArrayList<DataEntity>>();
|
||||
World world = DimensionManager.getWorld(dim);
|
||||
if (world == null) return entities;
|
||||
|
||||
@@ -115,18 +112,18 @@ public enum EntityManager {
|
||||
CoordinatesChunk chunk = new CoordinatesBlock(ent.dimension, (int)ent.posX, (int)ent.posY, (int)ent.posZ).asCoordinatesChunk();
|
||||
|
||||
if (!entities.containsKey(chunk))
|
||||
entities.put(chunk, new ArrayList<StatsEntity>());
|
||||
entities.put(chunk, new ArrayList<DataEntity>());
|
||||
|
||||
//entities.get(chunk).add(new EntityStats(ent.entityId, ent.getClass().getName(), ent.dimension, ent.posX, ent.posY, ent.posZ));
|
||||
entities.get(chunk).add(new StatsEntity(ent.entityId, getEntityName(ent), ent.dimension, ent.posX, ent.posY, ent.posZ));
|
||||
entities.get(chunk).add(new DataEntity().fill(ent));
|
||||
}
|
||||
|
||||
return entities;
|
||||
}
|
||||
|
||||
/* Returns an array of all entities in a given chunk */
|
||||
public ArrayList<StatsEntity> getEntitiesInChunk(CoordinatesChunk coord){
|
||||
ArrayList<StatsEntity> entities = new ArrayList<StatsEntity>();
|
||||
public ArrayList<DataEntity> getEntitiesInChunk(CoordinatesChunk coord){
|
||||
ArrayList<DataEntity> entities = new ArrayList<DataEntity>();
|
||||
|
||||
World world = DimensionManager.getWorld(coord.dim);
|
||||
if (world == null) return entities;
|
||||
@@ -138,7 +135,7 @@ public enum EntityManager {
|
||||
CoordinatesChunk chunk = new CoordinatesBlock(ent.dimension, (int)ent.posX, (int)ent.posY, (int)ent.posZ).asCoordinatesChunk();
|
||||
if (chunk.equals(coord))
|
||||
//entities.add(new EntityStats(ent.entityId, ent.getClass().getName(), ent.dimension, ent.posX, ent.posY, ent.posZ));
|
||||
entities.add(new StatsEntity(ent.entityId, getEntityName(ent), ent.dimension, ent.posX, ent.posY, ent.posZ));
|
||||
entities.add(new DataEntity().fill(ent));
|
||||
}
|
||||
|
||||
return entities;
|
||||
@@ -296,12 +293,12 @@ public enum EntityManager {
|
||||
return nkilled;
|
||||
}
|
||||
|
||||
public ArrayList<StatsPlayer> getAllPlayers(){
|
||||
public ArrayList<DataEntity> getAllPlayers(){
|
||||
List players = MinecraftServer.getServerConfigurationManager(MinecraftServer.getServer()).playerEntityList;
|
||||
ArrayList<StatsPlayer> outList = new ArrayList<StatsPlayer>();
|
||||
ArrayList<DataEntity> outList = new ArrayList<DataEntity>();
|
||||
|
||||
for (Object p : players)
|
||||
outList.add(new StatsPlayer((EntityPlayer) p));
|
||||
outList.add(new DataEntity().fill((EntityPlayer) p));
|
||||
|
||||
return outList;
|
||||
}
|
||||
|
||||
@@ -12,7 +12,6 @@ import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTileEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsChunk;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerTileEntityUpdate;
|
||||
import mcp.mobius.opis.helpers.ModIdentification;
|
||||
import net.minecraft.block.Block;
|
||||
|
||||
@@ -21,9 +21,6 @@ import mcp.mobius.opis.data.holders.basetypes.SerialLong;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataDimension;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsChunk;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsChunkMedian;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
|
||||
import mcp.mobius.opis.data.managers.ChunkManager;
|
||||
import mcp.mobius.opis.data.managers.EntityManager;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
|
||||
@@ -25,7 +25,6 @@ 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.newtypes.DataTileEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
|
||||
import mcp.mobius.opis.data.managers.ChunkManager;
|
||||
import mcp.mobius.opis.gui.events.MouseEvent;
|
||||
import mcp.mobius.opis.gui.interfaces.CType;
|
||||
@@ -62,7 +61,7 @@ public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{
|
||||
public void onMouseClick(MouseEvent event){
|
||||
TableRow row = this.getRow(event.x, event.y);
|
||||
if (row != null){
|
||||
CoordinatesBlock coord = ((StatsTileEntity)row.getObject()).getCoordinates();
|
||||
CoordinatesBlock coord = ((DataTileEntity)row.getObject()).pos;
|
||||
|
||||
if (this.mapView.getX() != coord.x || this.mapView.getZ() != coord.z){
|
||||
this.mapView.setViewCentre(coord.x, coord.z);
|
||||
|
||||
@@ -19,7 +19,7 @@ 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.stats.StatsEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.gui.events.MouseEvent;
|
||||
import mcp.mobius.opis.gui.interfaces.CType;
|
||||
import mcp.mobius.opis.gui.interfaces.IWidget;
|
||||
@@ -57,7 +57,7 @@ public class OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler {
|
||||
public LayoutCanvas canvas = null;
|
||||
public HashMap<CoordinatesChunk, Integer> overlayData = new HashMap<CoordinatesChunk, Integer>();
|
||||
public ArrayList<ReducedData> reducedData = new ArrayList<ReducedData>();
|
||||
public ArrayList<StatsEntity> entStats = new ArrayList<StatsEntity>();
|
||||
public ArrayList<DataEntity> entStats = new ArrayList<DataEntity>();
|
||||
public CoordinatesChunk selectedChunk = null;
|
||||
|
||||
private OverlayEntityPerChunk(){}
|
||||
@@ -71,7 +71,7 @@ public class OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler {
|
||||
public void setEntStats(ArrayList<ISerializable> data){
|
||||
this.entStats.clear();
|
||||
for (ISerializable stat : data)
|
||||
this.entStats.add((StatsEntity)stat);
|
||||
this.entStats.add((DataEntity)stat);
|
||||
}
|
||||
|
||||
public void reduceData(){
|
||||
@@ -239,13 +239,13 @@ public class OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler {
|
||||
.setFontSize(1.0f);
|
||||
|
||||
int nrows = 0;
|
||||
for (StatsEntity data : this.entStats){
|
||||
for (DataEntity data : this.entStats){
|
||||
//String[] namelst = data.getName().split("\\.");
|
||||
//String name = namelst[namelst.length - 1];
|
||||
|
||||
String name = data.getName();
|
||||
String name = data.name;
|
||||
|
||||
table.addRow(data, name, String.format("[ %d %d %d ]", data.getCoordinates().x, data.getCoordinates().y, data.getCoordinates().z));
|
||||
table.addRow(data, name, String.format("[ %d %d %d ]", data.pos.x, data.pos.y, data.pos.z));
|
||||
nrows++;
|
||||
if (nrows > 100) break;
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ import mapwriter.map.MapView;
|
||||
import mapwriter.map.mapmode.MapMode;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.holders.basetypes.TargetEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.gui.events.MouseEvent;
|
||||
import mcp.mobius.opis.gui.interfaces.IWidget;
|
||||
import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk.ReducedData;
|
||||
@@ -37,8 +37,8 @@ public class TableEntities extends ViewTable {
|
||||
if (row != null){
|
||||
//CoordinatesBlock coord = ((EntityStats)row.getObject()).getCoord();
|
||||
//PacketDispatcher.sendPacketToServer(Packet_ReqTeleport.create(coord));
|
||||
int eid = ((StatsEntity)row.getObject()).getID();
|
||||
int dim = ((StatsEntity)row.getObject()).getCoordinates().dim;
|
||||
int eid = ((DataEntity)row.getObject()).eid;
|
||||
int dim = ((DataEntity)row.getObject()).pos.dim;
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_TO_ENTITY, new TargetEntity(eid, dim)));
|
||||
Minecraft.getMinecraft().setIngameFocus();
|
||||
}
|
||||
|
||||
@@ -27,8 +27,6 @@ import mcp.mobius.opis.data.holders.newtypes.DataHandler;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTileEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
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.data.managers.ChunkManager;
|
||||
import mcp.mobius.opis.data.managers.EntityManager;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
|
||||
@@ -29,8 +29,6 @@ import mcp.mobius.opis.data.holders.newtypes.DataHandler;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTileEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
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.data.managers.ChunkManager;
|
||||
import mcp.mobius.opis.data.managers.EntityManager;
|
||||
import mcp.mobius.opis.data.managers.MetaManager;
|
||||
@@ -211,7 +209,7 @@ public class ServerMessageHandler {
|
||||
|
||||
public void handleOverlayChunkEntities(CoordinatesChunk coord, Player player){
|
||||
|
||||
HashMap<CoordinatesChunk, ArrayList<StatsEntity>> entities = EntityManager.INSTANCE.getAllEntitiesPerChunk();
|
||||
HashMap<CoordinatesChunk, ArrayList<DataEntity>> entities = EntityManager.INSTANCE.getAllEntitiesPerChunk();
|
||||
HashMap<CoordinatesChunk, Integer> perChunk = new HashMap<CoordinatesChunk, Integer>();
|
||||
|
||||
for (CoordinatesChunk chunk : entities.keySet())
|
||||
|
||||
@@ -17,8 +17,6 @@ import mcp.mobius.opis.api.TabPanelRegistrar;
|
||||
import mcp.mobius.opis.data.client.DataCache;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataHandler;
|
||||
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.data.managers.ChunkManager;
|
||||
import mcp.mobius.opis.data.managers.MetaManager;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
|
||||
@@ -20,8 +20,8 @@ import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
import mcp.mobius.opis.api.TabPanelRegistrar;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.holders.basetypes.TargetEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatAbstract;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsPlayer;
|
||||
import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk;
|
||||
import mcp.mobius.opis.swing.widgets.JPanelMsgHandler;
|
||||
import mcp.mobius.opis.swing.widgets.JTableStats;
|
||||
@@ -36,27 +36,27 @@ public class ActionPlayers implements ActionListener {
|
||||
JTableStats table = panel.getTable();
|
||||
if (table == null || table.getSelectedRow() == -1) return;
|
||||
int indexData = table.convertRowIndexToModel(table.getSelectedRow());
|
||||
StatsPlayer data = (StatsPlayer)table.getTableData().get(indexData);
|
||||
DataEntity data = (DataEntity)table.getTableData().get(indexData);
|
||||
|
||||
if (e.getSource() == panel.getBtnCenter()){
|
||||
CoordinatesBlock coord = data.getCoordinates();
|
||||
CoordinatesBlock coord = data.pos;
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.OVERLAY_CHUNK_ENTITIES));
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_ENTITIES, data.getChunk()));
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_ENTITIES, data.pos.asCoordinatesChunk()));
|
||||
OverlayEntityPerChunk.instance().selectedChunk = coord.asCoordinatesChunk();
|
||||
MwAPI.setCurrentDataProvider(OverlayEntityPerChunk.instance());
|
||||
Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z));
|
||||
}
|
||||
|
||||
if (e.getSource() == panel.getBtnTeleport()){
|
||||
int eid = data.getEID();
|
||||
int dim = data.getCoordinates().dim;
|
||||
int eid = data.eid;
|
||||
int dim = data.pos.dim;
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_TO_ENTITY, new TargetEntity(eid, dim)));
|
||||
Minecraft.getMinecraft().setIngameFocus();
|
||||
}
|
||||
|
||||
if (e.getSource() == panel.getBtnPull()){
|
||||
int eid = data.getEID();
|
||||
int dim = data.getCoordinates().dim;
|
||||
int eid = data.eid;
|
||||
int dim = data.pos.dim;
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_PULL_ENTITY, new TargetEntity(eid, dim)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,8 +20,8 @@ import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
import mcp.mobius.opis.api.TabPanelRegistrar;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.holders.basetypes.TargetEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatAbstract;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsEntity;
|
||||
import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk;
|
||||
import mcp.mobius.opis.swing.widgets.JPanelMsgHandler;
|
||||
import mcp.mobius.opis.swing.widgets.JTableStats;
|
||||
@@ -36,27 +36,27 @@ public class ActionTimingEntities implements ActionListener {
|
||||
JTableStats table = panel.getTable();
|
||||
if (table == null || table.getSelectedRow() == -1) return;
|
||||
int indexData = table.convertRowIndexToModel(table.getSelectedRow());
|
||||
StatsEntity data = (StatsEntity)table.getTableData().get(indexData);
|
||||
DataEntity data = (DataEntity)table.getTableData().get(indexData);
|
||||
|
||||
if (e.getSource() == panel.getBtnCenter()){
|
||||
CoordinatesBlock coord = data.getCoordinates();
|
||||
CoordinatesBlock coord = data.pos;
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.OVERLAY_CHUNK_ENTITIES));
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_ENTITIES, data.getChunk()));
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_CHUNK_ENTITIES, data.pos.asCoordinatesChunk()));
|
||||
MwAPI.setCurrentDataProvider(OverlayEntityPerChunk.instance());
|
||||
OverlayEntityPerChunk.instance().selectedChunk = coord.asCoordinatesChunk();
|
||||
Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z));
|
||||
}
|
||||
|
||||
if (e.getSource() == panel.getBtnTeleport()){
|
||||
int eid = data.getID();
|
||||
int dim = data.getCoordinates().dim;
|
||||
int eid = data.eid;
|
||||
int dim = data.pos.dim;
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_TO_ENTITY, new TargetEntity(eid, dim)));
|
||||
Minecraft.getMinecraft().setIngameFocus();
|
||||
}
|
||||
|
||||
if (e.getSource() == panel.getBtnPull()){
|
||||
int eid = data.getID();
|
||||
int dim = data.getCoordinates().dim;
|
||||
int eid = data.eid;
|
||||
int dim = data.pos.dim;
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_PULL_ENTITY, new TargetEntity(eid, dim)));
|
||||
}
|
||||
|
||||
|
||||
@@ -20,8 +20,7 @@ import javax.swing.JButton;
|
||||
import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
import mcp.mobius.opis.api.TabPanelRegistrar;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.holders.stats.StatAbstract;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTileEntity;
|
||||
import mcp.mobius.opis.gui.overlay.OverlayMeanTime;
|
||||
import mcp.mobius.opis.swing.widgets.JPanelMsgHandler;
|
||||
import mcp.mobius.opis.swing.widgets.JTableStats;
|
||||
@@ -36,17 +35,17 @@ public class ActionTimingTileEnts implements ActionListener {
|
||||
JTableStats table = panel.getTable();
|
||||
if (table == null || table.getSelectedRow() == -1) return;
|
||||
int indexData = table.convertRowIndexToModel(table.getSelectedRow());
|
||||
StatsTileEntity data = (StatsTileEntity)table.getTableData().get(indexData);
|
||||
DataTileEntity data = (DataTileEntity)table.getTableData().get(indexData);
|
||||
|
||||
if (e.getSource() == panel.getBtnCenter()){
|
||||
CoordinatesBlock coord = data.getCoordinates();
|
||||
CoordinatesBlock coord = data.pos;
|
||||
OverlayMeanTime.instance().setSelectedChunk(coord.dim, coord.x >> 4, coord.z >> 4);
|
||||
MwAPI.setCurrentDataProvider(OverlayMeanTime.instance());
|
||||
Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z));
|
||||
}
|
||||
|
||||
if (e.getSource() == panel.getBtnTeleport()){
|
||||
CoordinatesBlock coord = data.getCoordinates();
|
||||
CoordinatesBlock coord = data.pos;
|
||||
modOpis.selectedBlock = coord;
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.COMMAND_TELEPORT_BLOCK, coord));
|
||||
Minecraft.getMinecraft().setIngameFocus();
|
||||
|
||||
@@ -4,7 +4,7 @@ import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
|
||||
import mcp.mobius.opis.api.ITabPanel;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsPlayer;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk;
|
||||
import mcp.mobius.opis.network.enums.AccessLevel;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
@@ -100,14 +100,14 @@ public class PanelPlayers extends JPanelMsgHandler implements ITabPanel{
|
||||
((JTableStats)this.getTable()).setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)this.getTable().getModel();
|
||||
int row = this.updateData(table, model, StatsPlayer.class);
|
||||
int row = this.updateData(table, model, DataEntity.class);
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
StatsPlayer player = (StatsPlayer)o;
|
||||
DataEntity player = (DataEntity)o;
|
||||
model.addRow(new Object[] {
|
||||
player.getName(),
|
||||
player.getCoordinates().dim,
|
||||
String.format("[ %4d %4d %4d ]", player.getCoordinates().x, player.getCoordinates().y, player.getCoordinates().z),
|
||||
player.name,
|
||||
player.pos.dim,
|
||||
String.format("[ %4d %4d %4d ]", player.pos.x, player.pos.y, player.pos.z),
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,6 @@ import mcp.mobius.opis.data.holders.basetypes.SerialDouble;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatAbstract;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsEntity;
|
||||
import mcp.mobius.opis.gui.overlay.entperchunk.OverlayEntityPerChunk;
|
||||
import mcp.mobius.opis.network.enums.AccessLevel;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
|
||||
@@ -10,7 +10,6 @@ import mcp.mobius.opis.data.holders.basetypes.SerialDouble;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTileEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatAbstract;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
|
||||
import mcp.mobius.opis.gui.overlay.OverlayMeanTime;
|
||||
import mcp.mobius.opis.helpers.ModIdentification;
|
||||
import mcp.mobius.opis.network.enums.AccessLevel;
|
||||
|
||||
Reference in new issue
Block a user