mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-22 21:20:04 +00:00
Added a cumulative screen for entities.
This commit is contained in:
1 parent
cd05b01fc8
commit
ca7122d741
9 files changed
+181
-3
No files matched your search
@@ -0,0 +1,47 @@
|
||||
package mcp.mobius.opis.commands;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
import mcp.mobius.opis.data.EntityManager;
|
||||
import mcp.mobius.opis.network.server.Packet_DataScreenAmountEntities;
|
||||
import net.minecraft.command.CommandBase;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.network.MemoryConnection;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.dedicated.DedicatedServer;
|
||||
|
||||
public class CommandAmountEntities extends CommandBase {
|
||||
|
||||
@Override
|
||||
public String getCommandName() {
|
||||
return "opis_nent";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCommandUsage(ICommandSender icommandsender) {
|
||||
return "";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void processCommand(ICommandSender icommandsender, String[] astring) {
|
||||
HashMap<String, Integer> ents = EntityManager.getCumulativeEntities();
|
||||
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataScreenAmountEntities.create(ents));
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRequiredPermissionLevel()
|
||||
{
|
||||
return 3;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canCommandSenderUseCommand(ICommandSender sender)
|
||||
{
|
||||
if (sender instanceof DedicatedServer) return false;
|
||||
if (((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true;
|
||||
return MinecraftServer.getServer().getConfigurationManager().isPlayerOpped(((EntityPlayerMP)sender).username);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -113,6 +113,28 @@ public class EntityManager {
|
||||
return entities;
|
||||
}
|
||||
|
||||
/* Returns a hashmap with the entity name and amount of it on the server */
|
||||
public static HashMap<String, Integer> getCumulativeEntities(){
|
||||
HashMap<String, Integer> entities = new HashMap<String, Integer>();
|
||||
|
||||
for (int dim : DimensionManager.getIDs()){
|
||||
World world = DimensionManager.getWorld(dim);
|
||||
if (world == null) continue;
|
||||
|
||||
for (int i = 0; i < world.loadedEntityList.size(); i++){
|
||||
Entity ent = (Entity)world.loadedEntityList.get(i);
|
||||
String name = ent.getClass().getName();
|
||||
|
||||
if (!entities.containsKey(name))
|
||||
entities.put(name, 0);
|
||||
|
||||
entities.put(name, entities.get(name) + 1);
|
||||
}
|
||||
}
|
||||
|
||||
return entities;
|
||||
}
|
||||
|
||||
public static CoordinatesBlock getTeleportTarget(CoordinatesBlock coord){
|
||||
World world = DimensionManager.getWorld(coord.dim);
|
||||
if (world == null) {return null;}
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
package mcp.mobius.opis.gui.screens;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.gui.interfaces.CType;
|
||||
import mcp.mobius.opis.gui.interfaces.WAlign;
|
||||
import mcp.mobius.opis.gui.widgets.WidgetGeometry;
|
||||
import mcp.mobius.opis.gui.widgets.tableview.ViewTable;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
|
||||
public class ScreenEntityAmount extends ScreenBase {
|
||||
|
||||
public ScreenEntityAmount(GuiScreen parent, HashMap<String, Integer> stat) {
|
||||
super(parent);
|
||||
|
||||
ViewTable table = (ViewTable)this.getRoot().addWidget("Table", new ViewTable(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)
|
||||
//.setColumnsTitle("\u00a7a\u00a7oType", "\u00a7a\u00a7oPos", "\u00a7a\u00a7oUpdate Time")
|
||||
.setColumnsTitle("Type", "Amount")
|
||||
.setColumnsWidth(50, 50)
|
||||
.setRowColors(0xff808080, 0xff505050)
|
||||
.setFontSize(1.0f);
|
||||
|
||||
for (String name : stat.keySet()){
|
||||
String[] namelst = name.split("\\.");
|
||||
String nameshort = namelst[namelst.length - 1];
|
||||
table.addRow(new Object(), nameshort, String.valueOf(stat.get(name)));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar;
|
||||
import mcp.mobius.opis.client.OpisClientEventHandler;
|
||||
import mcp.mobius.opis.client.OpisClientTickHandler;
|
||||
import mcp.mobius.opis.commands.CommandAmountEntities;
|
||||
import mcp.mobius.opis.commands.CommandChunkDump;
|
||||
import mcp.mobius.opis.commands.CommandChunkList;
|
||||
import mcp.mobius.opis.commands.CommandDataDump;
|
||||
@@ -101,7 +102,8 @@ public class modOpis {
|
||||
event.registerServerCommand(new CommandMeanModTime());
|
||||
event.registerServerCommand(new CommandDataDump());
|
||||
event.registerServerCommand(new CommandTicks());
|
||||
event.registerServerCommand(new CommandTimingEntities());
|
||||
event.registerServerCommand(new CommandTimingEntities());
|
||||
event.registerServerCommand(new CommandAmountEntities());
|
||||
//event.registerServerCommand(new CommandTPS());
|
||||
|
||||
GameRegistry.registerPlayerTracker(new OpisPlayerTracker());
|
||||
|
||||
@@ -25,6 +25,7 @@ import mcp.mobius.opis.network.server.Packet_ChunkTopList;
|
||||
import mcp.mobius.opis.network.server.Packet_Chunks;
|
||||
import mcp.mobius.opis.network.server.Packet_DataListChunkEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_DataScreenAmountEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_DataScreenTimingEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_LoadedChunks;
|
||||
import mcp.mobius.opis.network.server.Packet_MeanTime;
|
||||
@@ -135,6 +136,11 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
Packet_DataScreenTimingEntities castedPacket = new Packet_DataScreenTimingEntities(packet);
|
||||
modOpis.proxy.displayEntityList(castedPacket.entities);
|
||||
}
|
||||
|
||||
else if (header == Packets.DATA_SCREEN_AMOUNT_ENTITIES){
|
||||
Packet_DataScreenAmountEntities castedPacket = new Packet_DataScreenAmountEntities(packet);
|
||||
modOpis.proxy.displayEntityAmount(castedPacket.entities);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -204,7 +210,9 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
|
||||
else if (header == Packets.REQ_DATA){
|
||||
Packet_ReqData castedPacket = new Packet_ReqData(packet);
|
||||
DataReqHandler.instance().handle(castedPacket.coord, castedPacket.datatype, player);
|
||||
if (this.isOp(player)){
|
||||
DataReqHandler.instance().handle(castedPacket.coord, castedPacket.datatype, player);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ public class Packets {
|
||||
public static byte DATA_OVERLAY_CHUNK_ENTITIES = 0x40;
|
||||
public static byte DATA_LIST_CHUNK_ENTITIES = 0x41;
|
||||
public static byte DATA_SCREEN_TIMING_ENTITIES = 0x42;
|
||||
public static byte DATA_SCREEN_AMOUNT_ENTITIES = 0x43;
|
||||
|
||||
public static byte REQ_DATA = 0x50; // C => S
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package mcp.mobius.opis.network.server;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
|
||||
import mcp.mobius.opis.network.Packet251Extended;
|
||||
import mcp.mobius.opis.network.Packets;
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
|
||||
public class Packet_DataScreenAmountEntities {
|
||||
|
||||
public byte header;
|
||||
public HashMap<String, Integer> entities = new HashMap<String, Integer>();
|
||||
|
||||
public Packet_DataScreenAmountEntities(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++){
|
||||
String name = packet.readString(inputStream, 255);
|
||||
int amount = inputStream.readInt();
|
||||
entities.put(name, amount);
|
||||
}
|
||||
} catch (IOException e){}
|
||||
}
|
||||
|
||||
public static Packet250CustomPayload create(HashMap<String, Integer> entities){
|
||||
Packet251Extended packet = new Packet251Extended();
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
|
||||
DataOutputStream outputStream = new DataOutputStream(bos);
|
||||
|
||||
try{
|
||||
outputStream.writeByte(Packets.DATA_SCREEN_AMOUNT_ENTITIES);
|
||||
outputStream.writeInt(entities.keySet().size());
|
||||
for (String name : entities.keySet()){
|
||||
packet.writeString(name, outputStream);
|
||||
outputStream.writeInt(entities.get(name));
|
||||
}
|
||||
}catch(IOException e){}
|
||||
|
||||
packet.channel = "Opis";
|
||||
packet.data = bos.toByteArray();
|
||||
packet.length = bos.size();
|
||||
|
||||
return packet;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package mcp.mobius.opis.proxy;
|
||||
|
||||
import java.awt.Font;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -17,6 +18,7 @@ import mcp.mobius.opis.gui.font.TrueTypeFont;
|
||||
import mcp.mobius.opis.gui.screens.ScreenBase;
|
||||
import mcp.mobius.opis.gui.screens.ScreenChunks;
|
||||
import mcp.mobius.opis.gui.screens.ScreenEntity;
|
||||
import mcp.mobius.opis.gui.screens.ScreenEntityAmount;
|
||||
import mcp.mobius.opis.gui.screens.ScreenMods;
|
||||
import mcp.mobius.opis.gui.screens.ScreenTileEntity;
|
||||
import mcp.mobius.opis.overlay.OverlayLoadedChunks;
|
||||
@@ -57,6 +59,12 @@ public class ProxyClient extends ProxyServer {
|
||||
screenEnts.display();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayEntityAmount(HashMap<String, Integer> stats){
|
||||
ScreenBase screenEnts = new ScreenEntityAmount(null, stats);
|
||||
screenEnts.display();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayChunkList(ArrayList<ChunkStats> stats){
|
||||
ScreenBase screenChunks = new ScreenChunks(null, stats);
|
||||
|
||||
@@ -19,5 +19,5 @@ public class ProxyServer {
|
||||
public void displayEntityList(ArrayList<EntityStats> stats){}
|
||||
public void displayChunkList(ArrayList<ChunkStats> stats){}
|
||||
public void displayModList(ArrayList<ModStats> stats){}
|
||||
|
||||
public void displayEntityAmount(HashMap<String, Integer> stats){}
|
||||
}
|
||||
Reference in new issue
Block a user