Acrobatics to SkillCommand

src/main/java/com/gmail/nossr50/commands/SkillCommand.java

@@ -20,17 +20,17 @@ public abstract class SkillCommand implements CommandExecutor{
     private String skillString;
     private String permission;
 
-    private Player player;
+    protected Player player;
     private PlayerProfile profile;
-    private float skillValue;
+    protected float skillValue;
 
-    private DecimalFormat percent = new DecimalFormat("##0.00%");
-    private Permissions permInstance = Permissions.getInstance();
+    protected DecimalFormat percent = new DecimalFormat("##0.00%");
+    protected Permissions permInstance = Permissions.getInstance();
 
-    public SkillCommand(SkillType skill, String permission) {
+    public SkillCommand(SkillType skill) {
         this.skill = skill;
         this.skillString = Misc.getCapitalized(skill.toString());
-        this.permission = permission;
+        this.permission = "mcmmo.skills." + skillString.toLowerCase();
     }
 
     @Override
@@ -81,5 +81,5 @@ public abstract class SkillCommand implements CommandExecutor{
 
     protected abstract boolean statsHeaderPermissions();
 
-    protected abstract boolean statsDisplay();
+    protected abstract void statsDisplay();
 }

src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java

@@ -1,22 +1,10 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
-import org.bukkit.command.Command;
-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.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
 
-public class AcrobaticsCommand implements CommandExecutor {
-    private float skillValue;
+public class AcrobaticsCommand extends SkillCommand {
     private String dodgeChance;
     private String rollChance;
     private String gracefulRollChance;
@@ -25,31 +13,48 @@ public class AcrobaticsCommand implements CommandExecutor {
     private boolean canRoll;
     private boolean canGracefulRoll;
 
+    public AcrobaticsCommand(SkillType skill) {
+        super(skill);
+    }
+
     @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
+    protected void dataCalculations() {
+        if (skillValue >= 1000) {
+            dodgeChance = "20.00%";
+            rollChance = "100.00%";
+            gracefulRollChance = "100.00%";
         }
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.acrobatics")) {
-            return true;
+        else if (skillValue >= 800) {
+            dodgeChance = "20.00%";
+            rollChance = percent.format(skillValue / 1000);
+            gracefulRollChance = "100.00%";
         }
+        else if (skillValue >= 500) {
+            dodgeChance = percent.format(skillValue / 4000);
+            rollChance = percent.format(skillValue / 1000);
+            gracefulRollChance = "100.00%";
+        }
+        else {
+            dodgeChance = percent.format(skillValue / 4000);
+            rollChance = percent.format(skillValue / 1000);
+            gracefulRollChance = percent.format(skillValue / 500);
+        }
+    }
 
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
-
-        skillValue = (float) PP.getSkillLevel(SkillType.ACROBATICS);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
-
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Acrobatics.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Acrobatics") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS) }));
+    @Override
+    protected void permissionsCheck() {
+        canDodge = permInstance.dodge(player);
+        canRoll = permInstance.roll(player);
+        canGracefulRoll = permInstance.gracefulRoll(player);
+    }
 
-        if (canDodge || canGracefulRoll || canRoll) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canDodge || canGracefulRoll || canRoll;
+    }
 
+    @Override
+    protected void effectsDisplay() {
         if (canRoll) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1") }));
         }
@@ -61,11 +66,15 @@ public class AcrobaticsCommand implements CommandExecutor {
         if (canDodge) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.4"), LocaleLoader.getString("Acrobatics.Effect.5") }));
         }
+    }
 
-        if (canDodge || canGracefulRoll || canRoll) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canDodge || canGracefulRoll || canRoll;
+    }
 
+    @Override
+    protected void statsDisplay() {
         if (canRoll) {
             player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance }));
         }
@@ -77,42 +86,5 @@ public class AcrobaticsCommand implements CommandExecutor {
         if (canDodge) {
             player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", new Object[] { dodgeChance }));
         }
-
-        Page.grabGuidePageForSkill(SkillType.ACROBATICS, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        if (skillValue >= 1000) {
-            dodgeChance = "20.00%";
-            rollChance = "100.00%";
-            gracefulRollChance = "100.00%";
-        }
-        else if (skillValue >= 800) {
-            dodgeChance = "20.00%";
-            rollChance = percent.format(skillValue / 1000);
-            gracefulRollChance = "100.00%";
-        }
-        else if (skillValue >= 500) {
-            dodgeChance = percent.format(skillValue / 4000);
-            rollChance = percent.format(skillValue / 1000);
-            gracefulRollChance = "100.00%";
-        }
-        else {
-            dodgeChance = percent.format(skillValue / 4000);
-            rollChance = percent.format(skillValue / 1000);
-            gracefulRollChance = percent.format(skillValue / 500);
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        canDodge = permInstance.dodge(player);
-        canRoll = permInstance.roll(player);
-        canGracefulRoll = permInstance.gracefulRoll(player);
     }
 }

src/main/java/com/gmail/nossr50/mcMMO.java

@@ -1,6 +1,7 @@
 package com.gmail.nossr50;
 
 import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.commands.skills.*;
 import com.gmail.nossr50.commands.spout.*;
 import com.gmail.nossr50.commands.mc.*;
@@ -284,7 +285,7 @@ public class mcMMO extends JavaPlugin {
 
         //Register commands
         //Skills commands
-        getCommand("acrobatics").setExecutor(new AcrobaticsCommand());
+        getCommand("acrobatics").setExecutor(new AcrobaticsCommand(SkillType.ACROBATICS));
         getCommand("archery").setExecutor(new ArcheryCommand());
         getCommand("axes").setExecutor(new AxesCommand());
         getCommand("excavation").setExecutor(new ExcavationCommand());