From a5e9667e4f794bfa38c6c5a5a6faee77ca9c5e09 Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Thu, 6 Nov 2014 01:58:23 +0100 Subject: [PATCH] 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. --- build.gradle | 4 +-- .../opis/data/managers/EntityManager.java | 27 ++++++---------- .../opis/data/managers/TileEntityManager.java | 31 +++++++++---------- .../opis/events/OpisServerTickHandler.java | 12 +++++++ .../opis/helpers/ModIdentification.java | 12 +++++++ .../panels/tracking/PanelAmountTileEnts.java | 27 +++++----------- 6 files changed, 57 insertions(+), 56 deletions(-) diff --git a/build.gradle b/build.gradle index 77df951..e6e82c0 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ apply plugin: 'java' apply plugin: 'maven' apply plugin: 'forge' -version = "1.3.0_dev3_1.7.10" +version = "1.3.0_dev4_1.7.10" group= "mcp.mobius.opis" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Opis" @@ -54,7 +54,7 @@ dependencies { shade 'io.netty-opis:Netty-opis:4.0.23' // shade 'io.netty:netty-all:4.0.23.Final' // compile 'io.netty:netty-all:4.0.15.Final' - compile "mcp.mobius.mobiuscore:MobiusCore:1.2.4_1.7.10:dev" + compile "mcp.mobius.mobiuscore:MobiusCore:1.3.0_dev3_1.7.10:dev" deployerJars "org.apache.maven.wagon:wagon-ssh:2.2" } diff --git a/src/main/java/mcp/mobius/opis/data/managers/EntityManager.java b/src/main/java/mcp/mobius/opis/data/managers/EntityManager.java index 5b1e9da..c099edd 100644 --- a/src/main/java/mcp/mobius/opis/data/managers/EntityManager.java +++ b/src/main/java/mcp/mobius/opis/data/managers/EntityManager.java @@ -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 getCumulativeEntities(boolean filtered){ ArrayList cumData = new ArrayList(); - HashMap entities = new HashMap(); - + 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 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; } diff --git a/src/main/java/mcp/mobius/opis/data/managers/TileEntityManager.java b/src/main/java/mcp/mobius/opis/data/managers/TileEntityManager.java index 2167d90..e27a25e 100644 --- a/src/main/java/mcp/mobius/opis/data/managers/TileEntityManager.java +++ b/src/main/java/mcp/mobius/opis/data/managers/TileEntityManager.java @@ -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 getCumulativeAmountTileEntities(){ - HashBasedTable data = HashBasedTable.create(); + public ArrayList getCumulativeAmountTileEntities(){ + ArrayList cumData = new ArrayList(); + + 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 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(data.values()); + return cumData; } public ArrayList getCumulativeTimingTileEntities(){ diff --git a/src/main/java/mcp/mobius/opis/events/OpisServerTickHandler.java b/src/main/java/mcp/mobius/opis/events/OpisServerTickHandler.java index 78bf677..9fd5396 100644 --- a/src/main/java/mcp/mobius/opis/events/OpisServerTickHandler.java +++ b/src/main/java/mcp/mobius/opis/events/OpisServerTickHandler.java @@ -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++; diff --git a/src/main/java/mcp/mobius/opis/helpers/ModIdentification.java b/src/main/java/mcp/mobius/opis/helpers/ModIdentification.java index 98d2289..a58d175 100644 --- a/src/main/java/mcp/mobius/opis/helpers/ModIdentification.java +++ b/src/main/java/mcp/mobius/opis/helpers/ModIdentification.java @@ -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 = ""; diff --git a/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelAmountTileEnts.java b/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelAmountTileEnts.java index 3e8e7d5..6e2ef4c 100644 --- a/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelAmountTileEnts.java +++ b/src/main/java/mcp/mobius/opis/swing/panels/tracking/PanelAmountTileEnts.java @@ -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 cumData = new HashMap(); + 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: