mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-20 04:09:41 +00:00
Added a list of the top X tile entities.
Can be called using /opis_te command. The list is clickable and will center itself on the corresponding chunk.
This commit is contained in:
1 parent
1fa11b41dc
commit
327febcd4d
13 files changed
+248
-11
No files matched your search
@@ -0,0 +1,59 @@
|
||||
package mcp.mobius.opis.commands;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import mcp.mobius.opis.data.TileEntityManager;
|
||||
import mcp.mobius.opis.data.holders.TileEntityStats;
|
||||
import mcp.mobius.opis.network.Packet_TileEntitiesTopList;
|
||||
import net.minecraft.command.CommandBase;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
|
||||
public class CommandTileEntitiesList extends CommandBase {
|
||||
|
||||
@Override
|
||||
public String getCommandName() {
|
||||
return "opis_te";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCommandUsage(ICommandSender icommandsender) {
|
||||
return "";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void processCommand(ICommandSender icommandsender, String[] astring) {
|
||||
ArrayList<TileEntityStats> tes = new ArrayList<TileEntityStats>();
|
||||
if (astring.length == 0){
|
||||
tes = TileEntityManager.getTopEntities(20);
|
||||
}
|
||||
else{
|
||||
try{
|
||||
tes = TileEntityManager.getTopEntities(Integer.valueOf(astring[0]));
|
||||
} catch (Exception e) {return;}
|
||||
}
|
||||
|
||||
/*
|
||||
System.out.printf("=== ===\n");
|
||||
|
||||
for (TileEntityStats stat : tes)
|
||||
System.out.printf("%s\n", stat);
|
||||
*/
|
||||
|
||||
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_TileEntitiesTopList.create(tes));
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRequiredPermissionLevel()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canCommandSenderUseCommand(ICommandSender par1ICommandSender)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
package mcp.mobius.opis.data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
|
||||
import mcp.mobius.opis.data.holders.ChunkStats;
|
||||
@@ -86,4 +87,28 @@ public class TileEntityManager {
|
||||
|
||||
return returnList;
|
||||
}
|
||||
|
||||
public static ArrayList<TileEntityStats> getTopEntities(int quantity){
|
||||
ArrayList<TileEntityStats> sortedEntities = new ArrayList(TileEntityManager.stats.values());
|
||||
ArrayList<TileEntityStats> topEntities = new ArrayList<TileEntityStats>();
|
||||
Collections.sort(sortedEntities);
|
||||
|
||||
|
||||
for (int i = 0; i < Math.min(quantity, sortedEntities.size()); i++){
|
||||
TileEntityStats testats = sortedEntities.get(i);
|
||||
|
||||
World world = DimensionManager.getWorld(testats.getCoordinates().dim);
|
||||
Block mouseoverBlock = Block.blocksList[world.getBlockId(testats.getCoordinates().x, testats.getCoordinates().y, testats.getCoordinates().z)];
|
||||
|
||||
try{
|
||||
ItemStack pick = new ItemStack(mouseoverBlock, 1, world.getBlockMetadata(testats.getCoordinates().x, testats.getCoordinates().y, testats.getCoordinates().z));
|
||||
testats.setType(pick.getDisplayName());
|
||||
}catch (Exception e){}
|
||||
|
||||
topEntities.add(testats);
|
||||
}
|
||||
|
||||
return topEntities;
|
||||
|
||||
}
|
||||
}
|
||||
@@ -77,4 +77,8 @@ public class TileEntityStats implements ISerializable, Comparable {
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
public String toString(){
|
||||
return String.format("%s %s %s", this.name, this.coord, this.getGeometricMean());
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,8 @@ import java.util.HashMap;
|
||||
|
||||
import org.lwjgl.input.Mouse;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import mcp.mobius.opis.gui.interfaces.IWidget;
|
||||
import mcp.mobius.opis.gui.widgets.LayoutCanvas;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -62,6 +64,7 @@ public abstract class ScreenBase extends GuiScreen{
|
||||
|
||||
// Used to easily display a UI without having to mess with mc handle.
|
||||
public void display(){
|
||||
this.parent = this.mc.currentScreen;
|
||||
this.mc.displayGuiScreen(this);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
package mcp.mobius.opis.gui.screens;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import mapwriter.Mw;
|
||||
import mapwriter.api.MwAPI;
|
||||
import mapwriter.gui.MwGui;
|
||||
import mcp.mobius.opis.data.holders.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.holders.TileEntityStats;
|
||||
import mcp.mobius.opis.gui.events.MouseEvent;
|
||||
import mcp.mobius.opis.gui.interfaces.CType;
|
||||
import mcp.mobius.opis.gui.interfaces.IWidget;
|
||||
import mcp.mobius.opis.gui.interfaces.WAlign;
|
||||
import mcp.mobius.opis.gui.widgets.WidgetGeometry;
|
||||
import mcp.mobius.opis.gui.widgets.tableview.TableRow;
|
||||
import mcp.mobius.opis.gui.widgets.tableview.ViewTable;
|
||||
import mcp.mobius.opis.overlay.OverlayMeanTime;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
|
||||
public class ScreenTileEntity extends ScreenBase {
|
||||
|
||||
public class EntitiesTable extends ViewTable{
|
||||
public EntitiesTable(IWidget parent) {
|
||||
super(parent);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onMouseClick(MouseEvent event){
|
||||
TableRow row = this.getRow(event.x, event.y);
|
||||
if (row != null){
|
||||
CoordinatesBlock coord = ((TileEntityStats)row.getObject()).getCoordinates();
|
||||
OverlayMeanTime.instance().setSelectedChunk(coord.dim, coord.x >> 4, coord.z >> 4);
|
||||
MwAPI.setCurrentDataProvider(OverlayMeanTime.instance());
|
||||
this.mc.displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
public ScreenTileEntity(GuiScreen parent, ArrayList<TileEntityStats> tes) {
|
||||
super(parent);
|
||||
|
||||
EntitiesTable table = (EntitiesTable)this.getRoot().addWidget("Table", new EntitiesTable(null));
|
||||
|
||||
table.setGeometry(new WidgetGeometry(50.0, 50.0, 80.0, 80.0,CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER));
|
||||
|
||||
table.setColumnsAlign(WAlign.CENTER, WAlign.CENTER, WAlign.CENTER, WAlign.CENTER)
|
||||
//.setColumnsTitle("\u00a7a\u00a7oType", "\u00a7a\u00a7oPos", "\u00a7a\u00a7oUpdate Time")
|
||||
.setColumnsTitle("Type", "Dim", "Pos", "Update Time")
|
||||
.setColumnsWidth(40, 20, 20, 20)
|
||||
.setRowColors(0xff808080, 0xff505050)
|
||||
.setFontSize(1.0f);
|
||||
|
||||
for (TileEntityStats data : tes){
|
||||
String[] name = data.getType().split("\\.");
|
||||
table.addRow(data,
|
||||
name[name.length - 1],
|
||||
String.valueOf(data.getCoordinates().dim),
|
||||
String.format("[ %s %s %s ]", data.getCoordinates().x, data.getCoordinates().y, data.getCoordinates().z),
|
||||
String.format("%.5f ms",data.getGeometricMean()/1000.0));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import mcp.mobius.opis.commands.CommandChunkDump;
|
||||
import mcp.mobius.opis.commands.CommandFrequency;
|
||||
import mcp.mobius.opis.commands.CommandStart;
|
||||
import mcp.mobius.opis.commands.CommandStop;
|
||||
import mcp.mobius.opis.commands.CommandTileEntitiesList;
|
||||
import mcp.mobius.opis.data.TileEntityProfiler;
|
||||
import mcp.mobius.opis.network.OpisConnectionHandler;
|
||||
import mcp.mobius.opis.network.OpisPacketHandler;
|
||||
@@ -58,10 +59,11 @@ public class modOpis {
|
||||
|
||||
@EventHandler
|
||||
public void serverStarting(FMLServerStartingEvent event){
|
||||
event.registerServerCommand(new CommandChunkDump());
|
||||
//event.registerServerCommand(new CommandChunkDump());
|
||||
event.registerServerCommand(new CommandFrequency());
|
||||
event.registerServerCommand(new CommandStart());
|
||||
event.registerServerCommand(new CommandStop());
|
||||
event.registerServerCommand(new CommandTileEntitiesList());
|
||||
|
||||
GameRegistry.registerPlayerTracker(new OpisPlayerTracker());
|
||||
ProfilerRegistrar.registerTileEntityProfiler(new TileEntityProfiler());
|
||||
|
||||
@@ -44,11 +44,16 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
ChunkManager.chunkMeanTime = castedPacket.chunkStatus;
|
||||
}
|
||||
|
||||
else if (header == Packets.TILEENTITIES_LIST){
|
||||
Packet_TileEntitiesList castedPacket = new Packet_TileEntitiesList(packet);
|
||||
else if (header == Packets.TILEENTITIES_CHUNKLIST){
|
||||
Packet_TileEntitiesChunkList castedPacket = new Packet_TileEntitiesChunkList(packet);
|
||||
OverlayMeanTime.instance().setupTable(castedPacket.entities);
|
||||
}
|
||||
|
||||
else if (header == Packets.TILEENTITIES_TOPLIST){
|
||||
Packet_TileEntitiesTopList castedPacket = new Packet_TileEntitiesTopList(packet);
|
||||
modOpis.proxy.displayTileEntityList(castedPacket.entities);
|
||||
}
|
||||
|
||||
else if (header == Packets.TICKETS){
|
||||
Packet_Tickets castedPacket = new Packet_Tickets(packet);
|
||||
OverlayLoadedChunks.instance().setupTable(castedPacket.tickets);
|
||||
@@ -82,7 +87,7 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
|
||||
else if (header == Packets.REQ_TES_IN_CHUNK){
|
||||
Packet_ReqTEsInChunk castedPacket = new Packet_ReqTEsInChunk(packet);
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_TileEntitiesList.create(TileEntityManager.getInChunk(castedPacket.chunk)), player);
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_TileEntitiesChunkList.create(TileEntityManager.getInChunk(castedPacket.chunk)), player);
|
||||
}
|
||||
|
||||
else if (header == Packets.REQ_TICKETS){
|
||||
|
||||
+3
-3
@@ -11,12 +11,12 @@ import java.util.Collections;
|
||||
import mcp.mobius.opis.data.holders.TileEntityStats;
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
|
||||
public class Packet_TileEntitiesList {
|
||||
public class Packet_TileEntitiesChunkList {
|
||||
|
||||
public byte header;
|
||||
ArrayList<TileEntityStats> entities = new ArrayList<TileEntityStats>();
|
||||
|
||||
public Packet_TileEntitiesList(Packet250CustomPayload packet) {
|
||||
public Packet_TileEntitiesChunkList(Packet250CustomPayload packet) {
|
||||
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
|
||||
|
||||
try{
|
||||
@@ -35,7 +35,7 @@ public class Packet_TileEntitiesList {
|
||||
Collections.sort(stats);
|
||||
|
||||
try{
|
||||
outputStream.writeByte(Packets.TILEENTITIES_LIST);
|
||||
outputStream.writeByte(Packets.TILEENTITIES_CHUNKLIST);
|
||||
outputStream.writeInt(stats.size());
|
||||
for (TileEntityStats data : stats)
|
||||
data.writeToStream(outputStream);
|
||||
@@ -0,0 +1,49 @@
|
||||
package mcp.mobius.opis.network;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
|
||||
import mcp.mobius.opis.data.holders.TileEntityStats;
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
|
||||
public class Packet_TileEntitiesTopList {
|
||||
|
||||
public byte header;
|
||||
ArrayList<TileEntityStats> entities = new ArrayList<TileEntityStats>();
|
||||
|
||||
public Packet_TileEntitiesTopList(Packet250CustomPayload packet) {
|
||||
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
|
||||
|
||||
try{
|
||||
this.header = inputStream.readByte();
|
||||
int ndata = inputStream.readInt();
|
||||
for (int i = 0; i < ndata; i++)
|
||||
entities.add(TileEntityStats.readFromStream(inputStream));
|
||||
} catch (IOException e){}
|
||||
}
|
||||
|
||||
public static Packet250CustomPayload create(ArrayList<TileEntityStats> stats){
|
||||
Packet250CustomPayload packet = new Packet250CustomPayload();
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
|
||||
DataOutputStream outputStream = new DataOutputStream(bos);
|
||||
|
||||
try{
|
||||
outputStream.writeByte(Packets.TILEENTITIES_TOPLIST);
|
||||
outputStream.writeInt(stats.size());
|
||||
for (TileEntityStats data : stats)
|
||||
data.writeToStream(outputStream);
|
||||
}catch(IOException e){}
|
||||
|
||||
packet.channel = "Opis";
|
||||
packet.data = bos.toByteArray();
|
||||
packet.length = bos.size();
|
||||
|
||||
return packet;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -15,7 +15,8 @@ public class Packets {
|
||||
public static byte REQ_MEANTIME_ALL = 0x12; // C => S //Not used right now
|
||||
|
||||
public static byte REQ_TES_IN_CHUNK = 0x20; // C => S
|
||||
public static byte TILEENTITIES_LIST = 0x21; // S => C
|
||||
public static byte TILEENTITIES_CHUNKLIST = 0x21; // S => C
|
||||
public static byte TILEENTITIES_TOPLIST = 0x22; // S => C
|
||||
|
||||
public static byte REQ_TELEPORT = 0x30; // C => S
|
||||
|
||||
|
||||
@@ -169,9 +169,9 @@ public class OverlayMeanTime implements IMwDataProvider {
|
||||
public void onMiddleClick(int dim, int bX, int bZ, MapView mapview) {
|
||||
this.showList = false;
|
||||
|
||||
int xChunk = bX >> 4;
|
||||
int zChunk = bZ >> 4;
|
||||
CoordinatesChunk clickedChunk = new CoordinatesChunk(dim, xChunk, zChunk);
|
||||
int chunkX = bX >> 4;
|
||||
int chunkZ = bZ >> 4;
|
||||
CoordinatesChunk clickedChunk = new CoordinatesChunk(dim, chunkX, chunkZ);
|
||||
|
||||
if (ChunkManager.chunkMeanTime.containsKey(clickedChunk)){
|
||||
if (this.selectedChunk == null)
|
||||
@@ -195,6 +195,13 @@ public class OverlayMeanTime implements IMwDataProvider {
|
||||
|
||||
}
|
||||
|
||||
public void setSelectedChunk(int dim, int chunkX, int chunkZ){
|
||||
this.selectedChunk = new CoordinatesChunk(dim, chunkX, chunkZ);
|
||||
|
||||
if (this.selectedChunk != null)
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqTEsInChunk.create(this.selectedChunk));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDimensionChanged(int dimension, MapView mapview) {
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqMeanTimeInDim.create(dimension));
|
||||
|
||||
@@ -1,14 +1,18 @@
|
||||
package mcp.mobius.opis.proxy;
|
||||
|
||||
import java.awt.Font;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import mapwriter.api.MwAPI;
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.data.holders.TileEntityStats;
|
||||
import mcp.mobius.opis.gui.font.Fonts;
|
||||
import mcp.mobius.opis.gui.font.TrueTypeFont;
|
||||
import mcp.mobius.opis.gui.screens.ScreenBase;
|
||||
import mcp.mobius.opis.gui.screens.ScreenTileEntity;
|
||||
import mcp.mobius.opis.overlay.OverlayLoadedChunks;
|
||||
import mcp.mobius.opis.overlay.OverlayMeanTime;
|
||||
|
||||
@@ -31,4 +35,12 @@ public class ProxyClient extends ProxyServer {
|
||||
//fontMC24 = Fonts.createFont(new ResourceLocation("opis", "fonts/Minecraftia.ttf"), 24, true);
|
||||
fontMC8 = Fonts.loadSystemFont("Monospace", 12, true, Font.TRUETYPE_FONT | Font.BOLD);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayTileEntityList(ArrayList<TileEntityStats> stats){
|
||||
ScreenBase screenTEs = new ScreenTileEntity(null, stats);
|
||||
screenTEs.display();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1,8 +1,10 @@
|
||||
package mcp.mobius.opis.proxy;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
import cpw.mods.fml.common.network.Player;
|
||||
import mcp.mobius.opis.data.holders.TileEntityStats;
|
||||
import mcp.mobius.opis.overlay.OverlayStatus;
|
||||
|
||||
public class ProxyServer {
|
||||
@@ -10,4 +12,5 @@ public class ProxyServer {
|
||||
public HashMap<Player, Integer> playerDimension = new HashMap<Player, Integer>();
|
||||
|
||||
public void init(){}
|
||||
public void displayTileEntityList(ArrayList<TileEntityStats> stats){}
|
||||
}
|
||||
Reference in new issue
Block a user