diff --git a/src/Changelog.txt b/src/Changelog.txt index 30b316ba1..2fca77736 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -1,20 +1,22 @@ Changelog: #Versions without changelogs probably had very small misc fixes, like tweaks to the source code Version 1.1.14 -Improvements have been made with MySQL thanks to krinsdeath -Added some experimental usage tracking, you can opt out of this in /plugins/stats/config.yml (Once its generated, may require 2 restarts) [1.8] Removed the bonus damage from Archery (I'll rework this skill soon) [1.8] Removed the food bonuses to healing Herbalism provided due to the change of eating in game mechanics [1.8] Swords no longer parry, no need to compete with in game mechanics [1.8] mcMMO no longer has an HP Regen system, no need to compete with in game mechanics -mcMMO now transfers files between MC Server -> Client rather than Webserver -> Client (By default, you can change this..) -Fixed a few problems with readying abilities for Woodcutting/Axes -Changed the listener priority for OnEntityDamage from High to Monitor (Should make mcMMO compatible with Worldguards pvp regions among other things) -Added addXpOverride for modders, this will ignore skill modifiers -Added an option for Excavation to require use of a shovel, on by default -The option to change the weburl of mcMMO Images/Sounds has been removed, if you want to customize mcMMO images/sounds you can open mcMMO.jar and replace them there -Made party/admin chat modes more compatible with chat plugins (vChat) -Portuguese Brazil locale added (Code: pt_br) +[SPOUT] mcMMO now transfers files between [MC Server] -> [Client] rather than [Webserver] -> [Client] +[SPOUT/CONFIG] mcMMO now allows for disabling of the party HUD with the node Spout.Party.HUD.Enabled +[BUG] Fixed a few problems with readying abilities for Woodcutting/Axes +[MYSQL] Improvements have been made to the performance of MySQL thanks to krinsdeath +[CONFIG] Spout.Party.HP tree removed, replaced with Spout.Party.HUD +[CONFIG] Added an option for Excavation to require use of a shovel, on by default +[COMPATIBILITY] Changed the listener priority for OnEntityDamage from High to Monitor (Should make mcMMO compatible with Worldguards pvp regions among other things) +[COMPATIBILITY] Made party/admin chat modes more compatible with chat plugins (vChat) +[API] Added addXpOverride for modders, this will ignore skill modifiers +[SPOUT] The option to change the weburl of mcMMO Images/Sounds has been removed, if you want to customize mcMMO images/sounds you can open mcMMO.jar and replace them there +[LOCALE] Portuguese Brazil locale added (Code: pt_br) +[MISC] Added some experimental usage tracking, you can opt out of this in /plugins/stats/config.yml (Once its generated, may require 2 restarts) Version 1.1.13 Pets are removed from party bars diff --git a/src/com/gmail/nossr50/Combat.java b/src/com/gmail/nossr50/Combat.java index 9212bf093..deb4edad7 100644 --- a/src/com/gmail/nossr50/Combat.java +++ b/src/com/gmail/nossr50/Combat.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50; import org.bukkit.World; diff --git a/src/com/gmail/nossr50/Database.java b/src/com/gmail/nossr50/Database.java index 3218cde12..7dfb1a05e 100644 --- a/src/com/gmail/nossr50/Database.java +++ b/src/com/gmail/nossr50/Database.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50; import java.sql.Connection; diff --git a/src/com/gmail/nossr50/Item.java b/src/com/gmail/nossr50/Item.java index 8ac7cff08..03410e946 100644 --- a/src/com/gmail/nossr50/Item.java +++ b/src/com/gmail/nossr50/Item.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50; import org.bukkit.Location; diff --git a/src/com/gmail/nossr50/Leaderboard.java b/src/com/gmail/nossr50/Leaderboard.java index bcac07721..73e7d7004 100644 --- a/src/com/gmail/nossr50/Leaderboard.java +++ b/src/com/gmail/nossr50/Leaderboard.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50; import java.io.BufferedReader; diff --git a/src/com/gmail/nossr50/Users.java b/src/com/gmail/nossr50/Users.java index 1cc4e292e..772798085 100644 --- a/src/com/gmail/nossr50/Users.java +++ b/src/com/gmail/nossr50/Users.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50; import java.io.*; diff --git a/src/com/gmail/nossr50/command/Commands.java b/src/com/gmail/nossr50/command/Commands.java index 3d8dab41d..4d8361e5c 100644 --- a/src/com/gmail/nossr50/command/Commands.java +++ b/src/com/gmail/nossr50/command/Commands.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.command; import java.util.ArrayList; diff --git a/src/com/gmail/nossr50/config/LoadProperties.java b/src/com/gmail/nossr50/config/LoadProperties.java index c2e2cdb7f..e27ad26cf 100644 --- a/src/com/gmail/nossr50/config/LoadProperties.java +++ b/src/com/gmail/nossr50/config/LoadProperties.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.config; import java.io.File; @@ -18,7 +34,7 @@ public class LoadProperties xprate, mcability, mcmmo, mcc, mcrefresh, mcgod, stats, mmoedit, ptp, party, myspawn, whois, invite, accept, clearmyspawn, nWood, nStone, nIron, nGold, nDiamond, locale; - public static int mwatch, xpbar_x, xpbar_y, xpicon_x, xpicon_y, partybar_x, partybar_y, partybar_spacing, mstring, mbucket, mweb, + public static int mwatch, xpbar_x, xpbar_y, xpicon_x, xpicon_y, mstring, mbucket, mweb, archeryLimit, chimaeraId, msandstone, mcocoa, water_thunder, cure_self, cure_other, mslimeballs, mbones, msulphur, mslowsand, mmushroom2, mglowstone2, mmusic, mdiamond2, mbase, mapple, meggs, mcake, mpine, mbirch, mspruce, mcactus, mmushroom, mflower, msugar, mpumpkin, mwheat, mgold, mdiamond, miron, mredstone, mlapis, mobsidian, mnetherrack, mglowstone, mcoal, mstone, MySQLport, @@ -121,10 +137,7 @@ public class LoadProperties write("Spout.XP.Bar.Y_POS", 6); write("Spout.XP.Icon.X_POS", 78); write("Spout.XP.Icon.Y_POS", 2); - write("Spout.Party.HP.Enabled", true); - write("Spout.Party.HP.X_POS", -11); - write("Spout.Party.HP.Y_POS", 0); - write("Spout.Party.HP.SPACING", 16); + write("Spout.Party.HUD.Enabled", true); write("Spout.Menu.Key", "KEY_M"); write("Spout.HUD.Retro.Colors.Acrobatics.RED", 0.3); write("Spout.HUD.Retro.Colors.Acrobatics.GREEN", 0.3); @@ -352,10 +365,7 @@ public class LoadProperties xpbar_y = readInteger("Spout.XP.Bar.Y_POS", 6); xpicon_x = readInteger("Spout.XP.Icon.X_POS", 78); xpicon_y = readInteger("Spout.XP.Icon.Y_POS", 2); - partybar = readBoolean("Spout.Party.HP.Enabled", true); - partybar_x = readInteger("Spout.Party.HP.X_POS", -11); - partybar_y = readInteger("Spout.Party.HP.Y_POS", 0); - partybar_spacing = readInteger("Spout.Party.HP.SPACING", 16); + partybar = readBoolean("Spout.Party.HUD.Enabled", true); acrobatics_r = readDouble("Spout.HUD.Retro.Colors.Acrobatics.RED", 0.3); acrobatics_g = readDouble("Spout.HUD.Retro.Colors.Acrobatics.GREEN", 0.3); diff --git a/src/com/gmail/nossr50/config/Misc.java b/src/com/gmail/nossr50/config/Misc.java index 8078ecf34..b66e514ed 100644 --- a/src/com/gmail/nossr50/config/Misc.java +++ b/src/com/gmail/nossr50/config/Misc.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.config; import java.util.*; diff --git a/src/com/gmail/nossr50/datatypes/FakeBlockBreakEvent.java b/src/com/gmail/nossr50/datatypes/FakeBlockBreakEvent.java index 5309720c2..29d2497e7 100644 --- a/src/com/gmail/nossr50/datatypes/FakeBlockBreakEvent.java +++ b/src/com/gmail/nossr50/datatypes/FakeBlockBreakEvent.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.datatypes; import org.bukkit.block.Block; diff --git a/src/com/gmail/nossr50/datatypes/HUDType.java b/src/com/gmail/nossr50/datatypes/HUDType.java index 919854cab..98e50b881 100644 --- a/src/com/gmail/nossr50/datatypes/HUDType.java +++ b/src/com/gmail/nossr50/datatypes/HUDType.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.datatypes; public enum HUDType diff --git a/src/com/gmail/nossr50/datatypes/HUDmmo.java b/src/com/gmail/nossr50/datatypes/HUDmmo.java index f4450a79b..b14652623 100644 --- a/src/com/gmail/nossr50/datatypes/HUDmmo.java +++ b/src/com/gmail/nossr50/datatypes/HUDmmo.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.datatypes; import org.bukkit.Bukkit; @@ -40,6 +56,10 @@ public class HUDmmo public void initializeHUD(Player player) { HUDType type = Users.getProfile(player).getHUDType(); + + if(LoadProperties.partybar) + mmoHelper.initialize(SpoutManager.getPlayer(player), plugin); //PARTY HUD + switch(type) { case RETRO: @@ -95,7 +115,9 @@ public class HUDmmo xpbg = null; xpicon = null; - mmoHelper.initialize(sPlayer, plugin); + if(LoadProperties.partybar) + mmoHelper.initialize(sPlayer, plugin); + sPlayer.getMainScreen().setDirty(true); } } diff --git a/src/com/gmail/nossr50/datatypes/PlayerProfile.java b/src/com/gmail/nossr50/datatypes/PlayerProfile.java index ac1ce86b0..de8cc9d17 100644 --- a/src/com/gmail/nossr50/datatypes/PlayerProfile.java +++ b/src/com/gmail/nossr50/datatypes/PlayerProfile.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.datatypes; import java.io.BufferedReader; diff --git a/src/com/gmail/nossr50/datatypes/PlayerStat.java b/src/com/gmail/nossr50/datatypes/PlayerStat.java index 3c9cfd01d..423dc62b3 100644 --- a/src/com/gmail/nossr50/datatypes/PlayerStat.java +++ b/src/com/gmail/nossr50/datatypes/PlayerStat.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.datatypes; public class PlayerStat diff --git a/src/com/gmail/nossr50/datatypes/SkillType.java b/src/com/gmail/nossr50/datatypes/SkillType.java index 9ae8afdab..ebaa5bdf4 100644 --- a/src/com/gmail/nossr50/datatypes/SkillType.java +++ b/src/com/gmail/nossr50/datatypes/SkillType.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.datatypes; public enum SkillType diff --git a/src/com/gmail/nossr50/datatypes/Tree.java b/src/com/gmail/nossr50/datatypes/Tree.java index 4137144ec..dcfc9dbf7 100644 --- a/src/com/gmail/nossr50/datatypes/Tree.java +++ b/src/com/gmail/nossr50/datatypes/Tree.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.datatypes; import java.util.ArrayList; diff --git a/src/com/gmail/nossr50/datatypes/TreeNode.java b/src/com/gmail/nossr50/datatypes/TreeNode.java index f60ec28d4..3a95899e1 100644 --- a/src/com/gmail/nossr50/datatypes/TreeNode.java +++ b/src/com/gmail/nossr50/datatypes/TreeNode.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.datatypes; import java.util.ArrayList; diff --git a/src/com/gmail/nossr50/datatypes/buttons/ButtonEscape.java b/src/com/gmail/nossr50/datatypes/buttons/ButtonEscape.java index d383a47ab..1b716443e 100644 --- a/src/com/gmail/nossr50/datatypes/buttons/ButtonEscape.java +++ b/src/com/gmail/nossr50/datatypes/buttons/ButtonEscape.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.datatypes.buttons; import org.getspout.spoutapi.gui.GenericButton; diff --git a/src/com/gmail/nossr50/datatypes/buttons/ButtonHUDStyle.java b/src/com/gmail/nossr50/datatypes/buttons/ButtonHUDStyle.java index 9d347f5d3..d89a4a0ac 100644 --- a/src/com/gmail/nossr50/datatypes/buttons/ButtonHUDStyle.java +++ b/src/com/gmail/nossr50/datatypes/buttons/ButtonHUDStyle.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.datatypes.buttons; import org.getspout.spoutapi.gui.GenericButton; diff --git a/src/com/gmail/nossr50/datatypes/popups/PopupMMO.java b/src/com/gmail/nossr50/datatypes/popups/PopupMMO.java index a9c607dbf..be4bfb71e 100644 --- a/src/com/gmail/nossr50/datatypes/popups/PopupMMO.java +++ b/src/com/gmail/nossr50/datatypes/popups/PopupMMO.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.datatypes.popups; import org.bukkit.ChatColor; diff --git a/src/com/gmail/nossr50/listeners/mcBlockListener.java b/src/com/gmail/nossr50/listeners/mcBlockListener.java index 79ba595d3..8bbee37c8 100644 --- a/src/com/gmail/nossr50/listeners/mcBlockListener.java +++ b/src/com/gmail/nossr50/listeners/mcBlockListener.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.listeners; import com.gmail.nossr50.Users; diff --git a/src/com/gmail/nossr50/listeners/mcEntityListener.java b/src/com/gmail/nossr50/listeners/mcEntityListener.java index c7b7dd60c..64fbe4c61 100644 --- a/src/com/gmail/nossr50/listeners/mcEntityListener.java +++ b/src/com/gmail/nossr50/listeners/mcEntityListener.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.listeners; import org.bukkit.entity.Entity; diff --git a/src/com/gmail/nossr50/listeners/mcPlayerListener.java b/src/com/gmail/nossr50/listeners/mcPlayerListener.java index 792ec577c..bfa5d41ca 100644 --- a/src/com/gmail/nossr50/listeners/mcPlayerListener.java +++ b/src/com/gmail/nossr50/listeners/mcPlayerListener.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.listeners; import java.util.logging.Logger; diff --git a/src/com/gmail/nossr50/listeners/mcSpoutInputListener.java b/src/com/gmail/nossr50/listeners/mcSpoutInputListener.java index 73e18946c..d7f8adf18 100644 --- a/src/com/gmail/nossr50/listeners/mcSpoutInputListener.java +++ b/src/com/gmail/nossr50/listeners/mcSpoutInputListener.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.listeners; import org.getspout.spoutapi.event.input.InputListener; diff --git a/src/com/gmail/nossr50/listeners/mcSpoutListener.java b/src/com/gmail/nossr50/listeners/mcSpoutListener.java index 27aef9dd5..0019ab9f8 100644 --- a/src/com/gmail/nossr50/listeners/mcSpoutListener.java +++ b/src/com/gmail/nossr50/listeners/mcSpoutListener.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.listeners; import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent; @@ -8,7 +24,6 @@ import com.gmail.nossr50.Users; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.HUDmmo; import com.gmail.nossr50.spout.SpoutStuff; -import com.gmail.nossr50.spout.mmoHelper; public class mcSpoutListener extends SpoutListener { @@ -26,12 +41,7 @@ public class mcSpoutListener extends SpoutListener { //Setup Party HUD stuff SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer)); - - //if(LoadProperties.partybar && Users.getProfile(sPlayer).inParty()) - //SpoutStuff.initializePartyTracking(sPlayer); - - mmoHelper.initialize(sPlayer, plugin); - + //Party.update(sPlayer); Users.getProfile(sPlayer).toggleSpoutEnabled(); } diff --git a/src/com/gmail/nossr50/listeners/mcSpoutScreenListener.java b/src/com/gmail/nossr50/listeners/mcSpoutScreenListener.java index f99243006..d1e8d898f 100644 --- a/src/com/gmail/nossr50/listeners/mcSpoutScreenListener.java +++ b/src/com/gmail/nossr50/listeners/mcSpoutScreenListener.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.listeners; import org.getspout.spoutapi.event.screen.ButtonClickEvent; diff --git a/src/com/gmail/nossr50/locale/mcLocale.java b/src/com/gmail/nossr50/locale/mcLocale.java index 6336826ae..78fdf96bf 100644 --- a/src/com/gmail/nossr50/locale/mcLocale.java +++ b/src/com/gmail/nossr50/locale/mcLocale.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.locale; import java.text.MessageFormat; diff --git a/src/com/gmail/nossr50/m.java b/src/com/gmail/nossr50/m.java index ddcc66511..1ee576daa 100644 --- a/src/com/gmail/nossr50/m.java +++ b/src/com/gmail/nossr50/m.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50; import java.io.BufferedReader; diff --git a/src/com/gmail/nossr50/mcMMO.java b/src/com/gmail/nossr50/mcMMO.java index 0f6969182..8207bb534 100644 --- a/src/com/gmail/nossr50/mcMMO.java +++ b/src/com/gmail/nossr50/mcMMO.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50; import com.gmail.nossr50.datatypes.PlayerProfile; diff --git a/src/com/gmail/nossr50/mcPermissions.java b/src/com/gmail/nossr50/mcPermissions.java index 2e4bcc3b1..01c8f20ad 100644 --- a/src/com/gmail/nossr50/mcPermissions.java +++ b/src/com/gmail/nossr50/mcPermissions.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50; import java.util.logging.Logger; diff --git a/src/com/gmail/nossr50/party/Party.java b/src/com/gmail/nossr50/party/Party.java index 84defd31a..206894e95 100644 --- a/src/com/gmail/nossr50/party/Party.java +++ b/src/com/gmail/nossr50/party/Party.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.party; import java.io.EOFException; diff --git a/src/com/gmail/nossr50/runnables/mcTimer.java b/src/com/gmail/nossr50/runnables/mcTimer.java index 5ef6bda52..286f5d4cd 100644 --- a/src/com/gmail/nossr50/runnables/mcTimer.java +++ b/src/com/gmail/nossr50/runnables/mcTimer.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.runnables; import org.bukkit.entity.*; diff --git a/src/com/gmail/nossr50/skills/Acrobatics.java b/src/com/gmail/nossr50/skills/Acrobatics.java index 6dafa9928..442ee0460 100644 --- a/src/com/gmail/nossr50/skills/Acrobatics.java +++ b/src/com/gmail/nossr50/skills/Acrobatics.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.skills; import org.bukkit.ChatColor; diff --git a/src/com/gmail/nossr50/skills/Archery.java b/src/com/gmail/nossr50/skills/Archery.java index 9e416a11e..b85a4a352 100644 --- a/src/com/gmail/nossr50/skills/Archery.java +++ b/src/com/gmail/nossr50/skills/Archery.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.skills; import org.bukkit.Location; diff --git a/src/com/gmail/nossr50/skills/Axes.java b/src/com/gmail/nossr50/skills/Axes.java index 661a925da..99bbb8bcd 100644 --- a/src/com/gmail/nossr50/skills/Axes.java +++ b/src/com/gmail/nossr50/skills/Axes.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.skills; import org.bukkit.ChatColor; diff --git a/src/com/gmail/nossr50/skills/Excavation.java b/src/com/gmail/nossr50/skills/Excavation.java index f6f0abeeb..3df296a55 100644 --- a/src/com/gmail/nossr50/skills/Excavation.java +++ b/src/com/gmail/nossr50/skills/Excavation.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.skills; import java.util.ArrayList; diff --git a/src/com/gmail/nossr50/skills/Herbalism.java b/src/com/gmail/nossr50/skills/Herbalism.java index 047d4fa0a..882977908 100644 --- a/src/com/gmail/nossr50/skills/Herbalism.java +++ b/src/com/gmail/nossr50/skills/Herbalism.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.skills; import org.bukkit.Location; diff --git a/src/com/gmail/nossr50/skills/Mining.java b/src/com/gmail/nossr50/skills/Mining.java index 4f6e91773..08b34435d 100644 --- a/src/com/gmail/nossr50/skills/Mining.java +++ b/src/com/gmail/nossr50/skills/Mining.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.skills; import org.bukkit.Location; diff --git a/src/com/gmail/nossr50/skills/Repair.java b/src/com/gmail/nossr50/skills/Repair.java index 46d3dab14..8acb645fc 100644 --- a/src/com/gmail/nossr50/skills/Repair.java +++ b/src/com/gmail/nossr50/skills/Repair.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.skills; import org.bukkit.ChatColor; diff --git a/src/com/gmail/nossr50/skills/Skills.java b/src/com/gmail/nossr50/skills/Skills.java index 4e742e7ed..f431d1dc5 100644 --- a/src/com/gmail/nossr50/skills/Skills.java +++ b/src/com/gmail/nossr50/skills/Skills.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.skills; import java.util.logging.Logger; diff --git a/src/com/gmail/nossr50/skills/Swords.java b/src/com/gmail/nossr50/skills/Swords.java index de3e3ad91..1f614ad84 100644 --- a/src/com/gmail/nossr50/skills/Swords.java +++ b/src/com/gmail/nossr50/skills/Swords.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.skills; import org.bukkit.ChatColor; diff --git a/src/com/gmail/nossr50/skills/Taming.java b/src/com/gmail/nossr50/skills/Taming.java index a3fc20217..f69808159 100644 --- a/src/com/gmail/nossr50/skills/Taming.java +++ b/src/com/gmail/nossr50/skills/Taming.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.skills; import org.bukkit.entity.AnimalTamer; diff --git a/src/com/gmail/nossr50/skills/Unarmed.java b/src/com/gmail/nossr50/skills/Unarmed.java index ea2e46f53..07fdfe56a 100644 --- a/src/com/gmail/nossr50/skills/Unarmed.java +++ b/src/com/gmail/nossr50/skills/Unarmed.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.skills; import org.bukkit.Location; diff --git a/src/com/gmail/nossr50/skills/WoodCutting.java b/src/com/gmail/nossr50/skills/WoodCutting.java index 04eb6310d..5c4453370 100644 --- a/src/com/gmail/nossr50/skills/WoodCutting.java +++ b/src/com/gmail/nossr50/skills/WoodCutting.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.skills; import java.util.ArrayList; diff --git a/src/com/gmail/nossr50/spout/SpoutStuff.java b/src/com/gmail/nossr50/spout/SpoutStuff.java index 10399c453..09147ad4a 100644 --- a/src/com/gmail/nossr50/spout/SpoutStuff.java +++ b/src/com/gmail/nossr50/spout/SpoutStuff.java @@ -1,3 +1,19 @@ +/* + This file is part of mcMMO. + + mcMMO is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mcMMO is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mcMMO. If not, see . +*/ package com.gmail.nossr50.spout; import java.io.BufferedOutputStream;