EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 15:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Major refactoring. This WILL break any mcMMO-related plugin that

Browse Source 
does not properly hook into the API classes. 

This consolidates the skill-related classes into their own individual
packages, and moves several misc skill classes into the main Skill
package as well. This also moves all Party & Spout related files into
their own respective packages as well.
This commit is contained in:
GJ 2013-01-22 12:43:25 -05:00
parent 00d50953ad
commit 6b0e7a9c61
95 changed files with 233 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -17,6 +17,7 @@ Version 1.4.00-dev
= Fixed Woodcutting accidentally using Mining double drop values.
! Changed how Tree Feller is handled, it should now put less stress on the CPU
! Changed Fisherman's Diet and Farmer's Diet to use two seperate config values
! Major refactoring - please take note, this WILL break any mcMMO-related plugin not properly hooking into the API.
Version 1.3.14
+ Added new Hylian Luck skill to Herbalism.

2
src/main/java/com/gmail/nossr50/api/AbilityAPI.java
View File

@ -2,7 +2,7 @@ package com.gmail.nossr50.api;
import org.bukkit.entity.Player;
import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.skills.AbilityType;
import com.gmail.nossr50.util.Users;
public class AbilityAPI {

4
src/main/java/com/gmail/nossr50/api/ExperienceAPI.java
View File

@ -2,8 +2,8 @@ package com.gmail.nossr50.api;
import org.bukkit.entity.Player;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.Users;
public final class ExperienceAPI {

2
src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java
View File

@ -5,7 +5,7 @@ import java.util.List;
import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.datatypes.ToolType;
import com.gmail.nossr50.skills.ToolType;
public final class SpoutToolsAPI {

4
src/main/java/com/gmail/nossr50/commands/CommandHelper.java
View File

@ -4,10 +4,10 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class CommandHelper {

4
src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java
View File

@ -9,10 +9,10 @@ import org.bukkit.entity.Player;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class AddlevelsCommand implements CommandExecutor{

4
src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java
View File

@ -9,10 +9,10 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.datatypes.McMMOPlayer;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
//TODO: Any way we can make this work for offline use?

2
src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java
View File

@ -8,8 +8,8 @@ import org.bukkit.entity.Player;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.datatypes.McMMOPlayer;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Users;

4
src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java
View File

@ -8,10 +8,10 @@ import org.bukkit.entity.Player;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.datatypes.McMMOPlayer;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class MmoeditCommand implements CommandExecutor {

2
src/main/java/com/gmail/nossr50/commands/general/SkillResetCommand.java
View File

@ -7,8 +7,8 @@ import org.bukkit.entity.Player;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Users;
public class SkillResetCommand implements CommandExecutor {

4
src/main/java/com/gmail/nossr50/commands/mc/McrankCommand.java
View File

@ -8,11 +8,11 @@ import org.bukkit.entity.Player;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.runnables.McRankAsync;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.Leaderboard;
import com.gmail.nossr50.util.Skills;
public class McrankCommand implements CommandExecutor {

4
src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java
View File

@ -10,12 +10,12 @@ import org.bukkit.command.CommandSender;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.Database;
import com.gmail.nossr50.util.Leaderboard;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Skills;
public class MctopCommand implements CommandExecutor {

2
src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java
View File

@ -10,6 +10,8 @@ import com.gmail.nossr50.datatypes.mods.CustomTool;
import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.party.PartyManager;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.spout.huds.SpoutHud;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.ModChecks;
import com.gmail.nossr50.util.Permissions;

7
src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
View File

@ -9,9 +9,14 @@ import java.util.HashMap;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.party.PartyManager;
import com.gmail.nossr50.skills.AbilityType;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.ToolType;
import com.gmail.nossr50.spout.SpoutConfig;
import com.gmail.nossr50.spout.huds.HudType;
import com.gmail.nossr50.spout.huds.SpoutHud;
import com.gmail.nossr50.util.Database;
import com.gmail.nossr50.util.Misc;

4
src/main/java/com/gmail/nossr50/datatypes/popups/Menu.java
View File

@ -6,12 +6,12 @@ import org.getspout.spoutapi.gui.InGameHUD;
import org.getspout.spoutapi.player.SpoutPlayer;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.HudType;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SpoutHud;
import com.gmail.nossr50.datatypes.buttons.McmmoButton;
import com.gmail.nossr50.datatypes.buttons.McmmoButton.Slot;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.spout.huds.HudType;
import com.gmail.nossr50.spout.huds.SpoutHud;
public class Menu extends GenericPopup {
private McmmoButton hudButton;

6
src/main/java/com/gmail/nossr50/datatypes/popups/XpBar.java
View File

@ -9,10 +9,10 @@ import org.getspout.spoutapi.gui.Widget;
import org.getspout.spoutapi.player.SpoutPlayer;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.datatypes.HudType;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.spout.SpoutConfig;
import com.gmail.nossr50.spout.huds.HudType;
import com.gmail.nossr50.util.Misc;
public class XpBar {

2
src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java
View File

@ -4,7 +4,7 @@ import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import org.bukkit.event.player.PlayerEvent;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.SkillType;
/**
* Generic event for mcMMO experience events.

2
src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java
View File

@ -2,7 +2,7 @@ package com.gmail.nossr50.events.experience;
import org.bukkit.entity.Player;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.SkillType;
/**
* Called when a user levels up in a skill

2
src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java
View File

@ -2,7 +2,7 @@ package com.gmail.nossr50.events.experience;
import org.bukkit.entity.Player;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.SkillType;
/**
* Called when a player gains XP in a skill

2
src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerDisarmEvent.java
View File

@ -3,7 +3,7 @@ package com.gmail.nossr50.events.skills;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.SkillType;
public class McMMOPlayerDisarmEvent extends McMMOPlayerSkillEvent implements Cancellable {
private boolean cancelled;

2
src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerRepairCheckEvent.java
View File

@ -4,7 +4,7 @@ import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.SkillType;
/**
* Called just before a player repairs an object with mcMMO.

2
src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java
View File

@ -4,7 +4,7 @@ import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import org.bukkit.event.player.PlayerEvent;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.SkillType;
/**
* Generic event for mcMMO skill handling.

24
src/main/java/com/gmail/nossr50/listeners/BlockListener.java
View File

@ -20,26 +20,26 @@ import org.getspout.spoutapi.sound.SoundEffect;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.ToolType;
import com.gmail.nossr50.events.fake.FakeBlockBreakEvent;
import com.gmail.nossr50.events.fake.FakeBlockDamageEvent;
import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
import com.gmail.nossr50.runnables.StickyPistonTracker;
import com.gmail.nossr50.skills.gathering.Excavation;
import com.gmail.nossr50.skills.gathering.Herbalism;
import com.gmail.nossr50.skills.gathering.WoodCutting;
import com.gmail.nossr50.skills.AbilityType;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.skills.ToolType;
import com.gmail.nossr50.skills.excavation.Excavation;
import com.gmail.nossr50.skills.herbalism.Herbalism;
import com.gmail.nossr50.skills.mining.MiningManager;
import com.gmail.nossr50.skills.repair.Repair;
import com.gmail.nossr50.skills.repair.Salvage;
import com.gmail.nossr50.skills.woodcutting.Woodcutting;
import com.gmail.nossr50.spout.SpoutSounds;
import com.gmail.nossr50.util.BlockChecks;
import com.gmail.nossr50.util.ItemChecks;
import com.gmail.nossr50.util.ModChecks;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class BlockListener implements Listener {
@ -179,15 +179,15 @@ public class BlockListener implements Listener {
else if (BlockChecks.isLog(block) && Permissions.woodcutting(player)) {
if (configInstance.getWoodcuttingRequiresTool()) {
if (ItemChecks.isAxe(inHand)) {
WoodCutting.woodcuttingBlockCheck(player, block);
Woodcutting.woodcuttingBlockCheck(player, block);
}
}
else {
WoodCutting.woodcuttingBlockCheck(player, block);
Woodcutting.woodcuttingBlockCheck(player, block);
}
if (!mcMMO.placeStore.isTrue(block) && profile.getAbilityMode(AbilityType.TREE_FELLER) && Permissions.treeFeller(player) && ItemChecks.isAxe(inHand)) {
WoodCutting.treeFeller(event);
Woodcutting.treeFeller(event);
}
}
@ -318,12 +318,12 @@ public class BlockListener implements Listener {
if (configInstance.getWoodcuttingRequiresTool()) {
if (ItemChecks.isAxe(inHand)) {
event.setInstaBreak(true);
WoodCutting.leafBlower(player, block);
Woodcutting.leafBlower(player, block);
}
}
else if (!inHand.getType().equals(Material.SHEARS)) {
event.setInstaBreak(true);
WoodCutting.leafBlower(player, block);
Woodcutting.leafBlower(player, block);
}
}
}

6
src/main/java/com/gmail/nossr50/listeners/EntityListener.java
View File

@ -31,19 +31,19 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
import com.gmail.nossr50.events.fake.FakeEntityDamageEvent;
import com.gmail.nossr50.party.PartyManager;
import com.gmail.nossr50.runnables.BleedTimer;
import com.gmail.nossr50.skills.Combat;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager;
import com.gmail.nossr50.skills.archery.Archery;
import com.gmail.nossr50.skills.mining.MiningManager;
import com.gmail.nossr50.skills.taming.TamingManager;
import com.gmail.nossr50.util.Combat;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class EntityListener implements Listener {

10
src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
View File

@ -26,23 +26,23 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.commands.general.XprateCommand;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.runnables.BleedTimer;
import com.gmail.nossr50.skills.gathering.Fishing;
import com.gmail.nossr50.skills.gathering.Herbalism;
import com.gmail.nossr50.skills.AbilityType;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.skills.fishing.Fishing;
import com.gmail.nossr50.skills.herbalism.Herbalism;
import com.gmail.nossr50.skills.mining.MiningManager;
import com.gmail.nossr50.skills.repair.Salvage;
import com.gmail.nossr50.skills.taming.TamingManager;
import com.gmail.nossr50.util.BlockChecks;
import com.gmail.nossr50.util.Item;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class PlayerListener implements Listener {

4
src/main/java/com/gmail/nossr50/listeners/SpoutListener.java
View File

@ -10,14 +10,14 @@ import org.getspout.spoutapi.gui.Button;
import org.getspout.spoutapi.gui.ScreenType;
import org.getspout.spoutapi.player.SpoutPlayer;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.datatypes.McMMOPlayer;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SpoutHud;
import com.gmail.nossr50.datatypes.buttons.McmmoButton;
import com.gmail.nossr50.datatypes.popups.Menu;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.spout.SpoutConfig;
import com.gmail.nossr50.spout.SpoutStuff;
import com.gmail.nossr50.spout.huds.SpoutHud;
import com.gmail.nossr50.util.Users;
public class SpoutListener implements Listener {

44
src/main/java/com/gmail/nossr50/mcMMO.java
View File

@ -32,26 +32,6 @@ import com.gmail.nossr50.commands.mc.McrankCommand;
import com.gmail.nossr50.commands.mc.McrefreshCommand;
import com.gmail.nossr50.commands.mc.McremoveCommand;
import com.gmail.nossr50.commands.mc.MctopCommand;
import com.gmail.nossr50.commands.party.ACommand;
import com.gmail.nossr50.commands.party.AcceptCommand;
import com.gmail.nossr50.commands.party.InviteCommand;
import com.gmail.nossr50.commands.party.PCommand;
import com.gmail.nossr50.commands.party.PartyCommand;
import com.gmail.nossr50.commands.party.PtpCommand;
import com.gmail.nossr50.commands.skills.AcrobaticsCommand;
import com.gmail.nossr50.commands.skills.ArcheryCommand;
import com.gmail.nossr50.commands.skills.AxesCommand;
import com.gmail.nossr50.commands.skills.ExcavationCommand;
import com.gmail.nossr50.commands.skills.FishingCommand;
import com.gmail.nossr50.commands.skills.HerbalismCommand;
import com.gmail.nossr50.commands.skills.MiningCommand;
import com.gmail.nossr50.commands.skills.RepairCommand;
import com.gmail.nossr50.commands.skills.SwordsCommand;
import com.gmail.nossr50.commands.skills.TamingCommand;
import com.gmail.nossr50.commands.skills.UnarmedCommand;
import com.gmail.nossr50.commands.skills.WoodcuttingCommand;
import com.gmail.nossr50.commands.spout.MchudCommand;
import com.gmail.nossr50.commands.spout.XplockCommand;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.HiddenConfig;
@ -59,7 +39,6 @@ import com.gmail.nossr50.config.TreasuresConfig;
import com.gmail.nossr50.config.mods.CustomArmorConfig;
import com.gmail.nossr50.config.mods.CustomBlocksConfig;
import com.gmail.nossr50.config.mods.CustomToolsConfig;
import com.gmail.nossr50.config.repair.RepairConfigManager;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.listeners.BlockListener;
import com.gmail.nossr50.listeners.EntityListener;
@ -68,15 +47,36 @@ import com.gmail.nossr50.listeners.PlayerListener;
import com.gmail.nossr50.listeners.WorldListener;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager;
import com.gmail.nossr50.party.commands.ACommand;
import com.gmail.nossr50.party.commands.AcceptCommand;
import com.gmail.nossr50.party.commands.InviteCommand;
import com.gmail.nossr50.party.commands.PCommand;
import com.gmail.nossr50.party.commands.PartyCommand;
import com.gmail.nossr50.party.commands.PtpCommand;
import com.gmail.nossr50.runnables.BleedTimer;
import com.gmail.nossr50.runnables.MobStoreCleaner;
import com.gmail.nossr50.runnables.SaveTimer;
import com.gmail.nossr50.runnables.SkillMonitor;
import com.gmail.nossr50.runnables.SpoutStart;
import com.gmail.nossr50.runnables.UserPurgeTask;
import com.gmail.nossr50.skills.acrobatics.AcrobaticsCommand;
import com.gmail.nossr50.skills.archery.ArcheryCommand;
import com.gmail.nossr50.skills.axes.AxesCommand;
import com.gmail.nossr50.skills.excavation.ExcavationCommand;
import com.gmail.nossr50.skills.fishing.FishingCommand;
import com.gmail.nossr50.skills.herbalism.HerbalismCommand;
import com.gmail.nossr50.skills.mining.MiningCommand;
import com.gmail.nossr50.skills.repair.RepairCommand;
import com.gmail.nossr50.skills.repair.RepairManager;
import com.gmail.nossr50.skills.repair.RepairManagerFactory;
import com.gmail.nossr50.skills.repair.Repairable;
import com.gmail.nossr50.skills.repair.config.RepairConfigManager;
import com.gmail.nossr50.skills.swords.SwordsCommand;
import com.gmail.nossr50.skills.taming.TamingCommand;
import com.gmail.nossr50.skills.unarmed.UnarmedCommand;
import com.gmail.nossr50.skills.woodcutting.WoodcuttingCommand;
import com.gmail.nossr50.spout.SpoutStart;
import com.gmail.nossr50.spout.commands.MchudCommand;
import com.gmail.nossr50.spout.commands.XplockCommand;
import com.gmail.nossr50.util.Anniversary;
import com.gmail.nossr50.util.Database;
import com.gmail.nossr50.util.Leaderboard;

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

@ -1,4 +1,4 @@
package com.gmail.nossr50.commands.party;
package com.gmail.nossr50.party.commands;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;

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

@ -1,4 +1,4 @@
package com.gmail.nossr50.commands.party;
package com.gmail.nossr50.party.commands;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;

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

@ -1,4 +1,4 @@
package com.gmail.nossr50.commands.party;
package com.gmail.nossr50.party.commands;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;

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

@ -1,4 +1,4 @@
package com.gmail.nossr50.commands.party;
package com.gmail.nossr50.party.commands;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;

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

@ -1,4 +1,4 @@
package com.gmail.nossr50.commands.party;
package com.gmail.nossr50.party.commands;
import org.bukkit.ChatColor;
import org.bukkit.Server;

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

@ -1,4 +1,4 @@
package com.gmail.nossr50.commands.party;
package com.gmail.nossr50.party.commands;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;

2
src/main/java/com/gmail/nossr50/runnables/BleedTimer.java
View File

@ -11,7 +11,7 @@ import org.bukkit.entity.Player;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.util.Combat;
import com.gmail.nossr50.skills.Combat;
public class BleedTimer implements Runnable {
private final static int MAX_BLEED_TICKS = 10;

4
src/main/java/com/gmail/nossr50/runnables/GainXp.java
View File

@ -4,8 +4,8 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
public class GainXp implements Runnable {
private Player player = null;

4
src/main/java/com/gmail/nossr50/runnables/GreenThumbTimer.java
View File

@ -5,9 +5,9 @@ import org.bukkit.Material;
import org.bukkit.block.Block;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.AbilityType;
import com.gmail.nossr50.skills.SkillType;
public class GreenThumbTimer implements Runnable {
AdvancedConfig advancedConfig = AdvancedConfig.getInstance();

4
src/main/java/com/gmail/nossr50/runnables/McRankAsync.java
View File

@ -6,10 +6,10 @@ import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.Database;
import com.gmail.nossr50.util.Skills;
public class McRankAsync implements Runnable {
private Database database = mcMMO.getPlayerDatabase();

6
src/main/java/com/gmail/nossr50/runnables/SkillMonitor.java
View File

@ -3,10 +3,10 @@ package com.gmail.nossr50.runnables;
import org.bukkit.entity.Player;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.skills.AbilityType;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.Users;
public class SkillMonitor implements Runnable {

2
src/main/java/com/gmail/nossr50/datatypes/AbilityType.java → src/main/java/com/gmail/nossr50/skills/AbilityType.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.datatypes;
package com.gmail.nossr50.skills;
import org.bukkit.Material;
import org.bukkit.block.Block;

8
src/main/java/com/gmail/nossr50/util/Combat.java → src/main/java/com/gmail/nossr50/skills/Combat.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.util;
package com.gmail.nossr50.skills;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
@ -21,9 +21,7 @@ import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
import com.gmail.nossr50.events.fake.FakeEntityDamageEvent;
import com.gmail.nossr50.locale.LocaleLoader;
@ -37,6 +35,10 @@ import com.gmail.nossr50.skills.swords.Swords;
import com.gmail.nossr50.skills.swords.SwordsManager;
import com.gmail.nossr50.skills.taming.TamingManager;
import com.gmail.nossr50.skills.unarmed.UnarmedManager;
import com.gmail.nossr50.util.ItemChecks;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Users;
public class Combat {
private static Config configInstance = Config.getInstance();

5
src/main/java/com/gmail/nossr50/commands/SkillCommand.java → src/main/java/com/gmail/nossr50/skills/SkillCommand.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.commands;
package com.gmail.nossr50.skills;
import java.text.DecimalFormat;
@ -7,13 +7,12 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Page;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public abstract class SkillCommand implements CommandExecutor {

1
src/main/java/com/gmail/nossr50/skills/SkillManager.java
View File

@ -3,7 +3,6 @@ package com.gmail.nossr50.skills;
import org.bukkit.entity.Player;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Users;

2
src/main/java/com/gmail/nossr50/datatypes/SkillType.java → src/main/java/com/gmail/nossr50/skills/SkillType.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.datatypes;
package com.gmail.nossr50.skills;
import org.bukkit.entity.Player;

11
src/main/java/com/gmail/nossr50/util/Skills.java → src/main/java/com/gmail/nossr50/skills/Skills.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.util;
package com.gmail.nossr50.skills;
import org.bukkit.block.Block;
import org.bukkit.enchantments.Enchantment;
@ -10,14 +10,15 @@ import org.getspout.spoutapi.player.SpoutPlayer;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.ToolType;
import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.spout.SpoutConfig;
import com.gmail.nossr50.spout.SpoutStuff;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.ModChecks;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Users;
public class Skills {
static AdvancedConfig advancedConfig = AdvancedConfig.getInstance();

2
src/main/java/com/gmail/nossr50/datatypes/ToolType.java → src/main/java/com/gmail/nossr50/skills/ToolType.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.datatypes;
package com.gmail.nossr50.skills;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;

7
src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java → src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsCommand.java
View File

@ -1,9 +1,8 @@
package com.gmail.nossr50.commands.skills;
package com.gmail.nossr50.skills.acrobatics;
import com.gmail.nossr50.commands.SkillCommand;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.acrobatics.Acrobatics;
import com.gmail.nossr50.skills.SkillCommand;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Permissions;
public class AcrobaticsCommand extends SkillCommand {

2
src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
View File

@ -4,8 +4,8 @@ import org.bukkit.entity.Player;
import org.bukkit.event.entity.EntityDamageEvent;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.SkillManager;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;

4
src/main/java/com/gmail/nossr50/skills/acrobatics/DodgeEventHandler.java
View File

@ -3,10 +3,10 @@ package com.gmail.nossr50.skills.acrobatics;
import org.bukkit.event.entity.EntityDamageEvent;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Skills;
public class DodgeEventHandler extends AcrobaticsEventHandler {
protected DodgeEventHandler(AcrobaticsManager manager, EntityDamageEvent event) {

4
src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java
View File

@ -2,11 +2,11 @@ package com.gmail.nossr50.skills.acrobatics;
import org.bukkit.event.entity.EntityDamageEvent;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
public class RollEventHandler extends AcrobaticsEventHandler {
protected boolean isGraceful;

7
src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java → src/main/java/com/gmail/nossr50/skills/archery/ArcheryCommand.java
View File

@ -1,9 +1,8 @@
package com.gmail.nossr50.commands.skills;
package com.gmail.nossr50.skills.archery;
import com.gmail.nossr50.commands.SkillCommand;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.archery.Archery;
import com.gmail.nossr50.skills.SkillCommand;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Permissions;
public class ArcheryCommand extends SkillCommand {

2
src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java
View File

@ -4,8 +4,8 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.entity.EntityDamageEvent;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.SkillManager;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;

4
src/main/java/com/gmail/nossr50/skills/axes/AxeManager.java
View File

@ -4,9 +4,9 @@ import org.bukkit.entity.Player;
import org.bukkit.entity.Tameable;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.AbilityType;
import com.gmail.nossr50.skills.SkillManager;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;

7
src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java → src/main/java/com/gmail/nossr50/skills/axes/AxesCommand.java
View File

@ -1,9 +1,8 @@
package com.gmail.nossr50.commands.skills;
package com.gmail.nossr50.skills.axes;
import com.gmail.nossr50.commands.SkillCommand;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.axes.Axes;
import com.gmail.nossr50.skills.SkillCommand;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Permissions;
public class AxesCommand extends SkillCommand {

4
src/main/java/com/gmail/nossr50/skills/axes/SkullSplitterEventHandler.java
View File

@ -4,8 +4,8 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.util.Combat;
import com.gmail.nossr50.skills.Combat;
import com.gmail.nossr50.skills.SkillType;
public class SkullSplitterEventHandler {
private Player player;

6
src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java → src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills.gathering;
package com.gmail.nossr50.skills.excavation;
import java.util.ArrayList;
import java.util.List;
@ -16,14 +16,14 @@ import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.TreasuresConfig;
import com.gmail.nossr50.config.mods.CustomBlocksConfig;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.spout.SpoutSounds;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.ModChecks;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class Excavation {

6
src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java → src/main/java/com/gmail/nossr50/skills/excavation/ExcavationCommand.java
View File

@ -1,8 +1,8 @@
package com.gmail.nossr50.commands.skills;
package com.gmail.nossr50.skills.excavation;
import com.gmail.nossr50.commands.SkillCommand;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillCommand;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Permissions;
public class ExcavationCommand extends SkillCommand {

8
src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java → src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java Executable file → Normal file
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills.gathering;
package com.gmail.nossr50.skills.fishing;
import java.util.ArrayList;
import java.util.List;
@ -25,14 +25,14 @@ import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.TreasuresConfig;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.treasure.FishingTreasure;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.util.Combat;
import com.gmail.nossr50.skills.Combat;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.ItemChecks;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class Fishing {

7
src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java → src/main/java/com/gmail/nossr50/skills/fishing/FishingCommand.java
View File

@ -1,10 +1,9 @@
package com.gmail.nossr50.commands.skills;
package com.gmail.nossr50.skills.fishing;
import com.gmail.nossr50.commands.SkillCommand;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.gathering.Fishing;
import com.gmail.nossr50.skills.SkillCommand;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Permissions;
public class FishingCommand extends SkillCommand {

8
src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java → src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills.gathering;
package com.gmail.nossr50.skills.herbalism;
import org.bukkit.CropState;
import org.bukkit.DyeColor;
@ -15,16 +15,16 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.mods.CustomBlocksConfig;
import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.mods.CustomBlock;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.runnables.GreenThumbTimer;
import com.gmail.nossr50.skills.AbilityType;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.ModChecks;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class Herbalism {

11
src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java → src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismCommand.java
View File

@ -1,16 +1,11 @@
package com.gmail.nossr50.commands.skills;
package com.gmail.nossr50.skills.herbalism;
import com.gmail.nossr50.commands.SkillCommand;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.gathering.Herbalism;
import com.gmail.nossr50.skills.SkillCommand;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Permissions;
public class HerbalismCommand extends SkillCommand {
AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
private String greenTerraLength;
private String greenTerraLengthEndurance;
private String greenThumbChance;

4
src/main/java/com/gmail/nossr50/skills/mining/Mining.java
View File

@ -12,11 +12,11 @@ import org.bukkit.material.MaterialData;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.mods.CustomBlock;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.ModChecks;
import com.gmail.nossr50.util.Skills;
public class Mining {
private static AdvancedConfig advancedConfig = AdvancedConfig.getInstance();

8
src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java → src/main/java/com/gmail/nossr50/skills/mining/MiningCommand.java
View File

@ -1,10 +1,8 @@
package com.gmail.nossr50.commands.skills;
package com.gmail.nossr50.skills.mining;
import com.gmail.nossr50.commands.SkillCommand;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.mining.BlastMining;
import com.gmail.nossr50.skills.mining.Mining;
import com.gmail.nossr50.skills.SkillCommand;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;

2
src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
View File

@ -9,8 +9,8 @@ import org.bukkit.event.entity.ExplosionPrimeEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.SkillManager;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;

4
src/main/java/com/gmail/nossr50/skills/mining/RemoteDetonationEventHandler.java
View File

@ -9,11 +9,11 @@ import org.bukkit.entity.TNTPrimed;
import org.bukkit.event.player.PlayerInteractEvent;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.AbilityType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Skills;
public class RemoteDetonationEventHandler {
private Player player;

2
src/main/java/com/gmail/nossr50/skills/mining/SuperBreakerEventHandler.java
View File

@ -8,10 +8,10 @@ import org.getspout.spoutapi.sound.SoundEffect;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.spout.SpoutSounds;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.ModChecks;
import com.gmail.nossr50.util.Skills;
public class SuperBreakerEventHandler {
private MiningManager manager;

4
src/main/java/com/gmail/nossr50/skills/repair/Repair.java
View File

@ -13,12 +13,12 @@ import org.getspout.spoutapi.player.SpoutPlayer;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.spout.SpoutSounds;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class Repair {

9
src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java → src/main/java/com/gmail/nossr50/skills/repair/RepairCommand.java
View File

@ -1,14 +1,11 @@
package com.gmail.nossr50.commands.skills;
package com.gmail.nossr50.skills.repair;
import org.bukkit.Material;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.commands.SkillCommand;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.repair.Repair;
import com.gmail.nossr50.skills.repair.Repairable;
import com.gmail.nossr50.skills.repair.Salvage;
import com.gmail.nossr50.skills.SkillCommand;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Permissions;
public class RepairCommand extends SkillCommand {

2
src/main/java/com/gmail/nossr50/skills/repair/Salvage.java
View File

@ -11,8 +11,8 @@ import org.getspout.spoutapi.player.SpoutPlayer;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.ItemChecks;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;

2
src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairManager.java
View File

@ -10,9 +10,9 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.events.skills.McMMOPlayerRepairCheckEvent;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Users;

2
src/main/java/com/gmail/nossr50/config/repair/RepairConfig.java → src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfig.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.config.repair;
package com.gmail.nossr50.skills.repair.config;
import java.util.ArrayList;
import java.util.List;

2
src/main/java/com/gmail/nossr50/config/repair/RepairConfigManager.java → src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfigManager.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.config.repair;
package com.gmail.nossr50.skills.repair.config;
import java.io.File;
import java.util.ArrayList;

2
src/main/java/com/gmail/nossr50/skills/swords/CounterAttackEventHandler.java
View File

@ -4,7 +4,7 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.util.Combat;
import com.gmail.nossr50.skills.Combat;
import com.gmail.nossr50.util.ItemChecks;
import com.gmail.nossr50.util.Misc;

4
src/main/java/com/gmail/nossr50/skills/swords/SerratedStrikesEventHandler.java
View File

@ -3,9 +3,9 @@ package com.gmail.nossr50.skills.swords;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.runnables.BleedTimer;
import com.gmail.nossr50.util.Combat;
import com.gmail.nossr50.skills.Combat;
import com.gmail.nossr50.skills.SkillType;
public class SerratedStrikesEventHandler {
private Player player;

7
src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java → src/main/java/com/gmail/nossr50/skills/swords/SwordsCommand.java
View File

@ -1,9 +1,8 @@
package com.gmail.nossr50.commands.skills;
package com.gmail.nossr50.skills.swords;
import com.gmail.nossr50.commands.SkillCommand;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.swords.Swords;
import com.gmail.nossr50.skills.SkillCommand;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Permissions;
public class SwordsCommand extends SkillCommand {

6
src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java
View File

@ -3,10 +3,10 @@ package com.gmail.nossr50.skills.swords;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.AbilityType;
import com.gmail.nossr50.skills.Combat;
import com.gmail.nossr50.skills.SkillManager;
import com.gmail.nossr50.util.Combat;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;

7
src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java → src/main/java/com/gmail/nossr50/skills/taming/TamingCommand.java
View File

@ -1,10 +1,9 @@
package com.gmail.nossr50.commands.skills;
package com.gmail.nossr50.skills.taming;
import com.gmail.nossr50.commands.SkillCommand;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.taming.Taming;
import com.gmail.nossr50.skills.SkillCommand;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Permissions;
public class TamingCommand extends SkillCommand {

2
src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
View File

@ -9,8 +9,8 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.SkillManager;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;

2
src/main/java/com/gmail/nossr50/skills/unarmed/IronGripEventHandler.java
View File

@ -2,8 +2,8 @@ package com.gmail.nossr50.skills.unarmed;
import org.bukkit.entity.Player;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Users;

7
src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java → src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedCommand.java
View File

@ -1,9 +1,8 @@
package com.gmail.nossr50.commands.skills;
package com.gmail.nossr50.skills.unarmed;
import com.gmail.nossr50.commands.SkillCommand;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.unarmed.Unarmed;
import com.gmail.nossr50.skills.SkillCommand;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Permissions;
public class UnarmedCommand extends SkillCommand {

2
src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java
View File

@ -3,8 +3,8 @@ package com.gmail.nossr50.skills.unarmed;
import org.bukkit.entity.Player;
import org.bukkit.event.entity.EntityDamageEvent;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.SkillManager;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;

16
src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java → src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills.gathering;
package com.gmail.nossr50.skills.woodcutting;
import java.util.ArrayList;
import java.util.List;
@ -19,20 +19,20 @@ import org.getspout.spoutapi.sound.SoundEffect;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.mods.CustomBlock;
import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.Combat;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.spout.SpoutSounds;
import com.gmail.nossr50.util.BlockChecks;
import com.gmail.nossr50.util.Combat;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.ModChecks;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class WoodCutting {
public class Woodcutting {
private static final AdvancedConfig ADVANCED_CONFIG = AdvancedConfig.getInstance();
private static boolean treeFellerReachedThreshold = false;
@ -95,7 +95,7 @@ public class WoodCutting {
}
if (block.getType() == Material.LOG) {
WoodCutting.woodCuttingProcCheck(player, block);
Woodcutting.woodCuttingProcCheck(player, block);
TreeSpecies species = ((Tree) block.getState().getData()).getSpecies();
@ -131,7 +131,7 @@ public class WoodCutting {
if (ModChecks.isCustomLogBlock(block)) {
CustomBlock customBlock = ModChecks.getCustomBlock(block);
WoodCutting.woodCuttingProcCheck(player, block);
Woodcutting.woodCuttingProcCheck(player, block);
xp = customBlock.getXpGain();
int minimumDropAmount = customBlock.getMinimumDropAmount();
@ -378,7 +378,7 @@ public class WoodCutting {
}
}
WoodCutting.woodCuttingProcCheck(player, block);
Woodcutting.woodCuttingProcCheck(player, block);
Skills.xpProcessing(player, Users.getProfile(player), SkillType.WOODCUTTING, xp);
}

15
src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java → src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingCommand.java
View File

@ -1,10 +1,9 @@
package com.gmail.nossr50.commands.skills;
package com.gmail.nossr50.skills.woodcutting;
import com.gmail.nossr50.commands.SkillCommand;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.gathering.WoodCutting;
import com.gmail.nossr50.skills.SkillCommand;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.util.Permissions;
public class WoodcuttingCommand extends SkillCommand {
@ -31,7 +30,7 @@ public class WoodcuttingCommand extends SkillCommand {
treeFellerLengthEndurance = treeFellerStrings[1];
//DOUBLE DROPS
String[] doubleDropStrings = calculateAbilityDisplayValues(WoodCutting.doubleDropsMaxLevel, WoodCutting.doubleDropsMaxChance);
String[] doubleDropStrings = calculateAbilityDisplayValues(Woodcutting.doubleDropsMaxLevel, Woodcutting.doubleDropsMaxChance);
doubleDropChance = doubleDropStrings[0];
doubleDropChanceLucky = doubleDropStrings[1];
}
@ -41,7 +40,7 @@ public class WoodcuttingCommand extends SkillCommand {
canTreeFell = Permissions.treeFeller(player);
canDoubleDrop = Permissions.woodcuttingDoubleDrops(player);
canLeafBlow = Permissions.leafBlower(player);
doubleDropsDisabled = WoodCutting.doubleDropsDisabled;
doubleDropsDisabled = Woodcutting.doubleDropsDisabled;
}
@Override
@ -74,8 +73,8 @@ public class WoodcuttingCommand extends SkillCommand {
@Override
protected void statsDisplay() {
if (canLeafBlow) {
if (skillValue < WoodCutting.leafBlowerUnlockLevel) {
player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Woodcutting.Ability.Locked.0", new Object[] { WoodCutting.leafBlowerUnlockLevel }) }));
if (skillValue < Woodcutting.leafBlowerUnlockLevel) {
player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Woodcutting.Ability.Locked.0", new Object[] { Woodcutting.leafBlowerUnlockLevel }) }));
}
else {
player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Woodcutting.Ability.0"), LocaleLoader.getString("Woodcutting.Ability.1") }));

5
src/main/java/com/gmail/nossr50/config/SpoutConfig.java → src/main/java/com/gmail/nossr50/spout/SpoutConfig.java
View File

@ -1,6 +1,7 @@
package com.gmail.nossr50.config;
package com.gmail.nossr50.spout;
import com.gmail.nossr50.datatypes.HudType;
import com.gmail.nossr50.config.ConfigLoader;
import com.gmail.nossr50.spout.huds.HudType;
public class SpoutConfig extends ConfigLoader {
private static SpoutConfig instance;

4
src/main/java/com/gmail/nossr50/runnables/SpoutStart.java → src/main/java/com/gmail/nossr50/spout/SpoutStart.java
View File

@ -1,11 +1,9 @@
package com.gmail.nossr50.runnables;
package com.gmail.nossr50.spout;
import org.getspout.spoutapi.SpoutManager;
import org.getspout.spoutapi.player.FileManager;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.spout.SpoutStuff;
public class SpoutStart implements Runnable{
private final mcMMO plugin;

5
src/main/java/com/gmail/nossr50/spout/SpoutStuff.java
View File

@ -20,13 +20,12 @@ import org.getspout.spoutapi.player.SpoutPlayer;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.listeners.SpoutListener;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class SpoutStuff {

8
src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java → src/main/java/com/gmail/nossr50/spout/commands/MchudCommand.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.commands.spout;
package com.gmail.nossr50.spout.commands;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
@ -7,11 +7,11 @@ import org.bukkit.entity.Player;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.datatypes.HudType;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SpoutHud;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.spout.SpoutConfig;
import com.gmail.nossr50.spout.huds.HudType;
import com.gmail.nossr50.spout.huds.SpoutHud;
import com.gmail.nossr50.util.Users;
public class MchudCommand implements CommandExecutor {

10
src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java → src/main/java/com/gmail/nossr50/spout/commands/XplockCommand.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.commands.spout;
package com.gmail.nossr50.spout.commands;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
@ -8,14 +8,14 @@ import org.bukkit.entity.Player;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.SpoutHud;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.spout.SpoutConfig;
import com.gmail.nossr50.spout.huds.SpoutHud;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class XplockCommand implements CommandExecutor {

2
src/main/java/com/gmail/nossr50/datatypes/HudType.java → src/main/java/com/gmail/nossr50/spout/huds/HudType.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.datatypes;
package com.gmail.nossr50.spout.huds;
public enum HudType {
DISABLED,

7
src/main/java/com/gmail/nossr50/datatypes/SpoutHud.java → src/main/java/com/gmail/nossr50/spout/huds/SpoutHud.java
View File

@ -1,12 +1,15 @@
package com.gmail.nossr50.datatypes;
package com.gmail.nossr50.spout.huds;
import org.bukkit.entity.Player;
import org.getspout.spoutapi.SpoutManager;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.datatypes.McMMOPlayer;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.popups.Menu;
import com.gmail.nossr50.datatypes.popups.XpBar;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.spout.SpoutConfig;
public class SpoutHud {
private Player player;

4
src/main/java/com/gmail/nossr50/util/Database.java
View File

@ -17,10 +17,10 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.DatabaseUpdate;
import com.gmail.nossr50.datatypes.McMMOPlayer;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.SpoutHud;
import com.gmail.nossr50.runnables.SQLReconnect;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.spout.SpoutStuff;
import com.gmail.nossr50.spout.huds.SpoutHud;
public class Database {

2
src/main/java/com/gmail/nossr50/util/Hardcore.java
View File

@ -4,8 +4,8 @@ import org.bukkit.entity.Player;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
public abstract class Hardcore {

1
src/main/java/com/gmail/nossr50/util/Item.java
View File

@ -8,6 +8,7 @@ import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.Skills;
public class Item {

2
src/main/java/com/gmail/nossr50/util/Leaderboard.java
View File

@ -10,7 +10,7 @@ import java.util.List;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.PlayerStat;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.SkillType;
public class Leaderboard {
private static mcMMO plugin = mcMMO.p;

3
src/main/java/com/gmail/nossr50/util/Page.java
View File

@ -4,8 +4,9 @@ import java.util.ArrayList;
import org.bukkit.entity.Player;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
public class Page {

2
src/main/java/com/gmail/nossr50/util/Permissions.java
View File

@ -3,7 +3,7 @@ package com.gmail.nossr50.util;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.SkillType;
public class Permissions {
public static boolean hasPermission(CommandSender sender, String perm)