mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-19 11:59:05 +00:00
Better orphan detection
This commit is contained in:
1 parent
25c1684e4a
commit
1beaf6c4e7
21 files changed
+86
-26
No files matched your search
@@ -14,23 +14,39 @@ public class DataTileEntity implements ISerializable {
|
||||
|
||||
public CachedString clazz;
|
||||
public CoordinatesBlock pos;
|
||||
public int hashCode;
|
||||
public boolean isValid;
|
||||
|
||||
public DataTileEntity fill(TileEntity tileEntity){
|
||||
this.pos = new CoordinatesBlock(tileEntity.worldObj.provider.dimensionId, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
|
||||
this.clazz = new CachedString(tileEntity.getClass().getCanonicalName());
|
||||
this.pos = new CoordinatesBlock(tileEntity.worldObj.provider.dimensionId, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
|
||||
this.clazz = new CachedString(tileEntity.getClass().getCanonicalName());
|
||||
this.hashCode = System.identityHashCode(tileEntity);
|
||||
this.isValid = !tileEntity.isInvalid();
|
||||
return this;
|
||||
}
|
||||
|
||||
public DataTileEntity fill(CoordinatesBlock coord, String clazz, int hashCode, boolean isInvalid){
|
||||
this.pos = coord;
|
||||
this.clazz = new CachedString(clazz);
|
||||
this.hashCode = hashCode;
|
||||
this.isValid = !isInvalid;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToStream(DataOutputStream stream) throws IOException {
|
||||
this.clazz.writeToStream(stream);
|
||||
this.pos.writeToStream(stream);
|
||||
stream.writeInt(this.hashCode);
|
||||
stream.writeBoolean(this.isValid);
|
||||
}
|
||||
|
||||
public static DataTileEntity readFromStream(DataInputStream stream) throws IOException {
|
||||
DataTileEntity retVal = new DataTileEntity();
|
||||
retVal.clazz = CachedString.readFromStream(stream);
|
||||
retVal.pos = CoordinatesBlock.readFromStream(stream);
|
||||
retVal.hashCode = stream.readInt();
|
||||
retVal.isValid = stream.readBoolean();
|
||||
return retVal;
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
|
||||
import mcp.mobius.mobiuscore.profiler.ProfilerSection;
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntity;
|
||||
@@ -117,17 +118,40 @@ public enum TileEntityManager {
|
||||
|
||||
public ArrayList<DataTileEntity> getOrphans(){
|
||||
ArrayList<DataTileEntity> orphans = new ArrayList<DataTileEntity>();
|
||||
HashMap<CoordinatesBlock, String> locsStr = new HashMap<CoordinatesBlock, String>();
|
||||
HashMap<CoordinatesBlock, Integer> locsInt = new HashMap<CoordinatesBlock, Integer>();
|
||||
HashMap<CoordinatesBlock, Boolean> locsBool = new HashMap<CoordinatesBlock, Boolean>();
|
||||
HashSet<CoordinatesBlock> coordFound = new HashSet<CoordinatesBlock>();
|
||||
|
||||
for (WorldServer world : DimensionManager.getWorlds()){
|
||||
for (Object o : world.loadedTileEntityList){
|
||||
TileEntity tileEntity = (TileEntity)o;
|
||||
CoordinatesBlock coord = new CoordinatesBlock(world.provider.dimensionId, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
|
||||
|
||||
int id = world.getBlockId(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
|
||||
if (id == 0 || Block.blocksList[id] == null || world.getBlockTileEntity(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord).getClass() != tileEntity.getClass()){
|
||||
if (id == 0 || Block.blocksList[id] == null
|
||||
|| !Block.blocksList[id].hasTileEntity()
|
||||
|| world.getBlockTileEntity(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord) == null
|
||||
|| world.getBlockTileEntity(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord).getClass() != tileEntity.getClass()){
|
||||
orphans.add(new DataTileEntity().fill(tileEntity));
|
||||
}
|
||||
|
||||
if (locsStr.containsKey(coord)){
|
||||
orphans.add(new DataTileEntity().fill(tileEntity));
|
||||
if (!coordFound.contains(coord)){
|
||||
orphans.add(new DataTileEntity().fill(coord, locsStr.get(coord), locsInt.get(coord), locsBool.get(coord)));
|
||||
coordFound.add(coord);
|
||||
}
|
||||
} else {
|
||||
locsStr.put(coord, tileEntity.getClass().getCanonicalName());
|
||||
locsInt.put(coord, System.identityHashCode(tileEntity));
|
||||
locsBool.put(coord, tileEntity.isInvalid());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
modOpis.log.warning(String.format("Found %d potential orphans !", orphans.size()));
|
||||
|
||||
return orphans;
|
||||
}
|
||||
}
|
||||
@@ -73,7 +73,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import cpw.mods.fml.common.registry.TickRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
|
||||
@Mod(modid="Opis", name="Opis", version="1.2.2_dev5")
|
||||
@Mod(modid="Opis", name="Opis", version="1.2.2_dev6")
|
||||
@NetworkMod(channels={"Opis", "Opis_Chunk"},clientSideRequired=false, serverSideRequired=false, connectionHandler=OpisConnectionHandler.class, packetHandler=OpisPacketHandler.class)
|
||||
|
||||
public class modOpis {
|
||||
|
||||
@@ -223,7 +223,8 @@ public class ServerMessageHandler {
|
||||
}
|
||||
|
||||
else if(maintype == Message.LIST_ORPHAN_TILEENTS){
|
||||
OpisPacketHandler.validateAndSend(NetDataList.create (Message.LIST_ORPHAN_TILEENTS, TileEntityManager.INSTANCE.getOrphans()), (Player)player);
|
||||
OpisPacketHandler.validateAndSend(NetDataCommand.create(Message.LIST_ORPHAN_TILEENTS_CLEAR), (Player)player);
|
||||
OpisPacketHandler.splitAndSend(Message.LIST_ORPHAN_TILEENTS, TileEntityManager.INSTANCE.getOrphans(), (Player)player);
|
||||
}
|
||||
|
||||
else{
|
||||
|
||||
@@ -28,6 +28,7 @@ public enum Message {
|
||||
LIST_PACKETS_OUTBOUND_250(EnumSet.of(SelectedTab.PACKETOUTBOUND250)),
|
||||
LIST_PACKETS_INBOUND_250 (EnumSet.of(SelectedTab.PACKETINBOUND250)),
|
||||
LIST_ORPHAN_TILEENTS,
|
||||
LIST_ORPHAN_TILEENTS_CLEAR,
|
||||
|
||||
|
||||
VALUE_TIMING_TILEENTS,
|
||||
|
||||
@@ -161,8 +161,9 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_PACKETS_INBOUND, panelPacketsIn);
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_PACKETS_OUTBOUND_250, panelPacketsOut250);
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_PACKETS_INBOUND_250, panelPacketsIn250);
|
||||
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_ORPHAN_TILEENTS, panelOrphanTileEnts);
|
||||
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_ORPHAN_TILEENTS_CLEAR, panelOrphanTileEnts);
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_ORPHAN_TILEENTS, panelOrphanTileEnts);
|
||||
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.CLIENT_CLEAR_SELECTION, modOpis.proxy);
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.CLIENT_START_PROFILING, modOpis.proxy);
|
||||
|
||||
@@ -31,36 +31,39 @@ public class PanelOrphanTileEntities extends JPanelMsgHandler implements ITabPan
|
||||
table = new JTableStats();
|
||||
table.setModel(new DefaultTableModel(
|
||||
new Object[][] {
|
||||
{null, null, null},
|
||||
},
|
||||
new String[] {
|
||||
"Class", "Dimension", "Coordinates"
|
||||
"Class", "Hash", "Is valid?", "Dimension", "Coordinates"
|
||||
}
|
||||
) {
|
||||
Class[] columnTypes = new Class[] {
|
||||
String.class, Integer.class, String.class
|
||||
String.class, String.class, Boolean.class, Integer.class, String.class
|
||||
};
|
||||
public Class getColumnClass(int columnIndex) {
|
||||
return columnTypes[columnIndex];
|
||||
}
|
||||
});
|
||||
table.setAutoCreateRowSorter(true);
|
||||
scrollPane.setViewportView(table);
|
||||
}
|
||||
|
||||
int row;
|
||||
|
||||
@Override
|
||||
public boolean handleMessage(Message msg, NetDataRaw rawdata) {
|
||||
switch(msg){
|
||||
case LIST_ORPHAN_TILEENTS:{
|
||||
|
||||
((JTableStats)this.getTable()).setTableData(rawdata.array);
|
||||
|
||||
((JTableStats)this.getTable()).addTableData(rawdata.array);
|
||||
DefaultTableModel model = (DefaultTableModel)this.getTable().getModel();
|
||||
int row = this.updateData(table, model, DataTileEntity.class);
|
||||
//int row = this.updateData(table, model, DataTileEntity.class);
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
DataTileEntity data = (DataTileEntity)o;
|
||||
model.addRow(new Object[] {
|
||||
data.clazz,
|
||||
String.format("0x%x", data.hashCode),
|
||||
data.isValid,
|
||||
data.pos.dim,
|
||||
String.format("[ %4d %4d %4d ]", data.pos.x, data.pos.y, data.pos.z),
|
||||
});
|
||||
@@ -71,6 +74,12 @@ public class PanelOrphanTileEntities extends JPanelMsgHandler implements ITabPan
|
||||
break;
|
||||
}
|
||||
|
||||
case LIST_ORPHAN_TILEENTS_CLEAR:{
|
||||
((JTableStats)this.getTable()).clearTableData();
|
||||
DefaultTableModel model = (DefaultTableModel)this.getTable().getModel();
|
||||
row = this.clearTable(table, model, DataTileEntity.class);
|
||||
}
|
||||
|
||||
default:
|
||||
return false;
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ public class PanelInbound extends JPanelMsgHandler implements ITabPanel {
|
||||
((JTableStats)this.getTable()).setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)this.getTable().getModel();
|
||||
int row = this.updateData(table, model, DataPacket.class);
|
||||
int row = this.clearTable(table, model, DataPacket.class);
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
DataPacket packet = (DataPacket)o;
|
||||
|
||||
@@ -65,7 +65,7 @@ public class PanelInbound250 extends JPanelMsgHandler implements ITabPanel {
|
||||
((JTableStats)this.getTable()).setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)this.getTable().getModel();
|
||||
int row = this.updateData(table, model, DataPacket250.class);
|
||||
int row = this.clearTable(table, model, DataPacket250.class);
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
DataPacket250 packet = (DataPacket250)o;
|
||||
|
||||
@@ -64,7 +64,7 @@ public class PanelOutbound extends JPanelMsgHandler implements ITabPanel {
|
||||
((JTableStats)this.getTable()).setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)this.getTable().getModel();
|
||||
int row = this.updateData(table, model, DataPacket.class);
|
||||
int row = this.clearTable(table, model, DataPacket.class);
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
DataPacket packet = (DataPacket)o;
|
||||
|
||||
@@ -64,7 +64,7 @@ public class PanelOutbound250 extends JPanelMsgHandler implements ITabPanel {
|
||||
((JTableStats)this.getTable()).setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)this.getTable().getModel();
|
||||
int row = this.updateData(table, model, DataPacket250.class);
|
||||
int row = this.clearTable(table, model, DataPacket250.class);
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
DataPacket250 packet = (DataPacket250)o;
|
||||
|
||||
@@ -96,7 +96,7 @@ public class PanelTimingChunks extends JPanelMsgHandler implements ITabPanel{
|
||||
((JTableStats)this.getTable()).setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)table.getModel();
|
||||
int row = this.updateData(table, model, StatsChunk.class);
|
||||
int row = this.clearTable(table, model, StatsChunk.class);
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
StatsChunk stat = (StatsChunk)o;
|
||||
|
||||
@@ -109,7 +109,7 @@ public class PanelTimingEntities extends JPanelMsgHandler implements ITabPanel{
|
||||
((JTableStats)this.getTable()).setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)table.getModel();
|
||||
int row = this.updateData(table, model, DataEntity.class);
|
||||
int row = this.clearTable(table, model, DataEntity.class);
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
DataEntity data = (DataEntity)o;
|
||||
|
||||
@@ -59,7 +59,7 @@ public class PanelTimingEvents extends JPanelMsgHandler implements ITabPanel {
|
||||
((JTableStats)this.getTable()).setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)table.getModel();
|
||||
int row = this.updateData(table, model, DataEvent.class);
|
||||
int row = this.clearTable(table, model, DataEvent.class);
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
DataEvent data = (DataEvent)o;
|
||||
|
||||
@@ -93,7 +93,7 @@ public class PanelTimingHandlers extends JPanelMsgHandler implements ITabPanel{
|
||||
((JTableStats)this.getTable()).setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)table.getModel();
|
||||
int row = this.updateData(table, model, DataHandler.class);
|
||||
int row = this.clearTable(table, model, DataHandler.class);
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
DataHandler data = (DataHandler)o;
|
||||
|
||||
@@ -114,7 +114,7 @@ public class PanelTimingTileEnts extends JPanelMsgHandler implements ITabPanel{
|
||||
((JTableStats)this.getTable()).setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)table.getModel();
|
||||
int row = this.updateData(table, model, DataBlockTileEntity.class);
|
||||
int row = this.clearTable(table, model, DataBlockTileEntity.class);
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
DataBlockTileEntity data = (DataBlockTileEntity)o;
|
||||
|
||||
@@ -100,7 +100,7 @@ public class PanelAmountEntities extends JPanelMsgHandler implements ITabPanel{
|
||||
((JTableStats)this.getTable()).setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)this.getTable().getModel();
|
||||
int row = this.updateData(table, model, AmountHolder.class);
|
||||
int row = this.clearTable(table, model, AmountHolder.class);
|
||||
int totalEntities = 0;
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
|
||||
@@ -88,7 +88,7 @@ public class PanelDimensions extends JPanelMsgHandler implements IMessageHandler
|
||||
((JTableStats)this.getTable()).setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)this.getTable().getModel();
|
||||
int row = this.updateData(table, model, DataDimension.class);
|
||||
int row = this.clearTable(table, model, DataDimension.class);
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
DataDimension data = (DataDimension)o;
|
||||
|
||||
@@ -101,7 +101,7 @@ 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, DataEntity.class);
|
||||
int row = this.clearTable(table, model, DataEntity.class);
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
DataEntity player = (DataEntity)o;
|
||||
|
||||
@@ -12,7 +12,7 @@ public abstract class JPanelMsgHandler extends JPanel implements IMessageHandler
|
||||
|
||||
public JTableStats table;
|
||||
|
||||
public <U> int updateData(JTable table, DefaultTableModel model, Class<U> datatype){
|
||||
public <U> int clearTable(JTable table, DefaultTableModel model, Class<U> datatype){
|
||||
int row = table.getSelectedRow();
|
||||
|
||||
if (model.getRowCount() > 0)
|
||||
|
||||
@@ -18,7 +18,15 @@ public class JTableStats extends JTable {
|
||||
public void setTableData(ArrayList<ISerializable> statistics){
|
||||
this.statistics = statistics;
|
||||
}
|
||||
|
||||
public void clearTableData(){
|
||||
this.statistics = new ArrayList<ISerializable>();
|
||||
}
|
||||
|
||||
public void addTableData(ArrayList<ISerializable> statistics){
|
||||
this.statistics.addAll(statistics);
|
||||
}
|
||||
|
||||
/*
|
||||
public void setStatistics(ArrayList<ISerializable> statistics){
|
||||
this.statistics = new ArrayList<ISerializable>();
|
||||
|
||||
Reference in new issue
Block a user