Skip to content

Commit

Permalink
More work on the API
Browse files Browse the repository at this point in the history
  • Loading branch information
Iaccidentally committed May 25, 2013
1 parent bc29f9d commit cf3ab40
Show file tree
Hide file tree
Showing 8 changed files with 126 additions and 31 deletions.
2 changes: 1 addition & 1 deletion Essentials/src/net/ess3/api/IPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public interface IPlugin extends Plugin
/**
* Get an instance of essentials
*
* @return
* @return the instance
*/
IEssentials getEssentials();

Expand Down
11 changes: 7 additions & 4 deletions Essentials/src/net/ess3/api/ISettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,23 @@
public interface ISettings extends IStorageObjectHolder<Settings>
{
/**
* Used to get the locale string
*
* @return
* @return the current locale string (i.e. en_US)
*/
String getLocale();

/**
* Used to check if debug mode is enabled
*
* @return
* @return true if debug is enabled
*/
boolean isDebug();

/**
* Used to set debug mode
*
* @param b **TODO: rename this, "b" is a terrible name**
* @param set
*/
void setDebug(boolean b);
void setDebug(boolean set);
}
67 changes: 42 additions & 25 deletions Essentials/src/net/ess3/api/IUserMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,100 +10,117 @@
public interface IUserMap extends IReload
{
/**
* Used to check if a user exists (they exist if they have userdata)
*
* @param name
* @return
* @param name the name of the user to check
* @return true if the user exists, false if not
*/
boolean userExists(final String name);

/**
* Used to get the user associated with the given Player object
*
* @param player
* @return
* @param player the Player object
* @return the User object
*/
IUser getUser(final Player player);

/**
* Used to get the user associated with the given name
*
* @param playerName
* @return
* @param playerName the name of the player
* @return the User object
*/
IUser getUser(final String playerName);

/**
* Used to remove a user from the userMap
*
* @param name
* @throws InvalidNameException
* @param name the name of the user to remove
* @throws InvalidNameException if the name does not match any user in the UserMap
*/
void removeUser(final String name) throws InvalidNameException;

/**
* Gets a set of all the unique users in the UserMap
*
* @return
* @return the Users
*/
Set<String> getAllUniqueUsers();

/**
* Gets the number of unique users in the UserMap
*
* @return
* @return the number of unique users
*/
int getUniqueUsers();

/**
* Used to get the file of the given user
*
* @param name
* @return
* @param name the name of the user
* @return the file
* @throws InvalidNameException
*/
File getUserFile(final String name) throws InvalidNameException;

/**
* Used to match a user to a given name
* This method never returns null and includes hidden players.
*
* @param name
* @param includeOffline
* @return
* @param name the name to match
* @param includeOffline set to true to check offline users as well, false if not
* @return the matched user
* @throws TooManyMatchesException if more than one player is found matching the name
* @throws PlayerNotFoundException if the player matching the name is not found
*/
IUser matchUser(final String name, final boolean includeOffline) throws TooManyMatchesException, PlayerNotFoundException;

/**
* Used to match a user to a given name
* This method never returns null and is for online players only.
*
* @param name
* @param name the name to match
* @param requester Can be null, if the requester is the console
* @return
* @return the matched user
* @throws TooManyMatchesException if more than one player is found matching the name
* @throws PlayerNotFoundException if the player matching the name is not found
*/
IUser matchUserExcludingHidden(final String name, final Player requester) throws TooManyMatchesException, PlayerNotFoundException;

/**
* Used to match multiple users
* This method never returns null and includes hidden players.
*
* @param name
* @param includeOffline
* @return
* @param name the name to match
* @param includeOffline set to true to check offline users as well, false if not
* @return the matched user(s)
*/
Set<IUser> matchUsers(final String name, final boolean includeOffline);

/**
* Used to match multiple users
* This method never returns null and is for online players only.
*
* @param name
* @param requester
* @return
* @param name the name to match
* @param requester Can be null, if the requester is the console
* @return the matched user(s)
*/
Set<IUser> matchUsersExcludingHidden(final String name, final Player requester);

/**
* Used to add a player to the map of pre-joined players
* **TODO: we shouldn't be using player objects here**
*
* @param player
* @param player the player to add
*/
void addPrejoinedPlayer(Player player);

/**
* Used to remove a player from the map of pre-joined players
* **TODO: we shouldn't be using player objects here**
*
* @param player
* @param player the player to remove
*/
void removePrejoinedPlayer(Player player);
}
2 changes: 1 addition & 1 deletion Essentials/src/net/ess3/user/UserMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

public class UserMap extends StorageObjectMap<IUser> implements IUserMap
{
private final Map<String, Player> prejoinedPlayers = new HashMap<String, Player>();
private final Map<String, Player> prejoinedPlayers = new HashMap<String, Player>(); //TODO: We shouldn't be using a player object here

public UserMap(final IEssentials ess)
{
Expand Down
12 changes: 12 additions & 0 deletions EssentialsAntiBuild/src/net/ess3/antibuild/IAntiBuild.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,21 @@

public interface IAntiBuild extends Plugin
{
/**
*
* @return
*/
EssentialsConnect getEssentialsConnect();

/**
*
* @return
*/
AntiBuildHolder getSettings();

/**
*
* @param settings
*/
void setSettings(AntiBuildHolder settings);
}
12 changes: 12 additions & 0 deletions EssentialsProtect/src/net/ess3/protect/IProtect.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,21 @@

public interface IProtect extends Plugin
{
/**
*
* @return
*/
EssentialsConnect getEssentialsConnect();

/**
*
* @return
*/
ProtectHolder getSettings();

/**
*
* @param settings
*/
void setSettings(ProtectHolder settings);
}
4 changes: 4 additions & 0 deletions EssentialsSigns/src/net/ess3/signs/ISignsPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,9 @@

public interface ISignsPlugin
{
/**
*
* @return
*/
SignsConfigHolder getSettings();
}
47 changes: 47 additions & 0 deletions EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,68 @@

public interface IEssentialsXMPP extends Plugin
{
/**
*
* @param user
* @return
*/
String getAddress(final CommandSender user);

/**
*
* @param name
* @return
*/
String getAddress(final String name);

/**
*
* @return
*/
List<String> getSpyUsers();

/**
*
* @param address
* @return
*/
IUser getUserByAddress(final String address);

/**
*
* @param user
* @param message
* @return
*/
boolean sendMessage(final CommandSender user, final String message);

/**
*
* @param address
* @param message
* @return
*/
boolean sendMessage(final String address, final String message);

/**
*
* @param user
* @param address
*/
void setAddress(final CommandSender user, final String address);

/**
*
* @param user
* @return
*/
boolean toggleSpy(final CommandSender user);

/**
*
* @param sender
* @param message
* @param xmppAddress
*/
void broadcastMessage(final IUser sender, final String message, final String xmppAddress);
}

0 comments on commit cf3ab40

Please sign in to comment.