EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-30 12:44:45 +02:00
Code Issues Projects Releases Wiki Activity

Refactor ALL THE THINGS!

Browse Source
This commit is contained in:
nossr50
2012-04-27 02:47:11 -07:00
parent ac35f002f1
commit 47b7780c96
84 changed files with 3503 additions and 3501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/gmail/nossr50/commands/party/ACommand.java
View File

@ -6,13 +6,13 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.mcPermissions;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
import com.gmail.nossr50.locale.mcLocale;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Users;
public class ACommand implements CommandExecutor {
private final mcMMO plugin;
@ -42,10 +42,10 @@ public class ACommand implements CommandExecutor {
PP.toggleAdminChat();
if (PP.getAdminChatMode()) {
sender.sendMessage(mcLocale.getString("Commands.AdminChat.On"));
sender.sendMessage(LocaleLoader.getString("Commands.AdminChat.On"));
}
else {
sender.sendMessage(mcLocale.getString("Commands.AdminChat.Off"));
sender.sendMessage(LocaleLoader.getString("Commands.AdminChat.Off"));
}
}
else {
@ -88,7 +88,7 @@ public class ACommand implements CommandExecutor {
plugin.getLogger().info("[A]<*Console*> " + message);
for (Player player : plugin.getServer().getOnlinePlayers()) {
if (mcPermissions.getInstance().adminChat(player) || player.isOp()) {
if (Permissions.getInstance().adminChat(player) || player.isOp()) {
player.sendMessage(prefix + message);
}
}

6
src/main/java/com/gmail/nossr50/commands/party/AcceptCommand.java
View File

@ -5,14 +5,14 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
import com.gmail.nossr50.locale.mcLocale;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.util.Users;
public class AcceptCommand implements CommandExecutor {
private final mcMMO plugin;
@ -60,7 +60,7 @@ public class AcceptCommand implements CommandExecutor {
}
else {
player.sendMessage(mcLocale.getString("mcMMO.NoInvites"));
player.sendMessage(LocaleLoader.getString("mcMMO.NoInvites"));
}
return true;

16
src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java
View File

@ -6,12 +6,12 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.locale.mcLocale;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.util.Users;
//TODO: Make this work from console.
public class InviteCommand implements CommandExecutor {
@ -41,7 +41,7 @@ public class InviteCommand implements CommandExecutor {
Party partyInstance = Party.getInstance();
if (!PP.inParty()) {
player.sendMessage(mcLocale.getString("Commands.Party.None"));
player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
return true;
}
@ -52,19 +52,19 @@ public class InviteCommand implements CommandExecutor {
PlayerProfile PPt = Users.getProfile(target);
PPt.modifyInvite(PP.getParty());
player.sendMessage(mcLocale.getString("Commands.Invite.Success"));
player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
target.sendMessage(mcLocale.getString("Commands.Party.Invite.0", new Object[] { PPt.getInvite(), player.getName() }));
target.sendMessage(mcLocale.getString("Commands.Party.Invite.1"));
target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", new Object[] { PPt.getInvite(), player.getName() }));
target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.1"));
return true;
}
else {
player.sendMessage(mcLocale.getString("Party.Locked"));
player.sendMessage(LocaleLoader.getString("Party.Locked"));
return true;
}
}
else {
player.sendMessage(mcLocale.getString("Party.Player.Invalid"));
player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
return true;
}

12
src/main/java/com/gmail/nossr50/commands/party/PCommand.java
View File

@ -6,13 +6,13 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
import com.gmail.nossr50.locale.mcLocale;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.util.Users;
public class PCommand implements CommandExecutor {
private final mcMMO plugin;
@ -43,10 +43,10 @@ public class PCommand implements CommandExecutor {
PP.togglePartyChat();
if (PP.getPartyChatMode()) {
sender.sendMessage(mcLocale.getString("Commands.Party.Chat.On"));
sender.sendMessage(LocaleLoader.getString("Commands.Party.Chat.On"));
}
else {
sender.sendMessage(mcLocale.getString("Commands.Party.Chat.Off"));
sender.sendMessage(LocaleLoader.getString("Commands.Party.Chat.Off"));
}
}
else {
@ -61,7 +61,7 @@ public class PCommand implements CommandExecutor {
PP = Users.getProfile(player);
if (!PP.inParty()) {
player.sendMessage(mcLocale.getString("Commands.Party.None"));
player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
return true;
}
@ -87,7 +87,7 @@ public class PCommand implements CommandExecutor {
}
if (!Party.getInstance().isParty(args[0])) {
sender.sendMessage(mcLocale.getString("Party.InvalidName"));
sender.sendMessage(LocaleLoader.getString("Party.InvalidName"));
return true;
}

66
src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
View File

@ -6,14 +6,14 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
import com.gmail.nossr50.locale.mcLocale;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.util.Users;
public class PartyCommand implements CommandExecutor {
private final mcMMO plugin;
@ -48,9 +48,9 @@ public class PartyCommand implements CommandExecutor {
switch (args.length) {
case 0:
if (!inParty) {
player.sendMessage(mcLocale.getString("Party.Help.0"));
player.sendMessage(mcLocale.getString("Party.Help.1"));
player.sendMessage(mcLocale.getString("Party.Help.2"));
player.sendMessage(LocaleLoader.getString("Party.Help.0"));
player.sendMessage(LocaleLoader.getString("Party.Help.1"));
player.sendMessage(LocaleLoader.getString("Party.Help.2"));
}
else {
String tempList = "";
@ -71,8 +71,8 @@ public class PartyCommand implements CommandExecutor {
tempList += ChatColor.WHITE + playerName;
}
player.sendMessage(mcLocale.getString("Commands.Party.InParty", new Object[] { partyName }));
player.sendMessage(mcLocale.getString("Commands.Party.Members", new Object[] { tempList }));
player.sendMessage(LocaleLoader.getString("Commands.Party.InParty", new Object[] { partyName }));
player.sendMessage(LocaleLoader.getString("Commands.Party.Members", new Object[] { tempList }));
}
return true;
@ -88,33 +88,33 @@ public class PartyCommand implements CommandExecutor {
}
partyInstance.removeFromParty(player, PP);
player.sendMessage(mcLocale.getString("Commands.Party.Leave"));
player.sendMessage(LocaleLoader.getString("Commands.Party.Leave"));
}
else {
player.sendMessage("Commands.Party.None");
}
}
else if (args[0].equals("?")) {
player.sendMessage(mcLocale.getString("Party.Help.3"));
player.sendMessage(mcLocale.getString("Party.Help.1"));
player.sendMessage(mcLocale.getString("Party.Help.4"));
player.sendMessage(mcLocale.getString("Party.Help.5"));
player.sendMessage(mcLocale.getString("Party.Help.6"));
player.sendMessage(mcLocale.getString("Party.Help.7"));
player.sendMessage(LocaleLoader.getString("Party.Help.3"));
player.sendMessage(LocaleLoader.getString("Party.Help.1"));
player.sendMessage(LocaleLoader.getString("Party.Help.4"));
player.sendMessage(LocaleLoader.getString("Party.Help.5"));
player.sendMessage(LocaleLoader.getString("Party.Help.6"));
player.sendMessage(LocaleLoader.getString("Party.Help.7"));
}
else if (args[0].equalsIgnoreCase("lock")) {
if (inParty) {
if (isLeader) {
if (partyInstance.isPartyLocked(partyName)) {
player.sendMessage(mcLocale.getString("Party.IsLocked"));
player.sendMessage(LocaleLoader.getString("Party.IsLocked"));
}
else {
partyInstance.lockParty(partyName);
player.sendMessage(mcLocale.getString("Party.Locked"));
player.sendMessage(LocaleLoader.getString("Party.Locked"));
}
}
else {
player.sendMessage(mcLocale.getString("Party.NotOwner"));
player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
}
}
else {
@ -125,15 +125,15 @@ public class PartyCommand implements CommandExecutor {
if (inParty) {
if (isLeader) {
if (!partyInstance.isPartyLocked(partyName)) {
player.sendMessage(mcLocale.getString("Party.IsntLocked"));
player.sendMessage(LocaleLoader.getString("Party.IsntLocked"));
}
else {
partyInstance.unlockParty(partyName);
player.sendMessage(mcLocale.getString("Party.Unlocked"));
player.sendMessage(LocaleLoader.getString("Party.Unlocked"));
}
}
else {
player.sendMessage(mcLocale.getString("Party.NotOwner"));
player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
}
}
else {
@ -167,7 +167,7 @@ public class PartyCommand implements CommandExecutor {
case 2:
if (!partyInstance.isParty(args[0])) {
sender.sendMessage(mcLocale.getString("Party.InvalidName"));
sender.sendMessage(LocaleLoader.getString("Party.InvalidName"));
return true;
}
@ -179,10 +179,10 @@ public class PartyCommand implements CommandExecutor {
}
partyInstance.setPartyPassword(partyName, args[1]);
player.sendMessage(mcLocale.getString("Party.PasswordSet", new Object[] { args[1] }));
player.sendMessage(LocaleLoader.getString("Party.PasswordSet", new Object[] { args[1] }));
}
else {
player.sendMessage(mcLocale.getString("Party.NotOwner"));
player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
}
}
else if (args[0].equalsIgnoreCase("kick")) {
@ -190,7 +190,7 @@ public class PartyCommand implements CommandExecutor {
Player target = plugin.getServer().getPlayer(args[1]);
if (target == null) {
player.sendMessage(mcLocale.getString("Party.Player.Invalid"));
player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
return true;
}
@ -198,7 +198,7 @@ public class PartyCommand implements CommandExecutor {
String targetName = target.getName();
if (!partyInstance.inSameParty(player, (Player) target)) {
player.sendMessage(mcLocale.getString("Party.NotInYourParty", new Object[] { targetName }));
player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] { targetName }));
return true;
}
@ -211,11 +211,11 @@ public class PartyCommand implements CommandExecutor {
}
partyInstance.removeFromParty(target, PPt);
target.sendMessage(mcLocale.getString("Commands.Party.Kick", new Object[] { partyName }));
target.sendMessage(LocaleLoader.getString("Commands.Party.Kick", new Object[] { partyName }));
}
}
else {
player.sendMessage(mcLocale.getString("Party.NotOwner"));
player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
}
}
else if (args[0].equalsIgnoreCase("owner")) {
@ -223,14 +223,14 @@ public class PartyCommand implements CommandExecutor {
Player target = plugin.getServer().getPlayer(args[1]);
if (target == null) {
player.sendMessage(mcLocale.getString("Party.Player.Invalid"));
player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
return true;
}
String targetName = target.getName();
if (!partyInstance.inSameParty(player, (Player) target)) {
player.sendMessage(mcLocale.getString("Party.NotInYourParty", new Object[] { targetName }));
player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] { targetName }));
return true;
}
@ -239,7 +239,7 @@ public class PartyCommand implements CommandExecutor {
}
}
else {
player.sendMessage(mcLocale.getString("Party.NotOwner"));
player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
}
}
else {
@ -268,9 +268,9 @@ public class PartyCommand implements CommandExecutor {
return true;
default:
player.sendMessage(mcLocale.getString("Party.Help.0"));
player.sendMessage(mcLocale.getString("Party.Help.1"));
player.sendMessage(mcLocale.getString("Party.Help.2"));
player.sendMessage(LocaleLoader.getString("Party.Help.0"));
player.sendMessage(LocaleLoader.getString("Party.Help.1"));
player.sendMessage(LocaleLoader.getString("Party.Help.2"));
return true;
}
}

18
src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java
View File

@ -6,14 +6,14 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent;
import com.gmail.nossr50.locale.mcLocale;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.util.Users;
public class PtpCommand implements CommandExecutor {
private final mcMMO plugin;
@ -40,12 +40,12 @@ public class PtpCommand implements CommandExecutor {
PlayerProfile PP = Users.getProfile(player);
if (!Party.getInstance().isInParty(player, PP)) {
player.sendMessage(mcLocale.getString("Commands.Party.None"));
player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
return true;
}
if (PP.getRecentlyHurt() + (Config.getInstance().getPTPCommandCooldown() * 1000) > System.currentTimeMillis()) {
player.sendMessage(mcLocale.getString("Party.Teleport.Hurt", new Object[] { Config.getInstance().getPTPCommandCooldown() }));
player.sendMessage(LocaleLoader.getString("Party.Teleport.Hurt", new Object[] { Config.getInstance().getPTPCommandCooldown() }));
return true;
}
@ -57,12 +57,12 @@ public class PtpCommand implements CommandExecutor {
}
if (target == null) {
player.sendMessage(mcLocale.getString("Party.Teleport.Invalid"));
player.sendMessage(LocaleLoader.getString("Party.Teleport.Invalid"));
return true;
}
if (target.isDead()) {
player.sendMessage(mcLocale.getString("Party.Teleport.Dead"));
player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
return true;
}
@ -75,11 +75,11 @@ public class PtpCommand implements CommandExecutor {
}
player.teleport(target);
player.sendMessage(mcLocale.getString("Party.Teleport.Player", new Object[] { target.getName() }));
target.sendMessage(mcLocale.getString("Party.Teleport.Target", new Object[] { player.getName() }));
player.sendMessage(LocaleLoader.getString("Party.Teleport.Player", new Object[] { target.getName() }));
target.sendMessage(LocaleLoader.getString("Party.Teleport.Target", new Object[] { player.getName() }));
}
else {
player.sendMessage(mcLocale.getString("Party.NotInYourParty", new Object[] { target.getName() }));
player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] { target.getName() }));
return true;
}