EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-24 22:26:46 +01:00
Code Issues Projects Releases Wiki Activity

New: /whois, /rules, /tp, /tphere, messages when commands are parsed

Browse Source 
Changed: Formatting for the plugin, logging for adminchat
Removed: If else statements for onCommand, they were unecessary
This commit is contained in:
nossr50 2010-10-08 15:47:56 -07:00
parent fd3df0696e
commit f77983d757
1 changed files with 270 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

402
vminecraft.java
View File

@ -1,4 +1,5 @@
//This is where the bulk of the plugin is //This is where the bulk of the plugin is
import java.util.Locale;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.logging.Level; import java.util.logging.Level;
public class vminecraft extends Plugin { public class vminecraft extends Plugin {
@ -16,6 +17,7 @@ public class vminecraft extends Plugin {
} }
static final Logger log = Logger.getLogger("Minecraft"); static final Logger log = Logger.getLogger("Minecraft");
@Override
public void onLogin(Player player) public void onLogin(Player player)
{ {
settings.getInstance().loadSettings(); settings.getInstance().loadSettings();
@ -25,23 +27,28 @@ public class vminecraft extends Plugin {
//Settings.loadSettings(); //Settings.loadSettings();
settings.getInstance().loadSettings(); settings.getInstance().loadSettings();
String playerb = player.getName(); //Used to get names from players, can't remember why I can't just use 'player' String playerb = player.getName(); //Used to get names from players, can't remember why I can't just use 'player'
String temp2 = "<" + etc.getInstance().getUserColor(playerb) + player.getName() + Colors.White +"> "; //Inserts a name before the message String temp2 = "<" + player.getColor() + player.getName() + Colors.White +"> "; //Inserts a name before the message
String adminchat = Colors.LightGreen + "{" + etc.getInstance().getUserColor(playerb) + player.getName() + Colors.LightGreen +"}" + Colors.White + " "; //Inserts names admin chat style before the message String adminchat = Colors.DarkPurple + "{" + player.getColor() + player.getName() + Colors.DarkPurple +"}" + Colors.White + " "; //Inserts names admin chat style before the message
String message2 = ""; //Used for greentext and FFF String message2 = ""; //Used for greentext and FFF
String check = temp2+message; //Calculates how long your message will be including your name in the equation, this prevents minecraft clients from crashing when a color code is inserted after a linebreak String check = temp2+message; //Calculates how long your message will be including your name in the equation, this prevents minecraft clients from crashing when a color code is inserted after a linebreak
if (settings.getInstance().adminchat()&&message.startsWith("@") && (etc.getInstance().isUserInGroup(player, "mods") || etc.getInstance().isUserInGroup(player, "admins") || etc.getInstance().isUserInGroup(player, "superadmins"))) { if (settings.getInstance().adminchat()&&message.startsWith("@") && (player.isInGroup("mods") || player.isInGroup("admins") || player.isInGroup("superadmins"))) {
for (Player p : etc.getServer().getPlayerList()) { for (Player p : etc.getServer().getPlayerList()) {
String blaa = "";
if (p != null) { if (p != null) {
if (etc.getInstance().isUserInGroup(p, "mods") || (etc.getInstance().isUserInGroup(p, "admins")) || (etc.getInstance().isUserInGroup(p, "superadmins"))) { if (player.isInGroup("mods") || (player.isInGroup("admins")) || (player.isInGroup("superadmins"))) {
String blaa = "";
for ( int x = 1; x< message.length(); x++) { for ( int x = 1; x< message.length(); x++) {
blaa+=message.charAt(x); blaa+=message.charAt(x);
} }
p.sendMessage(adminchat+blaa); if (p.isInGroup("superadmins") || p.isInGroup("mods") || p.isInGroup("admins")){
log.log(Level.INFO, "@"+message); if (p != null) {
p.sendMessage(adminchat+blaa);
}
}
//where logs used to be
} }
} }
} }
log.log(Level.INFO, "@"+adminchat+message);
return true; return true;
} }
//Greentext //Greentext
@ -49,8 +56,7 @@ public class vminecraft extends Plugin {
id.a.log(Level.INFO, "<"+player.getName()+"> "+message); id.a.log(Level.INFO, "<"+player.getName()+"> "+message);
message = Colors.LightGreen + message; message = Colors.LightGreen + message;
message2 = temp2 + message; message2 = temp2 + message;
other.gmsg(message2); other.gmsg(message2);
return true; return true;
} }
//FFF //FFF
@ -58,8 +64,7 @@ public class vminecraft extends Plugin {
id.a.log(Level.INFO, "<"+player.getName()+"> "+message); id.a.log(Level.INFO, "<"+player.getName()+"> "+message);
message = Colors.Red + message; message = Colors.Red + message;
message2 = temp2 + message; message2 = temp2 + message;
other.gmsg(message2); other.gmsg(message2);
return true; return true;
} }
//QuakeColors //QuakeColors
@ -80,8 +85,7 @@ public class vminecraft extends Plugin {
message = temp2 + temp + " "; message = temp2 + temp + " ";
for (Player p : etc.getServer().getPlayerList()) { for (Player p : etc.getServer().getPlayerList()) {
if (p != null) { if (p != null) {
other.gmsg(message); other.gmsg(message);
return true; return true;
} }
} }
@ -89,17 +93,108 @@ public class vminecraft extends Plugin {
return false; return false;
} }
public boolean onCommand(Player player, String[] split) { public boolean onCommand(Player player, String[] split) {
if (!etc.getInstance().canUseCommand(player.getName(), split[0])) { if(!player.canUseCommand(split[0])) {
return false; return false;
}
//Replace id's /tp with my own so you can't tele to higher ranked players
if(split[0].equalsIgnoreCase("/tp")) {
{
if (split.length < 2) {
player.sendMessage(Colors.Rose + "Correct usage is: /tp [player]");
return true;
}
Player playerTarget = etc.getServer().matchPlayer(split[1]);
if (player.getName().equalsIgnoreCase(split[1])) {
player.sendMessage(Colors.Rose + "You're already here!");
return true;
}
if (!player.hasControlOver(playerTarget)) {
player.sendMessage(Colors.Red + "That player has higher permissions than you.");
return true;
}
if (playerTarget != null) {
log.log(Level.INFO, player.getName() + " teleported to " + playerTarget.getName());
player.teleportTo(playerTarget);
return true;
} else {
player.sendMessage(Colors.Rose + "Can't find user " + split[1] + ".");
return true;
}
}
}
//Same thing as my changes to /tp
if ((split[0].equalsIgnoreCase("/tphere") || split[0].equalsIgnoreCase("/s"))) {
if (split.length < 2) {
player.sendMessage(Colors.Rose + "Correct usage is: /tphere [player]");
return true;
}
Player playerTarget = etc.getServer().matchPlayer(split[1]);
if (!player.hasControlOver(playerTarget)) {
player.sendMessage(Colors.Red + "That player has higher permissions than you.");
return true;
}
if (player.getName().equalsIgnoreCase(split[1])) {
player.sendMessage(Colors.Rose + "Wow look at that! You teleported yourself to yourself!");
return true;
}
if (playerTarget != null) {
log.log(Level.INFO, player.getName() + " teleported " + player.getName() + " to their self.");
playerTarget.teleportTo(player);
} else {
player.sendMessage(Colors.Rose + "Can't find user " + split[1] + ".");
}
}
//Temporary fix, this will still go off if you enter anything for split[1] I need to make it so split[1] is the same name as a real player
if(split[0].equalsIgnoreCase("/kick")) {
if (split[1] != null){
other.gmsg(player.getColor()+player.getName()+Colors.Blue+" used kick.");
other.gmsg(Colors.Red+split[1]+" was the target.");
}
}
if(split[0].equalsIgnoreCase("/ban")) {
if (split[1] != null){
other.gmsg(player.getColor()+player.getName()+Colors.Blue+" used ban.");
other.gmsg(Colors.Red+split[1]+" was the target.");
}
}
if(split[0].equalsIgnoreCase("/ipban")) {
if (split[1] != null){
other.gmsg(player.getColor()+player.getName()+Colors.Blue+" used IP ban.");
other.gmsg(Colors.Red+split[1]+" was the target.");
}
}
if(split[0].equalsIgnoreCase("/time")) {
if (split.length <= 2) {
other.gmsg(Colors.Blue+"Time changes thanks to "+player.getColor()+player.getName());
return false;
}
}
//Rules
if(split[0].equalsIgnoreCase("/rules")) {
etc.getInstance().addCommand("/rules", "Displays the rules");
player.sendMessage(Colors.Blue + "Rules");
player.sendMessage(Colors.Blue+"#1:No griefing");
player.sendMessage(Colors.Blue+"#2:Don't spam night/day changes");
player.sendMessage(Colors.Blue+"#3:Don't beg for items that you could easily gather");
player.sendMessage(Colors.Blue+"#4:Don't steal from another players chest");
player.sendMessage(Colors.Blue+"#5:The admins word is final");
return true;
} }
//Fabulous //Fabulous
if (split[0].equalsIgnoreCase("/fabulous")&&settings.getInstance().cmdFabulous()) { if(split[0].equalsIgnoreCase("/fabulous") && settings.getInstance().cmdFabulous()) {
etc.getInstance().addCommand("/fabulous", "/fabulous <message>");
if (split.length == 1) {return false;} if (split.length == 1) {return false;}
String temp = ""; String temp = "";
String str = ""; String str = "";
//str = paramString.substring(paramString.indexOf(" ")).trim(); //str = paramString.substring(paramString.indexOf(" ")).trim();
str = id.combineSplit(1, split, " "); str = etc.combineSplit(1, split, " ");
String temp2 = "<" + player.getName() + "> "+str; String temp2 = "<" + player.getName() + "> "+str;
String[] rainbow = new String[] {Colors.Red, Colors.Rose, Colors.Yellow, Colors.Green, Colors.Blue, Colors.LightPurple, Colors.Purple}; String[] rainbow = new String[] {Colors.Red, Colors.Rose, Colors.Yellow, Colors.Green, Colors.Blue, Colors.LightPurple, Colors.Purple};
int counter=0; int counter=0;
@ -115,144 +210,181 @@ public class vminecraft extends Plugin {
if(counter==7){counter = 0; } if(counter==7){counter = 0; }
} }
str = temp+" "; str = temp+" ";
String message = "<" + etc.getInstance().getUserColor(player.getName()) + player.getName() + Colors.White + "> " + str; String message = "<" + player.getColor() + player.getName() + Colors.White + "> " + str;
other.gmsg(message); other.gmsg(message);
} else { } else {
player.sendMessage(Colors.Rose + "Message is too long"); player.sendMessage(Colors.Rose + "Message is too long");
} }
return true;
} }
//Promote //Promote
else if (settings.getInstance().cmdPromote()&&split[0].equalsIgnoreCase("/promote")) { if (settings.getInstance().cmdPromote() && split[0].equalsIgnoreCase("/promote")) {
log.log(Level.INFO, "Command used by " + player + " " + split[0] +" "+split[1]+" "); if(split.length != 2)
User user2 = etc.getInstance().getUser(split[1]); {
if (split.length < 2) { player.sendMessage(Colors.Rose + "Usage is /promote [Player]");
player.sendMessage(Colors.Rose + "Usage is /promote [player]"); }
}
if(user2 == null) { //Currently broken Player playerTarget = null;
player.sendMessage(Colors.Rose + "Player does not exist.");
return false; for( Player p : etc.getServer().getPlayerList())
} {
//ea player2 = id.match(split[1]); if (p.getName().equalsIgnoreCase(split[1]))
User user = etc.getInstance().getUser(split[1]); {
boolean newUser = false; playerTarget = p;
if (user == null) { }
player.sendMessage(Colors.Rose + "Adding new user."); }
newUser = true;
user = new User(); if( playerTarget!=null)
user.Name = split[1]; {
user.Administrator = false; if(playerTarget.isInGroup("admins"))
user.CanModifyWorld = true; {
user.IgnoreRestrictions = false; player.sendMessage(Colors.Rose + "You can not promote " + split[1] + " any higher.");
user.Commands = new String[]{""}; }
user.Prefix = ""; if(playerTarget.isInGroup("mods") && (player.isInGroup("superadmins")))
log.log(Level.INFO, player + " added new user ("+user+")"); //Not sure about keeping this {
return false; playerTarget.setGroups(ranks.Admins);
} etc.getInstance().getDataSource().modifyPlayer(playerTarget);
if (etc.getInstance().isUserInGroup(split[1], "admins") && (etc.getInstance().isUserInGroup(player, "admins") || etc.getInstance().isUserInGroup(player, "superadmins"))) { String message = Colors.Yellow + split[1] + " was promoted to" + Colors.Rose + " Admin";
player.sendMessage(Colors.Rose + "You cannot promote " + split[1] + " any higher."); other.gmsg(message);
} else if (etc.getInstance().isUserInGroup(split[1], "mods") && etc.getInstance().isUserInGroup(player, "superadmins")) { }
user.Groups = ranks.Admins; else if (playerTarget.isInGroup("trusted") && (player.isInGroup("admins") || player.isInGroup("superadmins")))
etc.getInstance().getDataSource().modifyUser(user); {
String message = Colors.Yellow + split[1] + " was promoted to" + Colors.Rose + " Admin"; playerTarget.setGroups(ranks.Mods);
other.gmsg(message); etc.getInstance().getDataSource().modifyPlayer(playerTarget);
} else if (etc.getInstance().isUserInGroup(split[1], "trusted") && etc.getInstance().isUserInGroup(player, "admins")) { String message = Colors.Yellow + split[1] + " was promoted to" + Colors.DarkPurple + " Mod";
user.Groups = ranks.Mods; other.gmsg(message);
etc.getInstance().getDataSource().modifyUser(user); }
String message = Colors.Yellow + split[1] + " was promoted to" + Colors.DarkPurple + " Mods"; else if (playerTarget.isInGroup("default") && (player.isInGroup("mods") || player.isInGroup("admins") || player.isInGroup("superadmins")))
other.gmsg(message); {
} else if (etc.getInstance().isUserInGroup(split[1], "default") && etc.getInstance().isUserInGroup(player, "mods")) { playerTarget.setGroups(ranks.Trusted);
user.Groups = ranks.Trusted; etc.getInstance().getDataSource().modifyPlayer(playerTarget);
etc.getInstance().getDataSource().modifyUser(user); String message = Colors.Yellow + split[1] + " was promoted to" + Colors.LightGreen + " Trusted";
String message = Colors.Yellow + split[1] + " was promoted to" + Colors.LightGreen + " Trusted"; other.gmsg(message);
other.gmsg(message); }
} else player.sendMessage(Colors.Rose + "That didn't work"); return true;
if (newUser) { }
etc.getInstance().getDataSource().addUser(user); else{
} else { player.sendMessage(Colors.Rose + "Player not found");
etc.getInstance().getDataSource().modifyUser(user); }
} log.log(Level.INFO, "Command used by " + player + " " + split[0] +" "+split[1]+" ");
} }
//Demote //Demote
else if (settings.getInstance().cmdDemote()&&split[0].equalsIgnoreCase("/demote")) { if (settings.getInstance().cmdPromote() && split[0].equalsIgnoreCase("/promote"))
log.log(Level.INFO, "Command used by " + player + " " + split[0] +" "+split[1]+" "); {
etc.getInstance().addCommand("/demote", "/demote [user]"); if(split.length != 2)
if (split.length < 2) { {
player.sendMessage(Colors.Rose + "Usage is /demote [player]"); player.sendMessage(Colors.Rose + "Usage is /demote [Player]");
} }
if(player == null) { //Currently broken
player.sendMessage(Colors.Rose + "Player does not exist."); Player playerTarget = null;
return false;
} for( Player p : etc.getServer().getPlayerList())
User user = etc.getInstance().getUser(split[1]); {
boolean newUser = false; if (p.getName().equalsIgnoreCase(split[1]))
if (user == null) { {
player.sendMessage(Colors.Rose + "Adding new user."); playerTarget = p;
newUser = true; }
user = new User(); }
user.Name = split[1];
user.Administrator = false; if( playerTarget!=null)
user.CanModifyWorld = true; {
user.IgnoreRestrictions = false; if(playerTarget.isInGroup("admins") && (player.isInGroup("superadmins")))
user.Commands = new String[]{""}; {
user.Prefix = ""; playerTarget.setGroups(ranks.Mods);
} etc.getInstance().getDataSource().modifyPlayer(playerTarget);
if (etc.getInstance().isUserInGroup(split[1], "admins")&& etc.getInstance().isUserInGroup(player, "superadmins")) {
user.Groups = ranks.Mods;
etc.getInstance().getDataSource().modifyUser(user);
String message = Colors.Yellow + split[1] + " was demoted to" + Colors.DarkPurple + " Mod"; String message = Colors.Yellow + split[1] + " was demoted to" + Colors.DarkPurple + " Mod";
other.gmsg(message); other.gmsg(message);
} else if (etc.getInstance().isUserInGroup(split[1], "mods")&& etc.getInstance().isUserInGroup(player, "admins")) { }
user.Groups = ranks.Trusted; if(playerTarget.isInGroup("mods") && (player.isInGroup("admins") || player.isInGroup("superadmins")))
etc.getInstance().getDataSource().modifyUser(user); {
String message = Colors.Yellow + split[1] + " was demoted to" + Colors.LightGreen + " Trusted"; playerTarget.setGroups(ranks.Trusted);
other.gmsg(message); etc.getInstance().getDataSource().modifyPlayer(playerTarget);
} else if (etc.getInstance().isUserInGroup(split[1], "trusted")&& etc.getInstance().isUserInGroup(player, "mods")) { String message = Colors.Yellow + split[1] + " was demoted to" + Colors.LightGreen + " Trusted";
user.Groups = ranks.Def; other.gmsg(message);
etc.getInstance().getDataSource().modifyUser(user); }
String message = Colors.Yellow + split[1] + " was demoted to" + Colors.White + " Default"; else if (playerTarget.isInGroup("trusted") && (player.isInGroup("mods") || player.isInGroup("superadmins") || player.isInGroup("admins")))
other.gmsg(message); {
} else if (etc.getInstance().isUserInGroup(split[1], "default")) { playerTarget.setGroups(ranks.Def);
player.sendMessage(Colors.Rose + "You cannot demote " + split[1] + " any lower."); etc.getInstance().getDataSource().modifyPlayer(playerTarget);
} else player.sendMessage(Colors.Rose + "That didn't work"); String message = Colors.Yellow + split[1] + " was demoted to" + Colors.White + " Default";
if (newUser) { other.gmsg(message);
etc.getInstance().getDataSource().addUser(user); }
} else { else if (playerTarget.isInGroup("default") && (player.isInGroup("mods") || player.isInGroup("admins") || player.isInGroup("superadmins")))
etc.getInstance().getDataSource().modifyUser(user); {
} player.sendMessage(Colors.Rose + "You can not demote " + split[1] + " any lower.");
}
}
else{
player.sendMessage(Colors.Rose + "Player not found");
}
log.log(Level.INFO, "Command used by " + player + " " + split[0] +" "+split[1]+" ");
return true;
}
//Whois will display info about a player //Whois will display info about a player
} else if (settings.getInstance().cmdWhoIs()&&split[0].equalsIgnoreCase("/whois")) { if (settings.getInstance().cmdWhoIs()&&split[0].equalsIgnoreCase("/whois")) {
if (split.length < 2) {
player.sendMessage(Colors.Rose + "Usage is /whois [player]");
//This part of the code might not be working right now
}
String admin =""; String admin ="";
String group =""; String group ="";
String ignore =""; String ignore ="";
log.log(Level.INFO, "Command used by " + player + " " + split[0] +" "+split[1]+" "); String IP = "";
Player playerTarget = null;
for( Player p : etc.getServer().getPlayerList())
{
if (p.getName().equalsIgnoreCase(split[1]))
{
playerTarget = p;
}
}
if (playerTarget != null){
etc.getInstance().addCommand("/whois", "/whois [user]"); etc.getInstance().addCommand("/whois", "/whois [user]");
if (split.length < 2) { IP = playerTarget.getIP();
player.sendMessage(Colors.Rose + "Usage is /whois [player]"); if (playerTarget.canIgnoreRestrictions()) {
}
if (etc.getInstance().canIgnoreRestrictions(split[1])) {
ignore = "True"; ignore = "True";
} else { } else {
ignore ="False"; ignore ="False";
} }
if (etc.getInstance().isAdmin(split[1])) { if (playerTarget.canIgnoreRestrictions()) {
admin = "True"; admin = "True";
} else { } else {
admin = "False"; admin = "False";
} }
if (etc.getInstance().isUserInGroup(split[1], "superadmins")){ if (playerTarget.isInGroup("superadmins")){
group = "superadmins"; group = "superadmins";
}else if(etc.getInstance().isUserInGroup(split[1], "admins")){ }else if(playerTarget.isInGroup("admins")){
group = "admins"; group = "admins";
}else if(etc.getInstance().isUserInGroup(split[1], "mods")){ }else if(player.isInGroup("mods")){
group = "mods"; group = "mods";
}else if(etc.getInstance().isUserInGroup(split[1], "trusted")){ }else if(player.isInGroup("trusted")){
group = "trusted"; group = "trusted";
}else{ }else{
group = "Default"; group = "Default";
} }
player.sendMessage(Colors.LightGreen + "Info for "+split[1]+": Admin("+admin+") Ignoresrestrictions("+ignore+") Group("+group+")."); //Main
} else { player.sendMessage(Colors.Blue + "Whois results for "+split[1]+".");
//Info for group
player.sendMessage(Colors.Blue + "Group: "+group);
//info for admin
player.sendMessage(Colors.Blue+"Admin: "+admin);
//Info for IP
player.sendMessage(Colors.Blue+"IP: "+IP);
//Info on restrictions
player.sendMessage(Colors.Blue+"Can ignore restrictions: "+ignore);
return true;
} else {
player.sendMessage(Colors.Rose+"Player not found.");
}
} if (split[0].equalsIgnoreCase("/say")) {
String sayan;
sayan = etc.combineSplit(1, split, " ");
other.gmsg(Colors.Yellow+sayan);
//Should make a global message to all players
}
else {
return false; return false;
} }
return true; return true;
@ -260,10 +392,16 @@ public class vminecraft extends Plugin {
public void onKick(Player player, String reason) public void onKick(Player player, String reason)
{ {
//other.gmsg(Colors.Red+player.getColor()+player.getName()+Colors.Red+" was kicked.");
}
public void onIpBan(Player player, String reason)
{
//other.gmsg(Colors.Red+player.getColor()+player.getName()+Colors.Red+" was IP banned.");
}
public void onBan(Player player, String reason)
{
//other.gmsg(Colors.Red+player.getColor()+player.getName()+Colors.Red+" was banned.");
} }
//Calculates how long the specified String is to prevent linebreaks when using scripts that insert color codes, designed to be used with playername included //Calculates how long the specified String is to prevent linebreaks when using scripts that insert color codes, designed to be used with playername included
private boolean lengthCheck(String str) private boolean lengthCheck(String str)