GJ 13 роки тому
батько
коміт
ec138d5741

+ 42 - 71
src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.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 UnarmedCommand implements CommandExecutor {
-    private float skillValue;
+public class UnarmedCommand extends SkillCommand {
     private String berserkLength;
     private String deflectChance;
     private String disarmChance;
@@ -27,31 +15,45 @@ public class UnarmedCommand implements CommandExecutor {
     private boolean canBonusDamage;
     private boolean canDeflect;
 
+    public UnarmedCommand() {
+        super(SkillType.UNARMED);
+    }
+
     @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+    protected void dataCalculations() {
+        berserkLength = String.valueOf(2 + ((int) skillValue / 50));
 
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.unarmed")) {
-            return true;
+        if (skillValue >= 1000) {
+            disarmChance = "33.33%";
+            deflectChance = "50.00%";
+            ironArmBonus = "8";
         }
+        else if (skillValue >= 250) {
+            disarmChance = percent.format(skillValue / 3000);
+            deflectChance = percent.format(skillValue / 2000);
+            ironArmBonus = "8";
+        }
+        else {
+            disarmChance = percent.format(skillValue / 3000);
+            deflectChance = percent.format(skillValue / 2000);
+            ironArmBonus = String.valueOf(3 + ((int) skillValue / 50));
+        }    }
 
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
-
-        skillValue = (float) PP.getSkillLevel(SkillType.UNARMED);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
-
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Unarmed.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Unarmed") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED) }));
+    @Override
+    protected void permissionsCheck() {
+        canBerserk = permInstance.berserk(player);
+        canBonusDamage = permInstance.unarmedBonus(player);
+        canDeflect = permInstance.deflect(player);
+        canDisarm = permInstance.disarm(player);
+    }
 
-        if (canBerserk || canBonusDamage || canDeflect || canDisarm) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canBerserk || canBonusDamage || canDeflect || canDisarm;
+    }
 
+    @Override
+    protected void effectsDisplay() {
         if (canBerserk) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.0"), LocaleLoader.getString("Unarmed.Effect.1") }));
         }
@@ -67,11 +69,15 @@ public class UnarmedCommand implements CommandExecutor {
         if (canDeflect) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.6"), LocaleLoader.getString("Unarmed.Effect.7") }));
         }
+    }
 
-        if (canBerserk || canBonusDamage || canDeflect || canDisarm) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canBerserk || canBonusDamage || canDeflect || canDisarm;
+    }
 
+    @Override
+    protected void statsDisplay() {
         if (canBonusDamage) {
             player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Unarmed.Ability.Bonus.0"), LocaleLoader.getString("Unarmed.Ability.Bonus.1", new Object[] {ironArmBonus}) }));
         }
@@ -87,40 +93,5 @@ public class UnarmedCommand implements CommandExecutor {
         if (canBerserk) {
             player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", new Object[] { berserkLength }));
         }
-
-        Page.grabGuidePageForSkill(SkillType.UNARMED, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        berserkLength = String.valueOf(2 + ((int) skillValue / 50));
-
-        if (skillValue >= 1000) {
-            disarmChance = "33.33%";
-            deflectChance = "50.00%";
-            ironArmBonus = "8";
-        }
-        else if (skillValue >= 250) {
-            disarmChance = percent.format(skillValue / 3000);
-            deflectChance = percent.format(skillValue / 2000);
-            ironArmBonus = "8";
-        }
-        else {
-            disarmChance = percent.format(skillValue / 3000);
-            deflectChance = percent.format(skillValue / 2000);
-            ironArmBonus = String.valueOf(3 + ((int) skillValue / 50));
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        canBerserk = permInstance.berserk(player);
-        canBonusDamage = permInstance.unarmedBonus(player);
-        canDeflect = permInstance.deflect(player);
-        canDisarm = permInstance.disarm(player);
     }
 }