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

Skills refactoring

Browse Source
This commit is contained in:
GJ 2012-05-01 13:58:47 -04:00
parent e2265dd6f7
commit edaa51593b
30 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -12,8 +12,8 @@ import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
public class AddlevelsCommand implements CommandExecutor{ public class AddlevelsCommand implements CommandExecutor{

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

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

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

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

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

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

2
src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
View File

@ -11,7 +11,7 @@ import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.Fishing; import com.gmail.nossr50.skills.gathering.Fishing;
import com.gmail.nossr50.util.Page; import com.gmail.nossr50.util.Page;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;

2
src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java
View File

@ -12,7 +12,7 @@ import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.Repair; import com.gmail.nossr50.skills.misc.Repair;
import com.gmail.nossr50.util.Page; import com.gmail.nossr50.util.Page;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;

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

@ -11,10 +11,10 @@ import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.spout.SpoutStuff; import com.gmail.nossr50.spout.SpoutStuff;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
public class XplockCommand implements CommandExecutor { public class XplockCommand implements CommandExecutor {

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

@ -8,16 +8,16 @@ import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.ToolType; import com.gmail.nossr50.datatypes.ToolType;
import com.gmail.nossr50.skills.Excavation; import com.gmail.nossr50.skills.gathering.Excavation;
import com.gmail.nossr50.skills.Herbalism; import com.gmail.nossr50.skills.gathering.Herbalism;
import com.gmail.nossr50.skills.Mining; import com.gmail.nossr50.skills.gathering.Mining;
import com.gmail.nossr50.skills.Repair; import com.gmail.nossr50.skills.gathering.WoodCutting;
import com.gmail.nossr50.skills.Skills; import com.gmail.nossr50.skills.misc.Repair;
import com.gmail.nossr50.skills.WoodCutting;
import com.gmail.nossr50.spout.SpoutSounds; import com.gmail.nossr50.spout.SpoutSounds;
import com.gmail.nossr50.util.BlockChecks; import com.gmail.nossr50.util.BlockChecks;
import com.gmail.nossr50.util.ItemChecks; import com.gmail.nossr50.util.ItemChecks;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
import com.gmail.nossr50.events.fake.FakeBlockBreakEvent; import com.gmail.nossr50.events.fake.FakeBlockBreakEvent;
import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent; import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;

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

@ -30,14 +30,14 @@ import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
import com.gmail.nossr50.events.fake.FakeEntityDamageEvent; import com.gmail.nossr50.events.fake.FakeEntityDamageEvent;
import com.gmail.nossr50.party.Party; import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.runnables.BleedTimer; import com.gmail.nossr50.runnables.BleedTimer;
import com.gmail.nossr50.skills.Acrobatics; import com.gmail.nossr50.skills.combat.Archery;
import com.gmail.nossr50.skills.Archery; import com.gmail.nossr50.skills.combat.Taming;
import com.gmail.nossr50.skills.BlastMining; import com.gmail.nossr50.skills.gathering.BlastMining;
import com.gmail.nossr50.skills.Skills; import com.gmail.nossr50.skills.misc.Acrobatics;
import com.gmail.nossr50.skills.Taming;
import com.gmail.nossr50.util.Combat; import com.gmail.nossr50.util.Combat;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
public class EntityListener implements Listener { public class EntityListener implements Listener {

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

@ -37,16 +37,16 @@ import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
import com.gmail.nossr50.events.chat.McMMOPartyChatEvent; import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.Party; import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.skills.BlastMining; import com.gmail.nossr50.skills.combat.Taming;
import com.gmail.nossr50.skills.Fishing; import com.gmail.nossr50.skills.gathering.BlastMining;
import com.gmail.nossr50.skills.Herbalism; import com.gmail.nossr50.skills.gathering.Fishing;
import com.gmail.nossr50.skills.Repair; import com.gmail.nossr50.skills.gathering.Herbalism;
import com.gmail.nossr50.skills.Skills; import com.gmail.nossr50.skills.misc.Repair;
import com.gmail.nossr50.skills.Taming;
import com.gmail.nossr50.util.BlockChecks; import com.gmail.nossr50.util.BlockChecks;
import com.gmail.nossr50.util.Item; import com.gmail.nossr50.util.Item;
import com.gmail.nossr50.util.ItemChecks; import com.gmail.nossr50.util.ItemChecks;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
public class PlayerListener implements Listener { public class PlayerListener implements Listener {

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

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

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

@ -6,7 +6,7 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.AbilityType; import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.skills.Skills; import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
public class SkillMonitor implements Runnable { public class SkillMonitor implements Runnable {

2
src/main/java/com/gmail/nossr50/skills/Archery.java → src/main/java/com/gmail/nossr50/skills/combat/Archery.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills; package com.gmail.nossr50.skills.combat;
import java.util.Random; import java.util.Random;

2
src/main/java/com/gmail/nossr50/skills/Axes.java → src/main/java/com/gmail/nossr50/skills/combat/Axes.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills; package com.gmail.nossr50.skills.combat;
import java.util.Random; import java.util.Random;

2
src/main/java/com/gmail/nossr50/skills/Swords.java → src/main/java/com/gmail/nossr50/skills/combat/Swords.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills; package com.gmail.nossr50.skills.combat;
import java.util.Random; import java.util.Random;

2
src/main/java/com/gmail/nossr50/skills/Taming.java → src/main/java/com/gmail/nossr50/skills/combat/Taming.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills; package com.gmail.nossr50.skills.combat;
import java.util.Random; import java.util.Random;

2
src/main/java/com/gmail/nossr50/skills/Unarmed.java → src/main/java/com/gmail/nossr50/skills/combat/Unarmed.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills; package com.gmail.nossr50.skills.combat;
import java.util.Random; import java.util.Random;

3
src/main/java/com/gmail/nossr50/skills/BlastMining.java → src/main/java/com/gmail/nossr50/skills/gathering/BlastMining.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills; package com.gmail.nossr50.skills.gathering;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
@ -23,6 +23,7 @@ import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.util.BlockChecks; import com.gmail.nossr50.util.BlockChecks;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
public class BlastMining { public class BlastMining {

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

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills; package com.gmail.nossr50.skills.gathering;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -13,6 +13,7 @@ import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.spout.SpoutSounds; import com.gmail.nossr50.spout.SpoutSounds;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.Config;

3
src/main/java/com/gmail/nossr50/skills/Fishing.java → src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills; package com.gmail.nossr50.skills.gathering;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -27,6 +27,7 @@ import com.gmail.nossr50.util.Combat;
import com.gmail.nossr50.util.ItemChecks; import com.gmail.nossr50.util.ItemChecks;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
public class Fishing { public class Fishing {

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

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills; package com.gmail.nossr50.skills.gathering;
import java.util.Random; import java.util.Random;
@ -20,6 +20,7 @@ import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.runnables.GreenThumbTimer; import com.gmail.nossr50.runnables.GreenThumbTimer;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
public class Herbalism { public class Herbalism {

3
src/main/java/com/gmail/nossr50/skills/Mining.java → src/main/java/com/gmail/nossr50/skills/gathering/Mining.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills; package com.gmail.nossr50.skills.gathering;
import java.util.Random; import java.util.Random;
@ -16,6 +16,7 @@ import com.gmail.nossr50.spout.SpoutSounds;
import com.gmail.nossr50.util.BlockChecks; import com.gmail.nossr50.util.BlockChecks;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;

3
src/main/java/com/gmail/nossr50/skills/WoodCutting.java → src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills; package com.gmail.nossr50.skills.gathering;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Random; import java.util.Random;
@ -23,6 +23,7 @@ import com.gmail.nossr50.util.BlockChecks;
import com.gmail.nossr50.util.Combat; import com.gmail.nossr50.util.Combat;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
import org.getspout.spoutapi.sound.SoundEffect; import org.getspout.spoutapi.sound.SoundEffect;

3
src/main/java/com/gmail/nossr50/skills/Acrobatics.java → src/main/java/com/gmail/nossr50/skills/misc/Acrobatics.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills; package com.gmail.nossr50.skills.misc;
import java.util.Random; import java.util.Random;
@ -12,6 +12,7 @@ import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.Party; import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
public class Acrobatics { public class Acrobatics {

3
src/main/java/com/gmail/nossr50/skills/Repair.java → src/main/java/com/gmail/nossr50/skills/misc/Repair.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills; package com.gmail.nossr50.skills.misc;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
@ -20,6 +20,7 @@ import com.gmail.nossr50.spout.SpoutSounds;
import com.gmail.nossr50.util.ItemChecks; import com.gmail.nossr50.util.ItemChecks;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.datatypes.SkillType;

13
src/main/java/com/gmail/nossr50/util/Combat.java
View File

@ -27,13 +27,12 @@ import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.Party; import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.runnables.GainXp; import com.gmail.nossr50.runnables.GainXp;
import com.gmail.nossr50.runnables.BleedTimer; import com.gmail.nossr50.runnables.BleedTimer;
import com.gmail.nossr50.skills.Acrobatics; import com.gmail.nossr50.skills.combat.Archery;
import com.gmail.nossr50.skills.Archery; import com.gmail.nossr50.skills.combat.Axes;
import com.gmail.nossr50.skills.Axes; import com.gmail.nossr50.skills.combat.Swords;
import com.gmail.nossr50.skills.Skills; import com.gmail.nossr50.skills.combat.Taming;
import com.gmail.nossr50.skills.Swords; import com.gmail.nossr50.skills.combat.Unarmed;
import com.gmail.nossr50.skills.Taming; import com.gmail.nossr50.skills.misc.Acrobatics;
import com.gmail.nossr50.skills.Unarmed;
public class Combat { public class Combat {

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

@ -7,7 +7,6 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;

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

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills; package com.gmail.nossr50.util;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -12,10 +12,6 @@ import org.getspout.spoutapi.player.SpoutPlayer;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.spout.SpoutStuff; import com.gmail.nossr50.spout.SpoutStuff;
import com.gmail.nossr50.util.Leaderboard;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Users;
import com.gmail.nossr50.datatypes.AbilityType; import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.PlayerStat; import com.gmail.nossr50.datatypes.PlayerStat;