Rework of Swords handling

src/main/java/com/gmail/nossr50/skills/swords/BleedEventHandler.java

@@ -0,0 +1,49 @@
+package com.gmail.nossr50.skills.swords;
+
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.runnables.BleedTimer;
+import com.gmail.nossr50.util.Misc;
+
+public class BleedEventHandler {
+    private SwordsManager manager;
+    private int skillLevel;
+    private LivingEntity defender;
+
+    protected int skillModifier;
+
+    protected BleedEventHandler(SwordsManager manager, LivingEntity defender) {
+        this.manager = manager;
+        this.skillLevel = manager.getSkillLevel();
+        this.defender = defender;
+
+        calculateSkillModifier();
+    }
+
+    protected void calculateSkillModifier() {
+        this.skillModifier = Misc.skillCheck(skillLevel, Swords.BLEED_MAX_BONUS_LEVEL);
+    }
+
+    protected void addBleedTicks() {
+        int bleedTicks;
+
+        if (skillLevel >= Swords.BLEED_MAX_BONUS_LEVEL) {
+            bleedTicks = Swords.MAX_BLEED_TICKS;
+        }
+        else {
+            bleedTicks = Swords.BASE_BLEED_TICKS;
+        }
+
+        BleedTimer.add(defender, bleedTicks);
+    }
+
+    protected void sendAbilityMessages() {
+        manager.getPlayer().sendMessage(LocaleLoader.getString("Swords.Combat.Bleeding"));
+
+        if (defender instanceof Player) {
+            ((Player) defender).sendMessage(LocaleLoader.getString("Swords.Combat.Bleeding.Started"));
+        }
+    }
+}

src/main/java/com/gmail/nossr50/skills/swords/CounterAttackEventHandler.java

@@ -0,0 +1,45 @@
+package com.gmail.nossr50.skills.swords;
+
+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.util.ItemChecks;
+import com.gmail.nossr50.util.Misc;
+
+public class CounterAttackEventHandler {
+    private SwordsManager manager;
+    private Player player;
+    private LivingEntity attacker;
+    private int damage;
+
+    protected int skillModifier;
+
+    protected CounterAttackEventHandler(SwordsManager manager, LivingEntity attacker, int damage) {
+        this.manager = manager;
+        this.player = manager.getPlayer();
+        this.attacker = attacker;
+        this.damage = damage;
+    }
+
+    protected boolean isHoldingSword() {
+        return ItemChecks.isSword(player.getItemInHand());
+    }
+
+    protected void calculateSkillModifier() {
+        this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Swords.COUNTER_ATTACK_MAX_BONUS_LEVEL);
+    }
+
+    protected void dealDamage() {
+        Combat.dealDamage(attacker, damage / Swords.COUNTER_ATTACK_MODIFIER);
+    }
+
+    protected void sendAbilityMessages() {
+        player.sendMessage(LocaleLoader.getString("Swords.Combat.Countered"));
+
+        if (attacker instanceof Player) {
+            ((Player) attacker).sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Hit"));
+        }
+    }
+}

src/main/java/com/gmail/nossr50/skills/swords/SerratedStrikesEventHandler.java

@@ -0,0 +1,25 @@
+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;
+
+public class SerratedStrikesEventHandler {
+    private Player player;
+    private LivingEntity target;
+    private int damage;
+
+    protected SerratedStrikesEventHandler(SwordsManager manager, LivingEntity target, int damage) {
+        this.player = manager.getPlayer();
+        this.target = target;
+        this.damage = damage;
+    }
+
+    protected void applyAbilityEffects() {
+        Combat.applyAbilityAoE(player, target, damage / Swords.SERRATED_STRIKES_MODIFIER, SkillType.SWORDS);
+        BleedTimer.add(target, Swords.SERRATED_STRIKES_BLEED_TICKS);
+    }
+}

src/main/java/com/gmail/nossr50/skills/swords/Swords.java

@@ -0,0 +1,21 @@
+package com.gmail.nossr50.skills.swords;
+
+import java.util.Random;
+
+public class Swords {
+    public static final int BLEED_MAX_BONUS_LEVEL = 750;
+    public static final int MAX_BLEED_TICKS = 3;
+    public static final int BASE_BLEED_TICKS = 2;
+
+    public static final int COUNTER_ATTACK_MAX_BONUS_LEVEL = 600;
+    public static final int COUNTER_ATTACK_MODIFIER = 2;
+
+    public static final int SERRATED_STRIKES_MODIFIER = 4;
+    public static final int SERRATED_STRIKES_BLEED_TICKS = 5;
+
+    private static Random random = new Random();
+
+    protected static Random getRandom() {
+        return random;
+    }
+}

src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java

@@ -0,0 +1,79 @@
+package com.gmail.nossr50.skills.swords;
+
+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.Combat;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
+
+public class SwordsManager {
+    private Player player;
+    private PlayerProfile profile;
+    private int skillLevel;
+    private Permissions permissionsInstance;
+
+    public SwordsManager (Player player) {
+        this.player = player;
+        this.profile = Users.getProfile(player);
+        this.skillLevel = profile.getSkillLevel(SkillType.SWORDS);
+        this.permissionsInstance =  Permissions.getInstance();
+    }
+
+    /**
+     * Check for Bleed effect.
+     *
+     * @param defender The defending entity
+     */
+    public void bleedCheck(LivingEntity defender) {
+        if (!permissionsInstance.swordsBleed(player)) {
+            return;
+        }
+
+        if (Combat.shouldBeAffected(player, defender)) {
+            BleedEventHandler eventHandler = new BleedEventHandler(this, defender);
+
+            if (Swords.getRandom().nextInt(1000) < eventHandler.skillModifier) {
+                eventHandler.addBleedTicks();
+                eventHandler.sendAbilityMessages();
+            }
+        }
+    }
+
+    public void counterAttackChecks(LivingEntity attacker, int damage) {
+        if (!permissionsInstance.counterAttack(player)) {
+            return;
+        }
+
+        CounterAttackEventHandler eventHandler = new CounterAttackEventHandler(this, attacker, damage);
+
+        if (eventHandler.isHoldingSword()) {
+            eventHandler.calculateSkillModifier();
+
+            if (Swords.getRandom().nextInt(2000) < eventHandler.skillModifier) {
+                eventHandler.dealDamage();
+                eventHandler.sendAbilityMessages();
+            }
+        }
+    }
+
+    public void serratedStrikes(LivingEntity target, int damage) {
+        if (!permissionsInstance.serratedStrikes(player)) {
+            return;
+        }
+
+        SerratedStrikesEventHandler eventHandler = new SerratedStrikesEventHandler(this, target, damage);
+
+        eventHandler.applyAbilityEffects(); 
+    }
+
+    protected int getSkillLevel() {
+        return skillLevel;
+    }
+
+    protected Player getPlayer() {
+        return player;
+    }
+}