diff --git a/mcp/mobius/opis/commands/server/CommandAddPrivileged.java b/mcp/mobius/opis/commands/server/CommandAddPrivileged.java new file mode 100644 index 0000000..260e99e --- /dev/null +++ b/mcp/mobius/opis/commands/server/CommandAddPrivileged.java @@ -0,0 +1,43 @@ +package mcp.mobius.opis.commands.server; + +import mcp.mobius.opis.server.PlayerTracker; +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.dedicated.DedicatedServer; +import net.minecraft.util.ChatMessageComponent; + +public class CommandAddPrivileged extends CommandBase { + + @Override + public String getCommandName() { + return "opis_addpriv"; + } + + @Override + public String getCommandUsage(ICommandSender icommandsender) { + return ""; + } + + @Override + public void processCommand(ICommandSender icommandsender, String[] astring) { + PlayerTracker.instance().addPrivilegedPlayer(astring[0]); + icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(String.format("Player %s added to Opis user list", astring[0]))); + } + + @Override + public int getRequiredPermissionLevel() + { + return 3; + } + + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) + { + 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); + } +} diff --git a/mcp/mobius/opis/commands/server/CommandRmPrivileged.java b/mcp/mobius/opis/commands/server/CommandRmPrivileged.java new file mode 100644 index 0000000..e201224 --- /dev/null +++ b/mcp/mobius/opis/commands/server/CommandRmPrivileged.java @@ -0,0 +1,50 @@ +package mcp.mobius.opis.commands.server; + +import mcp.mobius.opis.server.PlayerTracker; +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.dedicated.DedicatedServer; +import net.minecraft.util.ChatMessageComponent; + +public class CommandRmPrivileged extends CommandBase{ + + @Override + public String getCommandName() { + return "opis_rmpriv"; + } + + @Override + public String getCommandUsage(ICommandSender icommandsender) { + return ""; + } + + @Override + public void processCommand(ICommandSender icommandsender, String[] astring) { + if (PlayerTracker.instance().isPlayerPrivileged(astring[0])){ + PlayerTracker.instance().rmPrivilegedPlayer(astring[0]); + icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(String.format("Player %s removed from Opis user list.", astring[0]))); + } else { + icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(String.format("Player %s not found in list.", astring[0]))); + } + + + + } + + @Override + public int getRequiredPermissionLevel() + { + return 3; + } + + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) + { + 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); + } +} diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index b125faa..2a69907 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -11,6 +11,7 @@ import mcp.mobius.opis.client.OpisClientTickHandler; import mcp.mobius.opis.commands.client.CommandClientShowRenderTick; import mcp.mobius.opis.commands.client.CommandClientStart; import mcp.mobius.opis.commands.client.CommandOpis; +import mcp.mobius.opis.commands.server.CommandAddPrivileged; import mcp.mobius.opis.commands.server.CommandAmountEntities; import mcp.mobius.opis.commands.server.CommandChunkDump; import mcp.mobius.opis.commands.server.CommandChunkList; @@ -23,6 +24,7 @@ import mcp.mobius.opis.commands.server.CommandKill; import mcp.mobius.opis.commands.server.CommandKillAll; import mcp.mobius.opis.commands.server.CommandMeanModTime; import mcp.mobius.opis.commands.server.CommandReset; +import mcp.mobius.opis.commands.server.CommandRmPrivileged; import mcp.mobius.opis.commands.server.CommandStart; import mcp.mobius.opis.commands.server.CommandStop; import mcp.mobius.opis.commands.server.CommandTPS; @@ -142,6 +144,8 @@ public class modOpis { event.registerServerCommand(new CommandHandler()); event.registerServerCommand(new CommandEntityCreate()); event.registerServerCommand(new CommandOpis()); + event.registerServerCommand(new CommandAddPrivileged()); + event.registerServerCommand(new CommandRmPrivileged()); //event.registerServerCommand(new CommandClientTest()); //event.registerServerCommand(new CommandClientStart()); diff --git a/mcp/mobius/opis/server/PlayerTracker.java b/mcp/mobius/opis/server/PlayerTracker.java index 321d60f..f72d73a 100644 --- a/mcp/mobius/opis/server/PlayerTracker.java +++ b/mcp/mobius/opis/server/PlayerTracker.java @@ -27,7 +27,7 @@ public class PlayerTracker implements IPlayerTracker{ public void addPrivilegedPlayer(String name, boolean save){ this.playerPrivileged.add(name); if (save){ - modOpis.instance.config.get(Configuration.CATEGORY_GENERAL, "privileged", new String[]{}).set((String[])playerPrivileged.toArray()); + modOpis.instance.config.get(Configuration.CATEGORY_GENERAL, "privileged", new String[]{}).set(playerPrivileged.toArray(new String[]{})); modOpis.instance.config.save(); } } @@ -38,7 +38,7 @@ public class PlayerTracker implements IPlayerTracker{ public void rmPrivilegedPlayer(String name){ this.playerPrivileged.remove(name); - modOpis.instance.config.get(Configuration.CATEGORY_GENERAL, "privileged", new String[]{}).set((String[])playerPrivileged.toArray()); + modOpis.instance.config.get(Configuration.CATEGORY_GENERAL, "privileged", new String[]{}).set(playerPrivileged.toArray(new String[]{})); modOpis.instance.config.save(); } @@ -52,8 +52,16 @@ public class PlayerTracker implements IPlayerTracker{ PlayerTracker.instance().addPrivilegedPlayer(s,false); } + public boolean isTrueOP(Player player){ + return this.isTrueOP(((EntityPlayerMP)player).username); + } + + public boolean isTrueOP(String name){ + return MinecraftServer.getServer().getConfigurationManager().isPlayerOpped(name) || MinecraftServer.getServer().isSinglePlayer(); + } + public boolean isOp(Player player){ - return MinecraftServer.getServer().getConfigurationManager().isPlayerOpped(((EntityPlayerMP)player).username) || MinecraftServer.getServer().isSinglePlayer() || PlayerTracker.instance().isPlayerPrivileged(((EntityPlayerMP)player).username); + return this.isOp(((EntityPlayerMP)player).username); } public boolean isOp(String name){