mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-19 19:59:37 +00:00
Modified to use the new way of getting cumulative data per class.
TileEntity list is now sent as an AmountHolder instead of the old whatever.
This commit is contained in:
1 parent
853920ac1e
commit
a5e9667e4f
6 files changed
+57
-56
No files matched your search
@@ -4,6 +4,7 @@ import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
@@ -25,6 +26,7 @@ import mcp.mobius.opis.data.profilers.ProfilerEntityUpdate;
|
||||
import mcp.mobius.opis.helpers.Teleport;
|
||||
import mcp.mobius.opis.network.PacketManager;
|
||||
import mcp.mobius.opis.network.enums.PlayerEv;
|
||||
import mcp.mobius.mobiuscore.monitors.MonitoredEntityList;
|
||||
|
||||
public enum EntityManager {
|
||||
INSTANCE;
|
||||
@@ -125,27 +127,16 @@ public enum EntityManager {
|
||||
/* Returns a hashmap with the entity name and amount of it on the server */
|
||||
public ArrayList<AmountHolder> getCumulativeEntities(boolean filtered){
|
||||
ArrayList<AmountHolder> cumData = new ArrayList<AmountHolder>();
|
||||
HashMap<String, Integer> entities = new HashMap<String, Integer>();
|
||||
|
||||
|
||||
for (int dim : DimensionManager.getIDs()){
|
||||
World world = DimensionManager.getWorld(dim);
|
||||
if (world == null) continue;
|
||||
|
||||
for (Object o : world.loadedEntityList.toArray()){
|
||||
Entity ent = (Entity)o;
|
||||
//String name = ent.getClass().getName();
|
||||
String name = getEntityName(ent, filtered);
|
||||
|
||||
if (!entities.containsKey(name))
|
||||
entities.put(name, 0);
|
||||
|
||||
entities.put(name, entities.get(name) + 1);
|
||||
}
|
||||
}
|
||||
|
||||
for (String key : entities.keySet())
|
||||
cumData.add(new AmountHolder(key, entities.get(key)));
|
||||
if (world == null) continue;
|
||||
|
||||
Map<String, Integer> count = ((MonitoredEntityList)world.loadedEntityList).getCount();
|
||||
for (String key : count.keySet())
|
||||
if (count.get(key) > 0)
|
||||
cumData.add(new AmountHolder(key, count.get(key)));
|
||||
}
|
||||
return cumData;
|
||||
}
|
||||
|
||||
|
||||
@@ -5,11 +5,15 @@ import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
|
||||
import com.google.common.collect.HashBasedTable;
|
||||
|
||||
import mcp.mobius.mobiuscore.monitors.MonitoredEntityList;
|
||||
import mcp.mobius.mobiuscore.monitors.MonitoredTileList;
|
||||
import mcp.mobius.mobiuscore.profiler.ProfilerSection;
|
||||
import mcp.mobius.opis.modOpis;
|
||||
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.newtypes.DataBlockTileEntity;
|
||||
@@ -159,24 +163,19 @@ public enum TileEntityManager {
|
||||
return orphans;
|
||||
}
|
||||
|
||||
public ArrayList<DataBlockTileEntityPerClass> getCumulativeAmountTileEntities(){
|
||||
HashBasedTable<Integer, Integer, DataBlockTileEntityPerClass> data = HashBasedTable.create();
|
||||
public ArrayList<AmountHolder> getCumulativeAmountTileEntities(){
|
||||
ArrayList<AmountHolder> cumData = new ArrayList<AmountHolder>();
|
||||
|
||||
for (int dim : DimensionManager.getIDs()){
|
||||
World world = DimensionManager.getWorld(dim);
|
||||
if (world == null) continue;
|
||||
|
||||
for (WorldServer world : DimensionManager.getWorlds()){
|
||||
for (Object o : world.loadedTileEntityList.toArray()){
|
||||
TileEntity tileEntity = (TileEntity)o;
|
||||
if (tileEntity == null) continue;
|
||||
int id = Block.getIdFromBlock(world.getBlock(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord));
|
||||
int meta = world.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
|
||||
|
||||
if (!data.contains(id, meta))
|
||||
data.put(id, meta, new DataBlockTileEntityPerClass(id, meta));
|
||||
|
||||
data.get(id, meta).add();
|
||||
}
|
||||
Map<String, Integer> count = ((MonitoredTileList)world.loadedTileEntityList).getCount();
|
||||
for (String key : count.keySet())
|
||||
if (count.get(key) > 0)
|
||||
cumData.add(new AmountHolder(key, count.get(key)));
|
||||
}
|
||||
|
||||
return new ArrayList<DataBlockTileEntityPerClass>(data.values());
|
||||
return cumData;
|
||||
}
|
||||
|
||||
public ArrayList<DataBlockTileEntityPerClass> getCumulativeTimingTileEntities(){
|
||||
|
||||
@@ -4,6 +4,7 @@ import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
@@ -34,6 +35,8 @@ import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import mcp.mobius.mobiuscore.monitors.MonitoredEntityList;
|
||||
import mcp.mobius.mobiuscore.monitors.MonitoredTileList;
|
||||
import mcp.mobius.mobiuscore.profiler.ProfilerSection;
|
||||
|
||||
public enum OpisServerTickHandler{
|
||||
@@ -137,6 +140,15 @@ public enum OpisServerTickHandler{
|
||||
System.out.printf("[ %d ] %d %d\n", data.id, data.amount, data.size);
|
||||
}
|
||||
*/
|
||||
|
||||
for (int dim : DimensionManager.getIDs()){
|
||||
World world = DimensionManager.getWorld(dim);
|
||||
if (world == null) continue;
|
||||
|
||||
((MonitoredEntityList)(world.loadedEntityList)).printCount();
|
||||
((MonitoredTileList)(world.loadedTileEntityList)).printCount();
|
||||
}
|
||||
modOpis.log.info("---");
|
||||
}
|
||||
|
||||
profilerUpdateTickCounter++;
|
||||
|
||||
@@ -83,6 +83,18 @@ public class ModIdentification {
|
||||
return name;
|
||||
}
|
||||
|
||||
public static String getStackName(Block block, int meta){
|
||||
ItemStack is;
|
||||
String name = String.format("te.%s.%d", block, meta);
|
||||
|
||||
try{
|
||||
is = new ItemStack(block, 1, meta);
|
||||
name = is.getDisplayName();
|
||||
} catch (Exception e) { }
|
||||
|
||||
return name;
|
||||
}
|
||||
|
||||
public static String getModStackName(int id, int meta){
|
||||
ItemStack is;
|
||||
String modID = "<UNKNOWN>";
|
||||
|
||||
@@ -3,6 +3,7 @@ package mcp.mobius.opis.swing.panels.tracking;
|
||||
import java.util.HashMap;
|
||||
|
||||
import mcp.mobius.opis.api.ITabPanel;
|
||||
import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntityPerClass;
|
||||
import mcp.mobius.opis.helpers.ModIdentification;
|
||||
import mcp.mobius.opis.network.PacketBase;
|
||||
@@ -55,29 +56,15 @@ public class PanelAmountTileEnts extends JPanelMsgHandler implements ITabPanel{
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = table.getModel();
|
||||
int row = this.getTable().clearTable(DataBlockTileEntityPerClass.class);
|
||||
|
||||
HashMap<String, DataBlockTileEntityPerClass> cumData = new HashMap<String, DataBlockTileEntityPerClass>();
|
||||
DefaultTableModel model = this.getTable().getModel();
|
||||
int row = this.getTable().clearTable(AmountHolder.class);
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
DataBlockTileEntityPerClass data = (DataBlockTileEntityPerClass)o;
|
||||
String name = ModIdentification.getStackName(data.id, data.meta);
|
||||
|
||||
if (!cumData.containsKey(name))
|
||||
cumData.put(name, new DataBlockTileEntityPerClass(data.id, data.meta));
|
||||
|
||||
cumData.get(name).add(data.amount, data.update.timing);
|
||||
}
|
||||
|
||||
for (String s : cumData.keySet()){
|
||||
String name = s;
|
||||
String modID = ModIdentification.getModStackName(cumData.get(s).id, cumData.get(s).meta);
|
||||
model.addRow(new Object[] {name, modID, cumData.get(s).amount});
|
||||
}
|
||||
|
||||
this.getTable().dataUpdated(row);
|
||||
AmountHolder entity = (AmountHolder)o;
|
||||
model.addRow(new Object[] {entity.key, "Unknown", entity.value});
|
||||
}
|
||||
|
||||
this.getTable().dataUpdated(row);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
||||
Reference in new issue
Block a user