diff --git a/mcp/mobius/opis/data/TileEntityManager.java b/mcp/mobius/opis/data/TileEntityManager.java index 4379552..72029dc 100644 --- a/mcp/mobius/opis/data/TileEntityManager.java +++ b/mcp/mobius/opis/data/TileEntityManager.java @@ -8,7 +8,12 @@ import mcp.mobius.opis.data.holders.CoordinatesBlock; import mcp.mobius.opis.data.holders.CoordinatesChunk; import mcp.mobius.opis.data.holders.TileEntityStats; import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import net.minecraftforge.common.DimensionManager; public class TileEntityManager { public static HashMap references = new HashMap(); @@ -18,13 +23,16 @@ public class TileEntityManager { CoordinatesBlock coord = new CoordinatesBlock(te); String teName; + /* try{ teName = te.blockType.getLocalizedName(); } catch (Exception e){ + System.out.printf("%s\n", e); teName = te.getClass().getName(); } */ + teName = te.getClass().getName(); if (references.containsKey(coord) && references.get(coord) != te.getClass()){ @@ -61,8 +69,19 @@ public class TileEntityManager { ArrayList returnList = new ArrayList(); for (CoordinatesBlock tecoord : TileEntityManager.stats.keySet()){ - if (coord.equals(new CoordinatesChunk(tecoord))) - returnList.add(TileEntityManager.stats.get(tecoord)); + if (coord.equals(new CoordinatesChunk(tecoord))){ + TileEntityStats testats = TileEntityManager.stats.get(tecoord); + + World world = DimensionManager.getWorld(tecoord.dim); + Block mouseoverBlock = Block.blocksList[world.getBlockId(tecoord.x, tecoord.y, tecoord.z)]; + + try{ + ItemStack pick = new ItemStack(mouseoverBlock, 1, world.getBlockMetadata(tecoord.x, tecoord.y, tecoord.z)); + testats.setType(pick.getDisplayName()); + }catch (Exception e){} + + returnList.add(testats); + } } return returnList; diff --git a/mcp/mobius/opis/data/holders/TileEntityStats.java b/mcp/mobius/opis/data/holders/TileEntityStats.java index 4f95c40..6e4929b 100644 --- a/mcp/mobius/opis/data/holders/TileEntityStats.java +++ b/mcp/mobius/opis/data/holders/TileEntityStats.java @@ -12,13 +12,13 @@ public class TileEntityStats implements ISerializable, Comparable { private DescriptiveStatistics stats = new DescriptiveStatistics(100); private CoordinatesBlock coord; - private String classname; + private String name; private Double geomMean = null; public TileEntityStats(CoordinatesBlock coord, String teclass){ - this.coord = coord; - this.classname = teclass; + this.coord = coord; + this.name = teclass; } public void addMeasure(long timing){ @@ -45,13 +45,18 @@ public class TileEntityStats implements ISerializable, Comparable { } public String getType(){ - return this.classname; + return this.name; } + + public void setType(String name){ + this.name = name; + } + @Override public void writeToStream(DataOutputStream stream) throws IOException{ this.coord.writeToStream(stream); - Packet.writeString(this.classname, stream); + Packet.writeString(this.name, stream); stream.writeDouble(this.getGeometricMean()); }