diff --git a/mcp/mobius/opis/commands/server/CommandTimingEntities.java b/mcp/mobius/opis/commands/server/CommandTimingEntities.java index 74a1978..dfe6cdd 100644 --- a/mcp/mobius/opis/commands/server/CommandTimingEntities.java +++ b/mcp/mobius/opis/commands/server/CommandTimingEntities.java @@ -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; diff --git a/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java b/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java index 11bbd43..5e87b56 100644 --- a/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java +++ b/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java @@ -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; diff --git a/mcp/mobius/opis/data/client/DataCache.java b/mcp/mobius/opis/data/client/DataCache.java index 9fe1274..f6cef70 100644 --- a/mcp/mobius/opis/data/client/DataCache.java +++ b/mcp/mobius/opis/data/client/DataCache.java @@ -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; diff --git a/mcp/mobius/opis/data/holders/stats/StatsChunkMedian.java b/mcp/mobius/opis/data/holders/stats/StatsChunkMedian.java deleted file mode 100644 index a93b2ce..0000000 --- a/mcp/mobius/opis/data/holders/stats/StatsChunkMedian.java +++ /dev/null @@ -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()); - } -} \ No newline at end of file diff --git a/mcp/mobius/opis/data/holders/stats/StatsEntity.java b/mcp/mobius/opis/data/holders/stats/StatsEntity.java deleted file mode 100644 index a3fa362..0000000 --- a/mcp/mobius/opis/data/holders/stats/StatsEntity.java +++ /dev/null @@ -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; - } - -} diff --git a/mcp/mobius/opis/data/holders/stats/StatsPlayer.java b/mcp/mobius/opis/data/holders/stats/StatsPlayer.java deleted file mode 100644 index f45f223..0000000 --- a/mcp/mobius/opis/data/holders/stats/StatsPlayer.java +++ /dev/null @@ -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); - } - -} diff --git a/mcp/mobius/opis/data/holders/stats/StatsTileEntity.java b/mcp/mobius/opis/data/holders/stats/StatsTileEntity.java deleted file mode 100644 index 37390b2..0000000 --- a/mcp/mobius/opis/data/holders/stats/StatsTileEntity.java +++ /dev/null @@ -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()); - } -} diff --git a/mcp/mobius/opis/data/managers/ChunkManager.java b/mcp/mobius/opis/data/managers/ChunkManager.java index 7e6dcaa..482de1b 100644 --- a/mcp/mobius/opis/data/managers/ChunkManager.java +++ b/mcp/mobius/opis/data/managers/ChunkManager.java @@ -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; diff --git a/mcp/mobius/opis/data/managers/EntityManager.java b/mcp/mobius/opis/data/managers/EntityManager.java index 39b9747..6b263ff 100644 --- a/mcp/mobius/opis/data/managers/EntityManager.java +++ b/mcp/mobius/opis/data/managers/EntityManager.java @@ -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 getAllEntities(){ - ArrayList entities = new ArrayList(); + public ArrayList getAllEntities(){ + ArrayList entities = new ArrayList(); 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 getEntitiesInDim(int dim){ - ArrayList entities = new ArrayList(); + public ArrayList getEntitiesInDim(int dim){ + ArrayList entities = new ArrayList(); 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> getAllEntitiesPerChunk(){ - HashMap> entities = new HashMap>(); + public HashMap> getAllEntitiesPerChunk(){ + HashMap> entities = new HashMap>(); 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> getEntitiesPerChunkInDim(int dim){ - HashMap> entities = new HashMap>(); + public HashMap> getEntitiesPerChunkInDim(int dim){ + HashMap> entities = new HashMap>(); 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()); + entities.put(chunk, new ArrayList()); //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 getEntitiesInChunk(CoordinatesChunk coord){ - ArrayList entities = new ArrayList(); + public ArrayList getEntitiesInChunk(CoordinatesChunk coord){ + ArrayList entities = new ArrayList(); 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 getAllPlayers(){ + public ArrayList getAllPlayers(){ List players = MinecraftServer.getServerConfigurationManager(MinecraftServer.getServer()).playerEntityList; - ArrayList outList = new ArrayList(); + ArrayList outList = new ArrayList(); for (Object p : players) - outList.add(new StatsPlayer((EntityPlayer) p)); + outList.add(new DataEntity().fill((EntityPlayer) p)); return outList; } diff --git a/mcp/mobius/opis/data/managers/TileEntityManager.java b/mcp/mobius/opis/data/managers/TileEntityManager.java index 89ecd31..cff217f 100644 --- a/mcp/mobius/opis/data/managers/TileEntityManager.java +++ b/mcp/mobius/opis/data/managers/TileEntityManager.java @@ -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; diff --git a/mcp/mobius/opis/events/OpisServerTickHandler.java b/mcp/mobius/opis/events/OpisServerTickHandler.java index 3b93edc..1ca30c9 100644 --- a/mcp/mobius/opis/events/OpisServerTickHandler.java +++ b/mcp/mobius/opis/events/OpisServerTickHandler.java @@ -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; diff --git a/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java b/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java index 4386de1..a30fa4c 100644 --- a/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java +++ b/mcp/mobius/opis/gui/overlay/OverlayMeanTime.java @@ -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); diff --git a/mcp/mobius/opis/gui/overlay/entperchunk/OverlayEntityPerChunk.java b/mcp/mobius/opis/gui/overlay/entperchunk/OverlayEntityPerChunk.java index 69505a0..d0c091c 100644 --- a/mcp/mobius/opis/gui/overlay/entperchunk/OverlayEntityPerChunk.java +++ b/mcp/mobius/opis/gui/overlay/entperchunk/OverlayEntityPerChunk.java @@ -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 overlayData = new HashMap(); public ArrayList reducedData = new ArrayList(); - public ArrayList entStats = new ArrayList(); + public ArrayList entStats = new ArrayList(); public CoordinatesChunk selectedChunk = null; private OverlayEntityPerChunk(){} @@ -71,7 +71,7 @@ public class OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler { public void setEntStats(ArrayList 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; } diff --git a/mcp/mobius/opis/gui/overlay/entperchunk/TableEntities.java b/mcp/mobius/opis/gui/overlay/entperchunk/TableEntities.java index 04ec776..f992371 100644 --- a/mcp/mobius/opis/gui/overlay/entperchunk/TableEntities.java +++ b/mcp/mobius/opis/gui/overlay/entperchunk/TableEntities.java @@ -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(); } diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index 95df308..3763ec6 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -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; diff --git a/mcp/mobius/opis/network/ServerMessageHandler.java b/mcp/mobius/opis/network/ServerMessageHandler.java index 7dd72c7..d61c9cf 100644 --- a/mcp/mobius/opis/network/ServerMessageHandler.java +++ b/mcp/mobius/opis/network/ServerMessageHandler.java @@ -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> entities = EntityManager.INSTANCE.getAllEntitiesPerChunk(); + HashMap> entities = EntityManager.INSTANCE.getAllEntitiesPerChunk(); HashMap perChunk = new HashMap(); for (CoordinatesChunk chunk : entities.keySet()) diff --git a/mcp/mobius/opis/proxy/ProxyClient.java b/mcp/mobius/opis/proxy/ProxyClient.java index a555be2..17de2b8 100644 --- a/mcp/mobius/opis/proxy/ProxyClient.java +++ b/mcp/mobius/opis/proxy/ProxyClient.java @@ -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; diff --git a/mcp/mobius/opis/swing/actions/ActionPlayers.java b/mcp/mobius/opis/swing/actions/ActionPlayers.java index 1188b87..1fd1453 100644 --- a/mcp/mobius/opis/swing/actions/ActionPlayers.java +++ b/mcp/mobius/opis/swing/actions/ActionPlayers.java @@ -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))); } } diff --git a/mcp/mobius/opis/swing/actions/ActionTimingEntities.java b/mcp/mobius/opis/swing/actions/ActionTimingEntities.java index 5532c1a..6c1e354 100644 --- a/mcp/mobius/opis/swing/actions/ActionTimingEntities.java +++ b/mcp/mobius/opis/swing/actions/ActionTimingEntities.java @@ -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))); } diff --git a/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java b/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java index 39290a4..6f6ca26 100644 --- a/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java +++ b/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java @@ -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(); diff --git a/mcp/mobius/opis/swing/panels/PanelPlayers.java b/mcp/mobius/opis/swing/panels/PanelPlayers.java index 5ad8c15..b73bb97 100644 --- a/mcp/mobius/opis/swing/panels/PanelPlayers.java +++ b/mcp/mobius/opis/swing/panels/PanelPlayers.java @@ -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), }); } diff --git a/mcp/mobius/opis/swing/panels/PanelTimingEntities.java b/mcp/mobius/opis/swing/panels/PanelTimingEntities.java index 1ee4797..dedb203 100644 --- a/mcp/mobius/opis/swing/panels/PanelTimingEntities.java +++ b/mcp/mobius/opis/swing/panels/PanelTimingEntities.java @@ -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; diff --git a/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java b/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java index 31296cf..17e8bf9 100644 --- a/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java +++ b/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java @@ -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;