diff --git a/mcp/mobius/opis/commands/CommandDataDump.java b/mcp/mobius/opis/commands/CommandDataDump.java index 95fe26e..3fd163a 100644 --- a/mcp/mobius/opis/commands/CommandDataDump.java +++ b/mcp/mobius/opis/commands/CommandDataDump.java @@ -78,11 +78,17 @@ public class CommandDataDump extends CommandBase { out.write(String.format("name,mod,dim,x,y,z,chunkX,chunkZ,npoints,mean,geommean,variance,min,max,sum,median\n")); for (TileEntityStats stat: entStats){ + ItemStack is = new ItemStack(stat.getID(), 1, stat.getMeta()); - String name = is.getDisplayName(); + String name = "te.null"; + String modID = ""; + if (is != null) { + name = is.getDisplayName(); + modID = ModIdentification.idFromStack(is); + } out.write(String.format("%s,%s,%d,%d,%d,%d,%d,%d,%d,%f,%f,%f,%f,%f,%f,%f\n", name, - ModIdentification.idFromStack(is), + modID, stat.getCoordinates().dim, stat.getCoordinates().x, stat.getCoordinates().y, diff --git a/mcp/mobius/opis/data/TileEntityManager.java b/mcp/mobius/opis/data/TileEntityManager.java index 7df6fb7..841b70f 100644 --- a/mcp/mobius/opis/data/TileEntityManager.java +++ b/mcp/mobius/opis/data/TileEntityManager.java @@ -11,7 +11,7 @@ import mcp.mobius.opis.data.holders.CoordinatesBlock; import mcp.mobius.opis.data.holders.CoordinatesChunk; import mcp.mobius.opis.data.holders.ModStats; import mcp.mobius.opis.data.holders.TileEntityStats; -import mcp.mobius.waila.tools.ModIdentification; +import mcp.mobius.opis.tools.ModIdentification; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/mcp/mobius/opis/gui/screens/ScreenChunks.java b/mcp/mobius/opis/gui/screens/ScreenChunks.java index 0ef882a..095f4d7 100644 --- a/mcp/mobius/opis/gui/screens/ScreenChunks.java +++ b/mcp/mobius/opis/gui/screens/ScreenChunks.java @@ -6,6 +6,7 @@ import net.minecraft.client.gui.GuiScreen; import mapwriter.Mw; import mapwriter.api.MwAPI; import mapwriter.gui.MwGui; +import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.holders.ChunkStats; import mcp.mobius.opis.data.holders.CoordinatesBlock; import mcp.mobius.opis.data.holders.CoordinatesChunk; @@ -54,12 +55,19 @@ public class ScreenChunks extends ScreenBase { .setFontSize(1.0f); for (ChunkStats data : chunks){ - table.addRow(data, - String.format("%3d", data.coord.dim), - String.format("[ %4d %4d ]", data.coord.chunkX, data.coord.chunkZ), - String.format("%d", data.nentities), - //String.format("%.5f ms",data.updateTime/1000.0)); - String.format("%.5f \u00B5s",data.updateTime)); + if (modOpis.microseconds) + table.addRow(data, + String.format("%3d", data.coord.dim), + String.format("[ %4d %4d ]", data.coord.chunkX, data.coord.chunkZ), + String.format("%d", data.nentities), + //String.format("%.5f ms",data.updateTime/1000.0)); + String.format("%.5f \u00B5s",data.updateTime)); + else + table.addRow(data, + String.format("%3d", data.coord.dim), + String.format("[ %4d %4d ]", data.coord.chunkX, data.coord.chunkZ), + String.format("%d", data.nentities), + String.format("%.5f ms",data.updateTime/1000.0)); } } diff --git a/mcp/mobius/opis/gui/screens/ScreenMods.java b/mcp/mobius/opis/gui/screens/ScreenMods.java index ac6ce6c..4a5fc75 100644 --- a/mcp/mobius/opis/gui/screens/ScreenMods.java +++ b/mcp/mobius/opis/gui/screens/ScreenMods.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Collections; import net.minecraft.client.gui.GuiScreen; +import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.holders.ModStats; import mcp.mobius.opis.gui.interfaces.CType; import mcp.mobius.opis.gui.interfaces.WAlign; @@ -52,7 +53,8 @@ public class ScreenMods extends ScreenBase { */ for (ModStats data : mods){ - table.addRow(data, + if (modOpis.microseconds) + table.addRow(data, String.format("%s", data.getModID()), String.format("%d", data.ntes), //String.format("%.5f ms", data.total / 1000.0), @@ -64,6 +66,15 @@ public class ScreenMods extends ScreenBase { String.format("%.3f \u00B5s", data.median), String.format("%.3f \u00B5s", data.maxTime) ); + else + table.addRow(data, + String.format("%s", data.getModID()), + String.format("%d", data.ntes), + String.format("%.5f ms", data.total / 1000.0), + String.format("%.5f ms", data.meanTime / 1000.0), + String.format("%.5f ms", data.median / 1000.0), + String.format("%.5f ms", data.maxTime / 1000.0) + ); } } diff --git a/mcp/mobius/opis/gui/screens/ScreenTileEntity.java b/mcp/mobius/opis/gui/screens/ScreenTileEntity.java index 902e655..950a095 100644 --- a/mcp/mobius/opis/gui/screens/ScreenTileEntity.java +++ b/mcp/mobius/opis/gui/screens/ScreenTileEntity.java @@ -6,6 +6,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import mapwriter.Mw; import mapwriter.api.MwAPI; import mapwriter.gui.MwGui; +import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.holders.CoordinatesBlock; import mcp.mobius.opis.data.holders.TileEntityStats; import mcp.mobius.opis.gui.events.MouseEvent; @@ -60,26 +61,27 @@ public class ScreenTileEntity extends ScreenBase { for (TileEntityStats data : tes){ ItemStack is = new ItemStack(data.getID(), 1, data.getMeta()); - String name = is.getDisplayName(); + String name = "te.null"; + String modID = ""; + if (is != null) { + name = is.getDisplayName(); + modID = ModIdentification.idFromStack(is); + } - /* - String name = I18n.getString(data.getType()); - if (name.equals(data.getType())) - name = LanguageRegistry.instance().getStringLocalization(data.getType()); - if (name.isEmpty()) - name = data.getType(); - */ - - //String[] name = data.getType().split("\\."); - table.addRow(data, - //name[name.length - 1], + if(modOpis.microseconds) + table.addRow(data, name, - //"\u00A79\u00A7o" + ModIdentification.idFromStack(is), - ModIdentification.idFromStack(is), + modID, String.format("%3d", data.getCoordinates().dim), String.format("[ %4d %4d %4d ]", data.getCoordinates().x, data.getCoordinates().y, data.getCoordinates().z), - //String.format("%.5f ms",data.getGeometricMean()/1000.0)); String.format("%.3f \u00B5s",data.getGeometricMean())); + else + table.addRow(data, + name, + modID, + String.format("%3d", data.getCoordinates().dim), + String.format("[ %4d %4d %4d ]", data.getCoordinates().x, data.getCoordinates().y, data.getCoordinates().z), + String.format("%.5f ms",data.getGeometricMean()/1000.0)); } } diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index 8de8f32..bf799a7 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -3,6 +3,7 @@ package mcp.mobius.opis; import java.util.logging.Logger; import net.minecraft.network.packet.Packet; +import net.minecraftforge.common.Configuration; import net.minecraftforge.common.MinecraftForge; import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar; import mcp.mobius.opis.client.OpisClientEventHandler; @@ -55,11 +56,22 @@ public class modOpis { public static int profilerDelay = 1; public static boolean profilerRun = false; public static int profilerMaxTicks = 250; + public static boolean microseconds = true; public static CoordinatesBlock selectedBlock = null; + public Configuration config = null; + @EventHandler public void preInit(FMLPreInitializationEvent event) { + config = new Configuration(event.getSuggestedConfigurationFile()); + + profilerDelay = config.get(Configuration.CATEGORY_GENERAL, "profiler.delay", 1).getInt(); + profilerMaxTicks = config.get(Configuration.CATEGORY_GENERAL, "profiler.maxpts", 250).getInt(); + microseconds = config.get(Configuration.CATEGORY_GENERAL, "display.microseconds", true).getBoolean(true); + + config.save(); + MinecraftForge.EVENT_BUS.register(new OpisClientEventHandler()); Packet.addIdClassMapping(251, true, true, Packet251Extended.class); } diff --git a/mcp/mobius/opis/overlay/OverlayMeanTime.java b/mcp/mobius/opis/overlay/OverlayMeanTime.java index e10f0fc..40a4d94 100644 --- a/mcp/mobius/opis/overlay/OverlayMeanTime.java +++ b/mcp/mobius/opis/overlay/OverlayMeanTime.java @@ -165,8 +165,11 @@ public class OverlayMeanTime implements IMwDataProvider { CoordinatesChunk chunkCoord = new CoordinatesChunk(dim, xChunk, zChunk); if (ChunkManager.chunkMeanTime.containsKey(chunkCoord)) - //return String.format(", %.5f ms", ChunkManager.chunkMeanTime.get(chunkCoord).updateTime/1000.0); - return String.format("%.3f \u00B5s", ChunkManager.chunkMeanTime.get(chunkCoord).updateTime); + if (modOpis.microseconds) + return String.format("%.3f \u00B5s", ChunkManager.chunkMeanTime.get(chunkCoord).updateTime); + else + return String.format(", %.5f ms", ChunkManager.chunkMeanTime.get(chunkCoord).updateTime/1000.0); + else return ""; } @@ -283,7 +286,10 @@ public class OverlayMeanTime implements IMwDataProvider { name = data.getType(); */ - table.addRow(data, name, String.format("[ %s %s %s ]", data.getCoordinates().x, data.getCoordinates().y, data.getCoordinates().z), String.format("%.5f ms",data.getGeometricMean()/1000.0)); + if (modOpis.microseconds) + table.addRow(data, name, String.format("[ %s %s %s ]", data.getCoordinates().x, data.getCoordinates().y, data.getCoordinates().z), String.format("%.5f \u00B5s",data.getGeometricMean())); + else + table.addRow(data, name, String.format("[ %s %s %s ]", data.getCoordinates().x, data.getCoordinates().y, data.getCoordinates().z), String.format("%.5f ms",data.getGeometricMean()/1000.0)); } this.showList = true;