diff --git a/Changelog.txt b/Changelog.txt
index 3d2319c5a..57abfe60f 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -10,6 +10,7 @@ Version 1.2.09-dev
- New custom event for developers McMMOPlayerLevelUpEvent
- New custom event for developers McMMOItemSpawnEvent
- Changed LoadProperties from the old Configuration to FileConfiguration
+ - Removed aliasing from config.yml
Version 1.2.08
- Changed Bukkit events to new event system
diff --git a/pom.xml b/pom.xml
index 9438fa952..6fc8e5376 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
true
${basedir}/src/main/resources/
- plugin.yml
+ *.yml
diff --git a/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java b/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java
index 77fd35ddb..398ebbc72 100644
--- a/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java
@@ -62,7 +62,7 @@ public class AddxpCommand implements CommandExecutor {
return true;
}
if (args.length < 2) {
- player.sendMessage(ChatColor.RED + "Usage is /" + LoadProperties.addxp + " playername skillname xp");
+ player.sendMessage(ChatColor.RED + "Usage is /addxp playername skillname xp");
return true;
}
if (args.length == 3) {
@@ -78,7 +78,7 @@ public class AddxpCommand implements CommandExecutor {
Users.getProfile(player).addXP(Skills.getSkillType(args[0]), newvalue, player);
player.sendMessage(ChatColor.RED + args[0] + " has been modified.");
} else {
- player.sendMessage(ChatColor.RED + "Usage is /" + LoadProperties.addxp + " playername skillname xp");
+ player.sendMessage(ChatColor.RED + "Usage is /addxp playername skillname xp");
}
return true;
diff --git a/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java b/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java
index f715b93ff..336c1a8a1 100644
--- a/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java
@@ -36,7 +36,7 @@ public class MmoeditCommand implements CommandExecutor {
if (!(sender instanceof Player)) {
if (args.length < 2) {
- System.out.println("Usage is /" + LoadProperties.mmoedit + " playername skillname newvalue");
+ System.out.println("Usage is /mmoedit playername skillname newvalue");
return true;
} else if (args.length == 3) {
if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) {
@@ -45,7 +45,7 @@ public class MmoeditCommand implements CommandExecutor {
System.out.println(args[1] + " has been modified for " + plugin.getServer().getPlayer(args[0]).getName() + ".");
}
} else {
- System.out.println("Usage is /" + LoadProperties.mmoedit + " playername skillname newvalue");
+ System.out.println("Usage is /mmoedit playername skillname newvalue");
}
return true;
@@ -59,7 +59,7 @@ public class MmoeditCommand implements CommandExecutor {
return true;
}
if (args.length < 2) {
- player.sendMessage(ChatColor.RED + "Usage is /" + LoadProperties.mmoedit + " playername skillname newvalue");
+ player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue");
return true;
}
if (args.length == 3) {
@@ -75,7 +75,7 @@ public class MmoeditCommand implements CommandExecutor {
player.sendMessage(ChatColor.RED + args[0] + " has been modified.");
}
} else {
- player.sendMessage(ChatColor.RED + "Usage is /" + LoadProperties.mmoedit + " playername skillname newvalue");
+ player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue");
}
return true;
diff --git a/src/main/java/com/gmail/nossr50/commands/general/WhoisCommand.java b/src/main/java/com/gmail/nossr50/commands/general/WhoisCommand.java
index 413055beb..45264554b 100644
--- a/src/main/java/com/gmail/nossr50/commands/general/WhoisCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/general/WhoisCommand.java
@@ -38,7 +38,7 @@ public class WhoisCommand implements CommandExecutor {
}
if (args.length < 1) {
- player.sendMessage(ChatColor.RED + "Proper usage is /" + LoadProperties.whois + " ");
+ player.sendMessage(ChatColor.RED + "Proper usage is /whois ");
return true;
}
// if split[1] is a player
diff --git a/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java b/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java
index 56f1f16c5..97a2a84cd 100644
--- a/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java
@@ -27,8 +27,8 @@ public class XprateCommand implements CommandExecutor {
if (!(sender instanceof Player)) {
if(args.length <= 0)
{
- System.out.println(mcLocale.getString("Commands.xprate.proper", new Object[] {LoadProperties.xprate}));
- System.out.println(mcLocale.getString("Commands.xprate.proper2", new Object[] {LoadProperties.xprate}));
+ System.out.println(mcLocale.getString("Commands.xprate.proper", new Object[] {"/xprate"}));
+ System.out.println(mcLocale.getString("Commands.xprate.proper2", new Object[] {"/xprate"}));
}
if(args.length == 1 && args[0].equalsIgnoreCase("reset"))
@@ -81,8 +81,8 @@ public class XprateCommand implements CommandExecutor {
}
if(args.length <= 0)
{
- player.sendMessage(mcLocale.getString("Commands.xprate.proper", new Object[] {LoadProperties.xprate}));
- player.sendMessage(mcLocale.getString("Commands.xprate.proper2", new Object[] {LoadProperties.xprate}));
+ player.sendMessage(mcLocale.getString("Commands.xprate.proper", new Object[] {"/xprate"}));
+ player.sendMessage(mcLocale.getString("Commands.xprate.proper2", new Object[] {"/xprate"}));
}
if(args.length == 1 && args[0].equalsIgnoreCase("reset"))
{
diff --git a/src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java
index 2607445bc..204defb78 100644
--- a/src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java
@@ -29,44 +29,44 @@ public class MccCommand implements CommandExecutor {
if (mcPermissions.getInstance().party(player)) {
player.sendMessage(mcLocale.getString("m.mccPartyCommands"));
- player.sendMessage(LoadProperties.party + " " + mcLocale.getString("m.mccParty"));
- player.sendMessage(LoadProperties.party + " q " + mcLocale.getString("m.mccPartyQ"));
+ player.sendMessage("/party " + mcLocale.getString("m.mccParty"));
+ player.sendMessage("/party q " + mcLocale.getString("m.mccPartyQ"));
if (mcPermissions.getInstance().partyChat(player))
player.sendMessage("/p " + mcLocale.getString("m.mccPartyToggle"));
- player.sendMessage(LoadProperties.invite + " " + mcLocale.getString("m.mccPartyInvite"));
- player.sendMessage(LoadProperties.accept + " " + mcLocale.getString("m.mccPartyAccept"));
+ player.sendMessage("/invite " + mcLocale.getString("m.mccPartyInvite"));
+ player.sendMessage("/invite " + mcLocale.getString("m.mccPartyAccept"));
if (mcPermissions.getInstance().partyTeleport(player))
- player.sendMessage(LoadProperties.ptp + " " + mcLocale.getString("m.mccPartyTeleport"));
+ player.sendMessage("/ptp " + mcLocale.getString("m.mccPartyTeleport"));
}
player.sendMessage(mcLocale.getString("m.mccOtherCommands"));
- player.sendMessage(LoadProperties.stats + ChatColor.RED + " " + mcLocale.getString("m.mccStats"));
+ player.sendMessage("/stats " + ChatColor.RED + " " + mcLocale.getString("m.mccStats"));
player.sendMessage("/mctop " + ChatColor.RED + mcLocale.getString("m.mccLeaderboards"));
if (mcPermissions.getInstance().mySpawn(player)) {
- player.sendMessage(LoadProperties.myspawn + " " + ChatColor.RED + mcLocale.getString("m.mccMySpawn"));
- player.sendMessage(LoadProperties.clearmyspawn + " " + ChatColor.RED + mcLocale.getString("m.mccClearMySpawn"));
+ player.sendMessage("/myspawn " + ChatColor.RED + mcLocale.getString("m.mccMySpawn"));
+ player.sendMessage("/clearmyspawn " + ChatColor.RED + mcLocale.getString("m.mccClearMySpawn"));
}
if (mcPermissions.getInstance().mcAbility(player))
- player.sendMessage(LoadProperties.mcability + ChatColor.RED + " " + mcLocale.getString("m.mccToggleAbility"));
+ player.sendMessage("/mcability" + ChatColor.RED + " " + mcLocale.getString("m.mccToggleAbility"));
if (mcPermissions.getInstance().adminChat(player))
player.sendMessage("/a " + ChatColor.RED + mcLocale.getString("m.mccAdminToggle"));
if (mcPermissions.getInstance().whois(player))
- player.sendMessage(LoadProperties.whois + " " + mcLocale.getString("m.mccWhois"));
+ player.sendMessage("/whois " + mcLocale.getString("m.mccWhois"));
if (mcPermissions.getInstance().mmoedit(player))
- player.sendMessage(LoadProperties.mmoedit + mcLocale.getString("m.mccMmoedit"));
+ player.sendMessage("/mmoedit" + mcLocale.getString("m.mccMmoedit"));
if (mcPermissions.getInstance().mcgod(player))
- player.sendMessage(LoadProperties.mcgod + ChatColor.RED + " " + mcLocale.getString("m.mccMcGod"));
+ player.sendMessage("/mcgod" + ChatColor.RED + " " + mcLocale.getString("m.mccMcGod"));
player.sendMessage(mcLocale.getString("m.mccSkillInfo"));
- player.sendMessage(LoadProperties.mcmmo + " " + mcLocale.getString("m.mccModDescription"));
+ player.sendMessage("/mcmmo " + mcLocale.getString("m.mccModDescription"));
return true;
}
diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java
index be1991725..d2babffc8 100644
--- a/src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java
@@ -27,7 +27,7 @@ public class McmmoCommand implements CommandExecutor {
Player player = (Player) sender;
player.sendMessage(ChatColor.RED + "-----[]" + ChatColor.GREEN + "mcMMO" + ChatColor.RED + "[]-----");
- String description = mcLocale.getString("mcMMO.Description", new Object[] { LoadProperties.mcc });
+ String description = mcLocale.getString("mcMMO.Description", new Object[] { "/mcc" });
String[] mcSplit = description.split(",");
for (String x : mcSplit) {
diff --git a/src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java b/src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java
index 84f2514d3..02554e04d 100644
--- a/src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java
@@ -48,7 +48,7 @@ public class InviteCommand implements CommandExecutor {
return true;
}
if (args.length < 1) {
- player.sendMessage(ChatColor.RED + "Usage is /" + LoadProperties.invite + " ");
+ player.sendMessage(ChatColor.RED + "Usage is /invite ");
return true;
}
if (PP.inParty() && args.length >= 1 && (plugin.getServer().getPlayer(args[0]) != null)) {
@@ -61,7 +61,7 @@ public class InviteCommand implements CommandExecutor {
// target.sendMessage(ChatColor.RED+"ALERT: "+ChatColor.GREEN+"You have received a party invite for "+PPt.getInvite()+" from "+player.getName());
target.sendMessage(mcLocale.getString("mcPlayerListener.ReceivedInvite1", new Object[] { PPt.getInvite(), player.getName() }));
// target.sendMessage(ChatColor.YELLOW+"Type "+ChatColor.GREEN+LoadProperties.accept+ChatColor.YELLOW+" to accept the invite");
- target.sendMessage(mcLocale.getString("mcPlayerListener.ReceivedInvite2", new Object[] { LoadProperties.accept }));
+ target.sendMessage(mcLocale.getString("mcPlayerListener.ReceivedInvite2", new Object[] { "/accept" }));
} else {
player.sendMessage(mcLocale.getString("Party.Locked"));
return true;
diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
index 9832b0a88..3e6b25b1e 100644
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
@@ -42,9 +42,9 @@ public class PartyCommand implements CommandExecutor {
}
if (args.length == 0 && !PP.inParty()) {
- player.sendMessage(mcLocale.getString("Party.Help1", new Object[] { LoadProperties.party }));
- player.sendMessage(mcLocale.getString("Party.Help2", new Object[] { LoadProperties.party }));
- player.sendMessage(mcLocale.getString("Party.Help3", new Object[] { LoadProperties.party }));
+ player.sendMessage(mcLocale.getString("Party.Help1", new Object[] { "/party "}));
+ player.sendMessage(mcLocale.getString("Party.Help2", new Object[] { "/party "}));
+ player.sendMessage(mcLocale.getString("Party.Help3", new Object[] { "/party " }));
return true;
} else if (args.length == 0 && PP.inParty()) {
String tempList = "";
@@ -81,13 +81,13 @@ public class PartyCommand implements CommandExecutor {
player.sendMessage(mcLocale.getString("mcPlayerListener.LeftParty"));
return true;
} else if (args[0].equalsIgnoreCase("?")) {
- player.sendMessage(mcLocale.getString("Party.Help4", new Object[] { LoadProperties.party }));
- player.sendMessage(mcLocale.getString("Party.Help2", new Object[] { LoadProperties.party }));
- player.sendMessage(mcLocale.getString("Party.Help5", new Object[] { LoadProperties.party }));
- player.sendMessage(mcLocale.getString("Party.Help6", new Object[] { LoadProperties.party }));
- player.sendMessage(mcLocale.getString("Party.Help7", new Object[] { LoadProperties.party }));
- player.sendMessage(mcLocale.getString("Party.Help8", new Object[] { LoadProperties.party }));
- player.sendMessage(mcLocale.getString("Party.Help9", new Object[] { LoadProperties.party }));
+ player.sendMessage(mcLocale.getString("Party.Help4", new Object[] { "/party " }));
+ player.sendMessage(mcLocale.getString("Party.Help2", new Object[] { "/party " }));
+ player.sendMessage(mcLocale.getString("Party.Help5", new Object[] { "/party " }));
+ player.sendMessage(mcLocale.getString("Party.Help6", new Object[] { "/party " }));
+ player.sendMessage(mcLocale.getString("Party.Help7", new Object[] { "/party " }));
+ player.sendMessage(mcLocale.getString("Party.Help8", new Object[] { "/party " }));
+ player.sendMessage(mcLocale.getString("Party.Help9", new Object[] { "/party " }));
} else if (args[0].equalsIgnoreCase("lock")) {
if (PP.inParty()) {
if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
diff --git a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java
index cada2df24..175d444c1 100644
--- a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java
@@ -40,7 +40,7 @@ public class PtpCommand implements CommandExecutor {
return true;
}
if (args.length < 1) {
- player.sendMessage(ChatColor.RED + "Usage is /" + LoadProperties.ptp + " ");
+ player.sendMessage(ChatColor.RED + "Usage is /ptp ");
return true;
}
if (plugin.getServer().getPlayer(args[0]) == null) {
diff --git a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
index 9daedef2f..087a5a35f 100644
--- a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
@@ -75,14 +75,15 @@ public class mcBlockListener implements Listener
//Check if the blocks placed should be monitored so they do not give out XP in the future
if(m.shouldBeWatched(block))
{
- if(block.getTypeId() != 17 && block.getTypeId() != 39 && block.getTypeId() != 40 && block.getTypeId() != 91 && block.getTypeId() != 86) {
+ int id = block.getTypeId();
+ if (id == 17 || id == 39 || id == 40 || id == 91 || id == 86 || id == 73) {
+ plugin.misc.blockWatchList.add(block);
+ } else {
//block.setData((byte) 5); //Change the byte
//The following is a method to get around a breakage in 1.1-R2 and onward
//it should be removed as soon as functionality to change a block
//in this event returns.
plugin.changeQueue.push(block);
- } else if(block.getTypeId() == 17 || block.getTypeId() == 39 || block.getTypeId() == 40 || block.getTypeId() == 91 || block.getTypeId() == 86) {
- plugin.misc.blockWatchList.add(block);
}
}
diff --git a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java
index 02978a929..52a87642a 100644
--- a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java
@@ -164,7 +164,7 @@ public class mcPlayerListener implements Listener
Player player = event.getPlayer();
if(mcPermissions.getInstance().motd(player) && LoadProperties.enableMotd)
{
- player.sendMessage(mcLocale.getString("mcPlayerListener.MOTD", new Object[] {plugin.getDescription().getVersion(), LoadProperties.mcmmo}));
+ player.sendMessage(mcLocale.getString("mcPlayerListener.MOTD", new Object[] {plugin.getDescription().getVersion(), "/mcmmo"}));
player.sendMessage(mcLocale.getString("mcPlayerListener.WIKI"));
}
//THIS IS VERY BAD WAY TO DO THINGS, NEED BETTER WAY
diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
index 086514388..aa94c107e 100644
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -97,7 +97,7 @@ public class mcMMO extends JavaPlugin
public Misc misc = new Misc(this);
//Config file stuff
- LoadProperties config = new LoadProperties(this);
+ LoadProperties config;
//Jar stuff
public static File mcmmo;
@@ -127,8 +127,8 @@ public class mcMMO extends JavaPlugin
mcPermissions.initialize(getServer());
- System.out.println("[mcMMO]Checking config file at: " + this.getDataFolder().toString() + File.separator + "config.yml");
- config.configCheck();
+ this.config = new LoadProperties(this);
+ this.config.load();
Party.getInstance().loadParties();
new Party(this);
@@ -275,36 +275,6 @@ public class mcMMO extends JavaPlugin
aliasMap.put(mcLocale.getString("m.SkillUnarmed").toLowerCase(), "unarmed");
aliasMap.put(mcLocale.getString("m.SkillWoodCutting").toLowerCase(), "woodcutting");
- //Mc* commands
- aliasMap.put(LoadProperties.mcability, "mcability");
- aliasMap.put(LoadProperties.mcc, "mcc");
- aliasMap.put(LoadProperties.mcgod, "mcgod");
- aliasMap.put(LoadProperties.mcmmo, "mcmmo");
- aliasMap.put(LoadProperties.mcrefresh, "mcrefresh");
- aliasMap.put(LoadProperties.mctop, "mctop");
-
- //Party commands
- aliasMap.put(LoadProperties.accept, "accept");
- //aliasMap.put(null, "a");
- aliasMap.put(LoadProperties.invite, "invite");
- aliasMap.put(LoadProperties.party, "party");
- //aliasMap.put(null, "p");
- aliasMap.put(LoadProperties.ptp, "ptp");
-
- //Other commands
- aliasMap.put(LoadProperties.addxp, "addxp");
- aliasMap.put(LoadProperties.clearmyspawn, "clearmyspawn");
- aliasMap.put(LoadProperties.mmoedit, "mmoedit");
- //aliasMap.put(key, "mmoupdate");
- aliasMap.put(LoadProperties.myspawn, "myspawn");
- aliasMap.put(LoadProperties.stats, "stats");
- aliasMap.put(LoadProperties.whois, "whois");
- aliasMap.put(LoadProperties.xprate, "xprate");
-
- //Spout commands
- //aliasMap.put(null, "mchud");
- aliasMap.put(LoadProperties.xplock, "xplock");
-
//Register commands
//Skills commands
@@ -322,34 +292,34 @@ public class mcMMO extends JavaPlugin
getCommand("woodcutting").setExecutor(new WoodcuttingCommand());
//Mc* commands
- getCommand("mcability").setExecutor(new McabilityCommand());
- getCommand("mcc").setExecutor(new MccCommand());
- getCommand("mcgod").setExecutor(new McgodCommand());
- getCommand("mcmmo").setExecutor(new McmmoCommand());
- getCommand("mcrefresh").setExecutor(new McrefreshCommand(this));
- getCommand("mctop").setExecutor(new MctopCommand());
+ if(LoadProperties.mcabilityEnable) getCommand("mcability").setExecutor(new McabilityCommand());
+ if(LoadProperties.mccEnable) getCommand("mcc").setExecutor(new MccCommand());
+ if(LoadProperties.mcgodEnable) getCommand("mcgod").setExecutor(new McgodCommand());
+ if(LoadProperties.mcmmoEnable) getCommand("mcmmo").setExecutor(new McmmoCommand());
+ if(LoadProperties.mcrefreshEnable) getCommand("mcrefresh").setExecutor(new McrefreshCommand(this));
+ if(LoadProperties.mctopEnable) getCommand("mctop").setExecutor(new MctopCommand());
//Party commands
- getCommand("accept").setExecutor(new AcceptCommand());
+ if(LoadProperties.acceptEnable) getCommand("accept").setExecutor(new AcceptCommand());
getCommand("a").setExecutor(new ACommand());
- getCommand("invite").setExecutor(new InviteCommand(this));
- getCommand("party").setExecutor(new PartyCommand());
+ if(LoadProperties.inviteEnable) getCommand("invite").setExecutor(new InviteCommand(this));
+ if(LoadProperties.partyEnable) getCommand("party").setExecutor(new PartyCommand());
getCommand("p").setExecutor(new PCommand());
- getCommand("ptp").setExecutor(new PtpCommand(this));
+ if(LoadProperties.ptpEnable) getCommand("ptp").setExecutor(new PtpCommand(this));
//Other commands
- getCommand("addxp").setExecutor(new AddxpCommand(this));
- getCommand("clearmyspawn").setExecutor(new ClearmyspawnCommand());
- getCommand("mmoedit").setExecutor(new MmoeditCommand(this));
+ if(LoadProperties.addxpEnable) getCommand("addxp").setExecutor(new AddxpCommand(this));
+ if(LoadProperties.clearmyspawnEnable) getCommand("clearmyspawn").setExecutor(new ClearmyspawnCommand());
+ if(LoadProperties.mmoeditEnable) getCommand("mmoedit").setExecutor(new MmoeditCommand(this));
getCommand("mmoupdate").setExecutor(new MmoupdateCommand());
- getCommand("myspawn").setExecutor(new MyspawnCommand());
- getCommand("stats").setExecutor(new StatsCommand());
- getCommand("whois").setExecutor(new WhoisCommand(this));
- getCommand("xprate").setExecutor(new XprateCommand());
+ if(LoadProperties.myspawnEnable) getCommand("myspawn").setExecutor(new MyspawnCommand());
+ if(LoadProperties.statsEnable) getCommand("stats").setExecutor(new StatsCommand());
+ if(LoadProperties.whoisEnable) getCommand("whois").setExecutor(new WhoisCommand(this));
+ if(LoadProperties.xprateEnable) getCommand("xprate").setExecutor(new XprateCommand());
//Spout commands
getCommand("mchud").setExecutor(new MchudCommand());
- getCommand("xplock").setExecutor(new XplockCommand());
+ if(LoadProperties.xplockEnable) getCommand("xplock").setExecutor(new XplockCommand());
}
diff --git a/src/main/java/com/gmail/nossr50/party/Party.java b/src/main/java/com/gmail/nossr50/party/Party.java
index 771ffff89..2d48a4098 100644
--- a/src/main/java/com/gmail/nossr50/party/Party.java
+++ b/src/main/java/com/gmail/nossr50/party/Party.java
@@ -246,7 +246,7 @@ public class Party
if(password == null)
{
//TODO: Needs more locale.
- player.sendMessage("This party requires a password. Use "+LoadProperties.party+" to join it.");
+ player.sendMessage("This party requires a password. Use /party to join it.");
return;
} else if(!password.equalsIgnoreCase(getPartyPassword(newParty)))
{
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
new file mode 100644
index 000000000..8b12efb61
--- /dev/null
+++ b/src/main/resources/config.yml
@@ -0,0 +1,330 @@
+Items:
+ Chimaera_Wing:
+ Enabled: true
+ Feather_Cost: 10
+ Item_ID: 288
+Spout:
+ Menu:
+ Key: KEY_M
+ XP:
+ Bar:
+ Enabled: true
+ X_POS: 95
+ Y_POS: 6
+ Icon:
+ Enabled: true
+ X_POS: 78
+ Y_POS: 2
+ Party:
+ HUD:
+ Show_Faces: true
+ Enabled: true
+ Show_Display_Name: false
+ Images:
+ URL_DIR: http://mcmmo.rycochet.net/mcmmo/
+ HUD:
+ Default: STANDARD
+ Retro:
+ Colors:
+ Swords:
+ BLUE: 0.75
+ GREEN: 0.3
+ RED: 0.3
+ Taming:
+ BLUE: 0.75
+ GREEN: 0.3
+ RED: 0.3
+ Acrobatics:
+ BLUE: 0.75
+ GREEN: 0.3
+ RED: 0.3
+ Border:
+ BLUE: 0.0
+ GREEN: 0.0
+ RED: 0.0
+ Background:
+ BLUE: 0.75
+ GREEN: 0.75
+ RED: 0.75
+ Woodcutting:
+ BLUE: 0.75
+ GREEN: 0.3
+ RED: 0.3
+ Archery:
+ BLUE: 0.75
+ GREEN: 0.3
+ RED: 0.3
+ Axes:
+ BLUE: 0.75
+ GREEN: 0.3
+ RED: 0.3
+ Repair:
+ BLUE: 0.75
+ GREEN: 0.3
+ RED: 0.3
+ Fishing:
+ BLUE: 0.75
+ GREEN: 0.3
+ RED: 0.3
+ Excavation:
+ BLUE: 0.75
+ GREEN: 0.3
+ RED: 0.3
+ Herbalism:
+ BLUE: 0.75
+ GREEN: 0.3
+ RED: 0.3
+ Unarmed:
+ BLUE: 0.75
+ GREEN: 0.3
+ RED: 0.3
+ Mining:
+ BLUE: 0.75
+ GREEN: 0.3
+ RED: 0.3
+Fishing:
+ Drops:
+ Gold_Tools: true
+ Diamond_Armor: true
+ Stone_Tools: true
+ Diamonds: true
+ Iron_Armor: true
+ Iron_Tools: true
+ Diamond_Tools: true
+ Item_Drops_Enabled: true
+ Records: true
+ Blaze_Rod: true
+ Leather_Armor: true
+ Drop_Chance:
+ Tier_1: 20
+ Tier_2: 25
+ Tier_3: 30
+ Tier_4: 35
+ Tier_5: 40
+ Gold_Armor: true
+ Glowstone_Dust: true
+ Ender_Pearl: true
+ Wooden_Tools: true
+Skills:
+ Taming:
+ Call_Of_The_Wild:
+ Bones_Required: 10
+ Excavation:
+ Requires_Shovel: true
+ Woodcutting:
+ Requires_Axe: true
+ Herbalism:
+ Green_Thumb:
+ Cobble_To_Mossy: true
+ Mining:
+ Requires_Pickaxe: true
+ Repair:
+ Leather:
+ ID: 334
+ String:
+ Name: Leather
+ ID: 287
+ Stone:
+ Name: Cobblestone
+ ID: 4
+ Wood:
+ Name: Wood Planks
+ ID: 5
+ Gold:
+ Name: Gold Bars
+ ID: 266
+ Anvil_Messages: true
+ Diamond:
+ Name: Diamond
+ Level_Required: 50
+ ID: 264
+ Iron:
+ Name: Iron Bars
+ ID: 265
+Experience:
+ Fishing:
+ Base: 800
+ Formula:
+ Multiplier:
+ Swords: 1.0
+ Taming: 1.0
+ Acrobatics: 1.0
+ Sorcery: 1.0
+ Excavation: 1.0
+ Herbalism: 1.0
+ Unarmed: 1.0
+ Woodcutting: 1.0
+ Mining: 1.0
+ Archery: 1.0
+ Axes: 1.0
+ Repair: 1.0
+ Gains:
+ Mobspawners:
+ Enabled: false
+ Multiplier:
+ PVP: 1
+ Global: 1.0
+ PVP:
+ Rewards: true
+ Excavation:
+ Base: 40
+ Cake: 3000
+ Sulphur: 30
+ Bones: 30
+ Map: 200
+ Slimeballs: 100
+ Bucket: 100
+ Apple: 100
+ Mushroom: 80
+ Eggs: 100
+ Slowsand: 80
+ Watch: 200
+ Web: 150
+ String: 200
+ Glowstone: 80
+ Music: 3000
+ Diamond: 1000
+ Cocoa_Beans: 100
+ Woodcutting:
+ Birch: 70
+ Spruce: 80
+ Pine: 90
+ Herbalism:
+ Sugar_Cane: 30
+ Cactus: 30
+ Flowers: 100
+ Pumpkin: 20
+ Mushrooms: 150
+ Wheat: 50
+ Melon: 20
+ Nether_Wart: 50
+ Lily_Pads: 100
+ Vines: 10
+ Mining:
+ Sandstone: 30
+ Glowstone: 30
+ Lapis: 400
+ Obsidian: 150
+ Stone: 30
+ Netherrack: 30
+ Gold: 350
+ Redstone: 150
+ Coal: 100
+ Diamond: 750
+ lapis: 400
+ Iron: 250
+MySQL:
+ Enabled: false
+ Database:
+ User:
+ Name: UserName
+ Password: UserPassword
+ Name: DataBaseName
+ TablePrefix: mcmmo_
+ Server:
+ Port: 3306
+ Address: localhost
+XP:
+ Gains:
+ Mobspawners:
+ Enabled: false
+ PVP:
+ Rewards: true
+General:
+ HP_Regeneration:
+ Enabled: true
+ Locale: en_us
+ MySpawn:
+ Enabled: true
+ MOTD:
+ Enabled: true
+Excavation:
+ Drops:
+ Cake: true
+ Sulphur: true
+ Bones: true
+ Apples: true
+ Map: true
+ Slimeballs: true
+ Bucket: true
+ Netherrack: true
+ Mushrooms: true
+ Eggs: true
+ Slowsand: true
+ Watch: true
+ Web: true
+ String: true
+ Glowstone: true
+ Music: true
+ Diamond: true
+ Cocoa_Beans: true
+Arcane_Forging:
+ Keep_Enchants:
+ Chance:
+ Rank_4: 40
+ Rank_3: 30
+ Rank_2: 20
+ Rank_1: 10
+ May_Lose_Enchants:
+ Enabled: true
+ Downgrades:
+ Enabled: true
+ Chance:
+ Rank_4: 15
+ Rank_3: 25
+ Rank_2: 50
+ Rank_1: 75
+Abilities:
+ Activation:
+ Only_Activate_When_Sneaking: false
+ Enabled: true
+ Messages: true
+ Cooldowns:
+ Giga_Drill_Breaker: 240
+ Berserk: 240
+ Green_Terra: 240
+ Skull_Splitter: 240
+ Serrated_Strikes: 240
+ Tree_Feller: 240
+ Super_Breaker: 240
+ Tools:
+ Durability_Loss: 2
+ Durability_Loss_Enabled: true
+Commands:
+ invite:
+ Enabled: true
+ mctop:
+ Enabled: true
+ xplock:
+ Enabled: true
+ whois:
+ Enabled: true
+ mcc:
+ Enabled: true
+ mmoedit:
+ Enabled: true
+ accept:
+ Enabled: true
+ stats:
+ Enabled: true
+ mcability:
+ Enabled: true
+ party:
+ Enabled: true
+ xprate:
+ Enabled: true
+ mcgod:
+ Enabled: true
+ mcmmo:
+ Enabled: true
+ Donate_Message: true
+ mcrefresh:
+ Enabled: true
+ myspawn:
+ Enabled: true
+ addxp:
+ Enabled: true
+ clearmyspawn:
+ Enabled: true
+ ptp:
+ Enabled: true
\ No newline at end of file