TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-07-03 20:41:37 +00:00
Code Issues Projects Releases Wiki Activity

This is a big refactoring of the user class and more.

Browse source 
Many commands have been cleaned.

File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.

Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax

New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added

Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
-  time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo 2011-05-01 21:07:30 +00:00
parent 03fd6249fc
commit 224c18348a
126 changed files with 3542 additions and 3145 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java
View file

@ -12,10 +12,12 @@ import com.earth2me.essentials.User;
public abstract class EssentialsCommand implements IEssentialsCommand
{
private final String name;
protected Essentials ess;
protected EssentialsCommand(String name)
{
this.name = name;
this.ess = Essentials.getStatic();
}
public String getName()
@ -23,40 +25,32 @@ public abstract class EssentialsCommand implements IEssentialsCommand
return name;
}
public String[] getTriggers()
{
return new String[]
{
getName()
};
}
protected User getPlayer(Server server, String[] args, int pos) throws IndexOutOfBoundsException, NoSuchFieldException
{
if (args.length <= pos) throw new IndexOutOfBoundsException("§cInvalid command syntax. Did you forget an argument?");
List<Player> matches = server.matchPlayer(args[pos]);
if (matches.size() < 1) throw new NoSuchFieldException("§cNo matching players could be found.");
return User.get(matches.get(0));
return ess.getUser(matches.get(0));
}
@Override
public final void run(Server server, Essentials parent, User user, String commandLabel, Command cmd, String[] args) throws Exception
public final void run(Server server, User user, String commandLabel, Command cmd, String[] args) throws Exception
{
run(server, parent, user, commandLabel, args);
run(server, user, commandLabel, args);
}
protected void run(Server server, Essentials parent, User user, String commandLabel, String[] args) throws Exception
protected void run(Server server, User user, String commandLabel, String[] args) throws Exception
{
run(server, parent, (CommandSender)user.getBase(), commandLabel, args);
run(server, (CommandSender)user.getBase(), commandLabel, args);
}
@Override
public final void run(Server server, Essentials parent, CommandSender sender, String commandLabel, Command cmd, String[] args) throws Exception
public final void run(Server server, CommandSender sender, String commandLabel, Command cmd, String[] args) throws Exception
{
run(server, parent, sender, commandLabel, args);
run(server, sender, commandLabel, args);
}
protected void run(Server server, Essentials parent, CommandSender sender, String commandLabel, String[] args) throws Exception
protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
{
throw new Exception("Only in-game players can use " + commandLabel + ".");
}
@ -66,7 +60,10 @@ public abstract class EssentialsCommand implements IEssentialsCommand
StringBuilder bldr = new StringBuilder();
for (int i = start; i < args.length; i++)
{
if (i != start) bldr.append(" ");
if (i != start)
{
bldr.append(" ");
}
bldr.append(args[i]);
}
return bldr.toString();
@ -75,6 +72,8 @@ public abstract class EssentialsCommand implements IEssentialsCommand
protected void charge(CommandSender sender) throws Exception
{
if (sender instanceof Player)
User.get((Player)sender).charge(this);
{
ess.getUser((Player)sender).charge(this);
}
}
}