diff --git a/mcp/mobius/opis/commands/client/CommandOpis.java b/mcp/mobius/opis/commands/client/CommandOpis.java index a3829db..721afeb 100644 --- a/mcp/mobius/opis/commands/client/CommandOpis.java +++ b/mcp/mobius/opis/commands/client/CommandOpis.java @@ -3,6 +3,7 @@ package mcp.mobius.opis.commands.client; import javax.swing.JFrame; import javax.swing.JLabel; +import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.network.DataReqHandler; import mcp.mobius.opis.network.enums.ClientCommand; import mcp.mobius.opis.network.server.Packet_ClientCommand; @@ -26,8 +27,8 @@ public class CommandOpis extends CommandBase { @Override public void processCommand(ICommandSender icommandsender, String[] astring) { - PlayerTracker.instance().playersSwing.add((EntityPlayer)icommandsender); - PlayerTracker.instance().playersOpis.add((EntityPlayer)icommandsender); + PlayerTracker.instance().playersSwing.add((Player)icommandsender); + PlayerTracker.instance().playersOpis.add((Player)icommandsender); ((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_ClientCommand.create(ClientCommand.SHOW_SWING)); } diff --git a/mcp/mobius/opis/commands/server/CommandAddPrivileged.java b/mcp/mobius/opis/commands/server/CommandAddPrivileged.java index 1ecf543..6efa28d 100644 --- a/mcp/mobius/opis/commands/server/CommandAddPrivileged.java +++ b/mcp/mobius/opis/commands/server/CommandAddPrivileged.java @@ -39,7 +39,7 @@ public class CommandAddPrivileged extends CommandBase implements IOpisCommand{ if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isTrueOP(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isAdmin(((EntityPlayerMP)sender).username); } @Override diff --git a/mcp/mobius/opis/commands/server/CommandAmountEntities.java b/mcp/mobius/opis/commands/server/CommandAmountEntities.java index 279a437..9e1f339 100644 --- a/mcp/mobius/opis/commands/server/CommandAmountEntities.java +++ b/mcp/mobius/opis/commands/server/CommandAmountEntities.java @@ -66,7 +66,7 @@ public class CommandAmountEntities extends CommandBase implements IOpisCommand{ if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isOp(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isPrivileged(((EntityPlayerMP)sender).username); } @Override diff --git a/mcp/mobius/opis/commands/server/CommandChunkList.java b/mcp/mobius/opis/commands/server/CommandChunkList.java index 12f2689..dc62c69 100644 --- a/mcp/mobius/opis/commands/server/CommandChunkList.java +++ b/mcp/mobius/opis/commands/server/CommandChunkList.java @@ -74,7 +74,7 @@ public class CommandChunkList extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isOp(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isPrivileged(((EntityPlayerMP)sender).username); } @Override diff --git a/mcp/mobius/opis/commands/server/CommandDataDump.java b/mcp/mobius/opis/commands/server/CommandDataDump.java index 39e3ffc..eb6ab6a 100644 --- a/mcp/mobius/opis/commands/server/CommandDataDump.java +++ b/mcp/mobius/opis/commands/server/CommandDataDump.java @@ -142,7 +142,7 @@ public class CommandDataDump extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isOp(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isPrivileged(((EntityPlayerMP)sender).username); } @Override diff --git a/mcp/mobius/opis/commands/server/CommandEntityCreate.java b/mcp/mobius/opis/commands/server/CommandEntityCreate.java index 7b58bf3..acaf396 100644 --- a/mcp/mobius/opis/commands/server/CommandEntityCreate.java +++ b/mcp/mobius/opis/commands/server/CommandEntityCreate.java @@ -49,7 +49,7 @@ public class CommandEntityCreate extends CommandBase { if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isOp(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isPrivileged(((EntityPlayerMP)sender).username); } } diff --git a/mcp/mobius/opis/commands/server/CommandFrequency.java b/mcp/mobius/opis/commands/server/CommandFrequency.java index 46f69da..63ad8dd 100644 --- a/mcp/mobius/opis/commands/server/CommandFrequency.java +++ b/mcp/mobius/opis/commands/server/CommandFrequency.java @@ -54,7 +54,7 @@ public class CommandFrequency extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isOp(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isPrivileged(((EntityPlayerMP)sender).username); } @Override diff --git a/mcp/mobius/opis/commands/server/CommandHandler.java b/mcp/mobius/opis/commands/server/CommandHandler.java index 16308a9..0e6e3b6 100644 --- a/mcp/mobius/opis/commands/server/CommandHandler.java +++ b/mcp/mobius/opis/commands/server/CommandHandler.java @@ -61,7 +61,7 @@ public class CommandHandler extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isOp(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isPrivileged(((EntityPlayerMP)sender).username); } @Override diff --git a/mcp/mobius/opis/commands/server/CommandKill.java b/mcp/mobius/opis/commands/server/CommandKill.java index 0db4b97..fd0b616 100644 --- a/mcp/mobius/opis/commands/server/CommandKill.java +++ b/mcp/mobius/opis/commands/server/CommandKill.java @@ -68,7 +68,7 @@ public class CommandKill extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isOp(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isPrivileged(((EntityPlayerMP)sender).username); } @Override diff --git a/mcp/mobius/opis/commands/server/CommandKillAll.java b/mcp/mobius/opis/commands/server/CommandKillAll.java index fe83861..ae9506e 100644 --- a/mcp/mobius/opis/commands/server/CommandKillAll.java +++ b/mcp/mobius/opis/commands/server/CommandKillAll.java @@ -91,7 +91,7 @@ public class CommandKillAll extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isOp(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isPrivileged(((EntityPlayerMP)sender).username); } @Override diff --git a/mcp/mobius/opis/commands/server/CommandMeanModTime.java b/mcp/mobius/opis/commands/server/CommandMeanModTime.java index ea412fb..d3e0a50 100644 --- a/mcp/mobius/opis/commands/server/CommandMeanModTime.java +++ b/mcp/mobius/opis/commands/server/CommandMeanModTime.java @@ -61,7 +61,7 @@ public class CommandMeanModTime extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isOp(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isPrivileged(((EntityPlayerMP)sender).username); } @Override diff --git a/mcp/mobius/opis/commands/server/CommandReset.java b/mcp/mobius/opis/commands/server/CommandReset.java index 874794e..14ca645 100644 --- a/mcp/mobius/opis/commands/server/CommandReset.java +++ b/mcp/mobius/opis/commands/server/CommandReset.java @@ -62,7 +62,7 @@ public class CommandReset extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isOp(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isPrivileged(((EntityPlayerMP)sender).username); } @Override diff --git a/mcp/mobius/opis/commands/server/CommandRmPrivileged.java b/mcp/mobius/opis/commands/server/CommandRmPrivileged.java index 6c325c8..343786f 100644 --- a/mcp/mobius/opis/commands/server/CommandRmPrivileged.java +++ b/mcp/mobius/opis/commands/server/CommandRmPrivileged.java @@ -23,7 +23,7 @@ public class CommandRmPrivileged extends CommandBase implements IOpisCommand{ @Override public void processCommand(ICommandSender icommandsender, String[] astring) { - if (PlayerTracker.instance().isPlayerPrivileged(astring[0])){ + if (PlayerTracker.instance().isPrivileged(astring[0])){ PlayerTracker.instance().rmPrivilegedPlayer(astring[0]); icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(String.format("Player %s removed from Opis user list.", astring[0]))); } else { @@ -43,7 +43,7 @@ public class CommandRmPrivileged extends CommandBase implements IOpisCommand{ if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isTrueOP(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isAdmin(((EntityPlayerMP)sender).username); } @Override diff --git a/mcp/mobius/opis/commands/server/CommandStart.java b/mcp/mobius/opis/commands/server/CommandStart.java index 3a8645c..e70fa86 100644 --- a/mcp/mobius/opis/commands/server/CommandStart.java +++ b/mcp/mobius/opis/commands/server/CommandStart.java @@ -48,7 +48,7 @@ public class CommandStart extends CommandBase implements IOpisCommand { ProfilerRegistrar.turnOn(); if (icommandsender instanceof EntityPlayer) - PlayerTracker.instance().playersOpis.add((EntityPlayer)icommandsender); + PlayerTracker.instance().playersOpis.add((Player)icommandsender); icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(String.format("\u00A7oOpis started with a tick delay %s.", modOpis.profilerDelay))); } @@ -65,7 +65,7 @@ public class CommandStart extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isOp(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isPrivileged(((EntityPlayerMP)sender).username); } @Override diff --git a/mcp/mobius/opis/commands/server/CommandStop.java b/mcp/mobius/opis/commands/server/CommandStop.java index f05f7ce..62f4b1e 100644 --- a/mcp/mobius/opis/commands/server/CommandStop.java +++ b/mcp/mobius/opis/commands/server/CommandStop.java @@ -41,10 +41,10 @@ public class CommandStop extends CommandBase implements IOpisCommand { ProfilerRegistrar.turnOff(); if (icommandsender instanceof EntityPlayer) - PlayerTracker.instance().playersOpis.add((EntityPlayer)icommandsender); + PlayerTracker.instance().playersOpis.add((Player)icommandsender); - for (EntityPlayer player : PlayerTracker.instance().playersOpis) - PacketDispatcher.sendPacketToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(String.format("\u00A7oOpis stopped."))), (Player)player); + for (Player player : PlayerTracker.instance().playersOpis) + PacketDispatcher.sendPacketToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(String.format("\u00A7oOpis stopped."))), player); if (!(icommandsender instanceof EntityPlayer)) icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(String.format("\u00A7oOpis stopped."))); @@ -62,7 +62,7 @@ public class CommandStop extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isOp(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isPrivileged(((EntityPlayerMP)sender).username); } @Override diff --git a/mcp/mobius/opis/commands/server/CommandTicks.java b/mcp/mobius/opis/commands/server/CommandTicks.java index ede9206..79e0b05 100644 --- a/mcp/mobius/opis/commands/server/CommandTicks.java +++ b/mcp/mobius/opis/commands/server/CommandTicks.java @@ -54,7 +54,7 @@ public class CommandTicks extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isOp(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isPrivileged(((EntityPlayerMP)sender).username); } @Override diff --git a/mcp/mobius/opis/commands/server/CommandTimingEntities.java b/mcp/mobius/opis/commands/server/CommandTimingEntities.java index 799bb84..0c7f364 100644 --- a/mcp/mobius/opis/commands/server/CommandTimingEntities.java +++ b/mcp/mobius/opis/commands/server/CommandTimingEntities.java @@ -71,7 +71,7 @@ public class CommandTimingEntities extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isOp(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isPrivileged(((EntityPlayerMP)sender).username); } @Override diff --git a/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java b/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java index 661b5bd..d292a5d 100644 --- a/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java +++ b/mcp/mobius/opis/commands/server/CommandTimingTileEntities.java @@ -68,7 +68,7 @@ public class CommandTimingTileEntities extends CommandBase implements IOpisComma if (sender instanceof DedicatedServer) return true; if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.instance().isOp(((EntityPlayerMP)sender).username); + return PlayerTracker.instance().isPrivileged(((EntityPlayerMP)sender).username); } @Override diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index a657e3e..4547c3e 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -22,6 +22,7 @@ import mcp.mobius.opis.data.managers.TileEntityManager; import mcp.mobius.opis.gui.swing.SwingUI; import mcp.mobius.opis.network.client.Packet_ReqChunks; import mcp.mobius.opis.network.client.Packet_ReqData; +import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.DataReq; import mcp.mobius.opis.network.server.Packet_Chunks; import mcp.mobius.opis.network.server.Packet_ClientCommand; @@ -186,7 +187,7 @@ public class OpisPacketHandler implements IPacketHandler { void onPacketToServer(INetworkManager manager, Packet250CustomPayload packet, Player player, Byte header) { if (header == Packets.REQ_CHUNKS){ Packet_ReqChunks castedPacket = new Packet_ReqChunks(packet); - if (PlayerTracker.instance().isOp(player)){ + if (PlayerTracker.instance().getPlayerAccessLevel(player).ordinal() > AccessLevel.PRIVILEGED.ordinal()){ ArrayList list = new ArrayList(); World world = DimensionManager.getWorld(castedPacket.dim); @@ -210,7 +211,7 @@ public class OpisPacketHandler implements IPacketHandler { else if (header == Packets.REQ_DATA){ Packet_ReqData castedPacket = new Packet_ReqData(packet); - if (PlayerTracker.instance().isOp(player)){ + if (castedPacket.dataReq.canPlayerUseCommand(player)){ DataReqHandler.instance().handle(castedPacket.dataReq, castedPacket.param1, castedPacket.param2, player); } } diff --git a/mcp/mobius/opis/network/enums/AccessLevel.java b/mcp/mobius/opis/network/enums/AccessLevel.java new file mode 100644 index 0000000..c2bec0f --- /dev/null +++ b/mcp/mobius/opis/network/enums/AccessLevel.java @@ -0,0 +1,7 @@ +package mcp.mobius.opis.network.enums; + +public enum AccessLevel { + NONE, + PRIVILEGED, + ADMIN; +} diff --git a/mcp/mobius/opis/network/enums/DataReq.java b/mcp/mobius/opis/network/enums/DataReq.java index 6242aab..8382b5b 100644 --- a/mcp/mobius/opis/network/enums/DataReq.java +++ b/mcp/mobius/opis/network/enums/DataReq.java @@ -1,5 +1,9 @@ package mcp.mobius.opis.network.enums; +import static mcp.mobius.opis.network.enums.AccessLevel.*; +import cpw.mods.fml.common.network.Player; +import mcp.mobius.opis.server.PlayerTracker; + public enum DataReq { LIST_CHUNK_TILEENTS, @@ -25,10 +29,10 @@ public enum DataReq { VALUE_AMOUNT_UPLOAD, VALUE_AMOUNT_DOWNLOAD, - COMMAND_TELEPORT_BLOCK, - COMMAND_TELEPORT_ENTITIES, - COMMAND_START, - COMMAND_KILLALL, + COMMAND_TELEPORT_BLOCK(PRIVILEGED), + COMMAND_TELEPORT_ENTITIES(PRIVILEGED), + COMMAND_START(PRIVILEGED), + COMMAND_KILLALL(PRIVILEGED), COMMAND_FILTERING_TRUE, COMMAND_FILTERING_FALSE, COMMAND_UNREGISTER, @@ -36,17 +40,29 @@ public enum DataReq { OVERLAY_CHUNK_ENTITIES, OVERLAY_CHUNK_TIMING; - private int accessLevel = 0; + private AccessLevel accessLevel = AccessLevel.NONE; private DataReq(){ - accessLevel = 0; + accessLevel = AccessLevel.NONE; } - private DataReq(int level){ + private DataReq(AccessLevel level){ accessLevel = level; } - public int getAccesLevel(){ + public AccessLevel getAccessLevel(){ return this.accessLevel; } + + public void setAccessLevel(AccessLevel level){ + this.accessLevel = level; + } + + public boolean canPlayerUseCommand(Player player){ + return PlayerTracker.instance().getPlayerAccessLevel(player).ordinal() >= this.accessLevel.ordinal(); + } + + public boolean canPlayerUseCommand(String name){ + return PlayerTracker.instance().getPlayerAccessLevel(name).ordinal() >= this.accessLevel.ordinal(); + } } diff --git a/mcp/mobius/opis/server/OpisServerTickHandler.java b/mcp/mobius/opis/server/OpisServerTickHandler.java index 645e493..030a80e 100644 --- a/mcp/mobius/opis/server/OpisServerTickHandler.java +++ b/mcp/mobius/opis/server/OpisServerTickHandler.java @@ -63,10 +63,10 @@ public class OpisServerTickHandler implements ITickHandler { if (System.nanoTime() - timeLastUpdate > 1000000000){ timeLastUpdate = System.nanoTime(); - for (EntityPlayer player : PlayerTracker.instance().playersSwing){ - PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_AMOUNT_UPLOAD, new SerialLong(PacketProfiler.instance().dataSizeOut)), (Player)player); - PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_AMOUNT_DOWNLOAD, new SerialLong(PacketProfiler.instance().dataSizeIn)), (Player)player); - PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_TIMING_TICK, TickProfiler.instance().stats), (Player)player); + for (Player player : PlayerTracker.instance().playersSwing){ + PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_AMOUNT_UPLOAD, new SerialLong(PacketProfiler.instance().dataSizeOut)), player); + PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_AMOUNT_DOWNLOAD, new SerialLong(PacketProfiler.instance().dataSizeIn)), player); + PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_TIMING_TICK, TickProfiler.instance().stats), player); } PacketProfiler.instance().dataSizeOut = 0L; PacketProfiler.instance().dataSizeIn = 0L; @@ -100,34 +100,34 @@ public class OpisServerTickHandler implements ITickHandler { SerialDouble totalEntUpdate = new SerialDouble(GlobalTimingManager.getTotalEntUpdateStats()); - for (EntityPlayer player : PlayerTracker.instance().playersSwing){ + for (Player player : PlayerTracker.instance().playersSwing){ // This portion is to get the proper filtered amounts depending on the player preferences. - String name = player.getEntityName(); + String name = ((EntityPlayer)player).getEntityName(); boolean filtered = false; if (PlayerTracker.instance().filteredAmount.containsKey(name)) filtered = PlayerTracker.instance().filteredAmount.get(name); ArrayList amountEntities = EntityManager.getCumulativeEntities(filtered); // Here we send a full update to the player - PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST_AMOUNT_ENTITIES, amountEntities), (Player)player); - PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST_TIMING_HANDLERS, timingHandlers), (Player)player); - PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST_TIMING_ENTITIES, timingEntities), (Player)player); - PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST_TIMING_TILEENTS, timingTileEnts), (Player)player); - PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST_TIMING_CHUNK, timingChunks), (Player)player); - PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_TIMING_TILEENTS, totalTimeTE), (Player)player); - PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_TIMING_ENTITIES, totalTimeEnt), (Player)player); - PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_TIMING_HANDLERS, totalTimeHandler),(Player)player); - PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_TIMING_WORLDTICK, totalWorldTick), (Player)player); - PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_TIMING_ENTUPDATE, totalEntUpdate), (Player)player); + PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST_AMOUNT_ENTITIES, amountEntities), player); + PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST_TIMING_HANDLERS, timingHandlers), player); + PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST_TIMING_ENTITIES, timingEntities), player); + PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST_TIMING_TILEENTS, timingTileEnts), player); + PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST_TIMING_CHUNK, timingChunks), player); + PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_TIMING_TILEENTS, totalTimeTE), player); + PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_TIMING_ENTITIES, totalTimeEnt), player); + PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_TIMING_HANDLERS, totalTimeHandler),player); + PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_TIMING_WORLDTICK, totalWorldTick), player); + PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_TIMING_ENTUPDATE, totalEntUpdate), player); PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_AMOUNT_TILEENTS, new SerialInt(TileEntityManager.stats.size())), (Player)player); PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_AMOUNT_ENTITIES, new SerialInt(EntityManager.stats.size())), (Player)player); PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE_AMOUNT_HANDLERS, new SerialInt(TickHandlerManager.startStats.size())),(Player)player); } - for (EntityPlayer player : PlayerTracker.instance().playersOpis) - PacketDispatcher.sendPacketToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(String.format("\u00A7oOpis automaticly stopped after %d ticks.", modOpis.profilerMaxTicks))), (Player)player); + for (Player player : PlayerTracker.instance().playersOpis) + PacketDispatcher.sendPacketToPlayer(new Packet3Chat(ChatMessageComponent.createFromText(String.format("\u00A7oOpis automaticly stopped after %d ticks.", modOpis.profilerMaxTicks))), player); } } diff --git a/mcp/mobius/opis/server/PlayerTracker.java b/mcp/mobius/opis/server/PlayerTracker.java index f72d73a..6ff46e0 100644 --- a/mcp/mobius/opis/server/PlayerTracker.java +++ b/mcp/mobius/opis/server/PlayerTracker.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.HashSet; import mcp.mobius.opis.modOpis; +import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.overlay.OverlayStatus; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -17,13 +18,26 @@ public class PlayerTracker implements IPlayerTracker{ public static PlayerTracker instance() {return _instance;} private PlayerTracker(){} - public HashSet playersSwing = new HashSet(); //This is the list of players who have opened the UI - public HashSet playersOpis = new HashSet(); //This is the list of players who have opened the UI or used the command line + public HashSet playersSwing = new HashSet(); //This is the list of players who have opened the UI + public HashSet playersOpis = new HashSet(); //This is the list of players who have opened the UI or used the command line public HashMap filteredAmount = new HashMap(); //Should the entity amount be filtered or not public HashMap playerOverlayStatus = new HashMap(); public HashMap playerDimension = new HashMap(); private HashSet playerPrivileged = new HashSet(); + public AccessLevel getPlayerAccessLevel(Player player){ + return this.getPlayerAccessLevel(((EntityPlayerMP)player).username); + } + + public AccessLevel getPlayerAccessLevel(String name){ + if (MinecraftServer.getServer().getConfigurationManager().isPlayerOpped(name) || MinecraftServer.getServer().isSinglePlayer()) + return AccessLevel.ADMIN; + else if (playerPrivileged.contains(name)) + return AccessLevel.PRIVILEGED; + else + return AccessLevel.NONE; + } + public void addPrivilegedPlayer(String name, boolean save){ this.playerPrivileged.add(name); if (save){ @@ -42,32 +56,30 @@ public class PlayerTracker implements IPlayerTracker{ modOpis.instance.config.save(); } - public boolean isPlayerPrivileged(String name){ - return this.playerPrivileged.contains(name); - } - public void reloeadPriviligedPlayers(){ String[] users = modOpis.instance.config.get(Configuration.CATEGORY_GENERAL, "privileged", new String[]{}).getStringList(); for (String s : users) PlayerTracker.instance().addPrivilegedPlayer(s,false); } - public boolean isTrueOP(Player player){ - return this.isTrueOP(((EntityPlayerMP)player).username); + public boolean isAdmin(Player player){ + return this.getPlayerAccessLevel(player).ordinal() >= AccessLevel.ADMIN.ordinal(); } - public boolean isTrueOP(String name){ - return MinecraftServer.getServer().getConfigurationManager().isPlayerOpped(name) || MinecraftServer.getServer().isSinglePlayer(); + public boolean isAdmin(String name){ + return this.getPlayerAccessLevel(name).ordinal() >= AccessLevel.ADMIN.ordinal(); } - public boolean isOp(Player player){ - return this.isOp(((EntityPlayerMP)player).username); + public boolean isPrivileged(Player player){ + return this.getPlayerAccessLevel(player).ordinal() >= AccessLevel.PRIVILEGED.ordinal(); } - public boolean isOp(String name){ - return MinecraftServer.getServer().getConfigurationManager().isPlayerOpped(name) || MinecraftServer.getServer().isSinglePlayer() || PlayerTracker.instance().isPlayerPrivileged(name); + public boolean isPrivileged(String name){ + return this.getPlayerAccessLevel(name).ordinal() >= AccessLevel.PRIVILEGED.ordinal(); } + //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++// + @Override public void onPlayerLogin(EntityPlayer player) { } @@ -76,6 +88,8 @@ public class PlayerTracker implements IPlayerTracker{ public void onPlayerLogout(EntityPlayer player) { this.playerOverlayStatus.remove(player); this.playerDimension.remove(player); + this.playersOpis.remove(player); + this.playersSwing.remove(player); } @Override