Merge pull request electronicboy#4 from broccolai/master

Add Xprate per skill placeholder

Author: electronicboy

README.md

@@ -21,6 +21,7 @@ Development builds are here: https://atlas.valaria.pw/jenkins/view/Plugins/job/m
 | mcmmo_party_size                   | The size of the party                            |
 | mcmmo_is_xp_event_active           | is the xp bonus event active                     |
 | mcmmo_xprate                       | The current bonus XP rate                        |
+| mcmmo_xprate_\<skillname>          | The current bonus XP rate for the skill          |
 | mcmmo_xp_\<skillname>              | current xp for skill                             |
 | mcmmo_xp_needed_\<skillname>       | total XP required for needed for next rank       |
 | mcmmo_xp_remaining_\<skillname>    | XP remaining for player to read the next level   |

build.gradle

@@ -2,7 +2,7 @@
 allprojects {
 
     group = 'pw.valaria'
-    version = '1.0.1-SNAPSHOT'
+    version = '1.0.2-SNAPSHOT'
 }
 
 subprojects {

mcmmo-placeholders-bridge-2-1/src/main/java/pw/valaria/placeholders/mcmmo/bridge/v2_1/McmmoBridge21.java

@@ -7,6 +7,7 @@
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
 
 import org.bukkit.entity.Player;
@@ -137,6 +138,32 @@ public String getXpRate(Player player) {
         return String.valueOf(ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier());
     }
 
+    @Override
+    public String getSkillXpRate(ISkillType skillType, Player player) {
+        final McMMOPlayer user = UserManager.getPlayer(player);
+        if (user == null) return null;
+
+        PrimarySkillType skill = (PrimarySkillType) skillType.getNativeSkill();
+        double modifier = 1.0F;
+
+        if (Permissions.customXpBoost(player, skill))
+            modifier = ExperienceConfig.getInstance().getCustomXpPerkBoost();
+        else if (Permissions.quadrupleXp(player, skill))
+            modifier = 4;
+        else if (Permissions.tripleXp(player, skill))
+            modifier = 3;
+        else if (Permissions.doubleAndOneHalfXp(player, skill))
+            modifier = 2.5;
+        else if (Permissions.doubleXp(player, skill))
+            modifier = 2;
+        else if (Permissions.oneAndOneHalfXp(player, skill))
+            modifier = 1.5;
+        else if (Permissions.oneAndOneTenthXp(player, skill))
+            modifier = 1.1;
+
+        return String.valueOf(modifier);
+    }
+
     @Override
     public String isExpEventActive(Player player) {
         return mcMMO.p.isXPEventEnabled() ? PlaceholderAPIPlugin.booleanTrue() : PlaceholderAPIPlugin.booleanFalse();

mcmmo-placeholders-bridge-classic/src/main/java/pw/valaria/placeholders/mcmmo/bridge/classic/McmmoBridgeClassic.java

@@ -6,6 +6,7 @@
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
 
 import org.bukkit.Bukkit;
@@ -145,6 +146,32 @@ public String getXpRate(Player player) {
         return String.valueOf(ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier());
     }
 
+    @Override
+    public String getSkillXpRate(ISkillType skillType, Player player) {
+        final McMMOPlayer user = UserManager.getPlayer(player);
+        if (user == null) return null;
+
+        com.gmail.nossr50.datatypes.skills.SkillType skill = (com.gmail.nossr50.datatypes.skills.SkillType) skillType.getNativeSkill();
+        double modifier = 1.0F;
+
+        if (Permissions.customXpBoost(player, skill))
+            modifier = ExperienceConfig.getInstance().getCustomXpPerkBoost();
+        else if (Permissions.quadrupleXp(player, skill))
+            modifier = 4;
+        else if (Permissions.tripleXp(player, skill))
+            modifier = 3;
+        else if (Permissions.doubleAndOneHalfXp(player, skill))
+            modifier = 2.5;
+        else if (Permissions.doubleXp(player, skill))
+            modifier = 2;
+        else if (Permissions.oneAndOneHalfXp(player, skill))
+            modifier = 1.5;
+        else if (Permissions.oneAndOneTenthXp(player, skill))
+            modifier = 1.1;
+
+        return String.valueOf(modifier);
+    }
+
     @Override
     public String isExpEventActive(Player player) {
         return mcMMO.p.isXPEventEnabled() ? PlaceholderAPIPlugin.booleanTrue() : PlaceholderAPIPlugin.booleanFalse();

mcmmo-placeholders-bridge/src/main/java/pw/valaria/placeholders/mcmmo/bridge/McmmoBridge.java

@@ -19,6 +19,7 @@
 import pw.valaria.placeholders.mcmmo.bridge.placeholders.SkillRankPlaceholder;
 import pw.valaria.placeholders.mcmmo.bridge.placeholders.XpEventActivePlaceholder;
 import pw.valaria.placeholders.mcmmo.bridge.placeholders.XpRatePlaceholder;
+import pw.valaria.placeholders.mcmmo.bridge.placeholders.SkillXpRatePlaceholder;
 
 public abstract class McmmoBridge<S extends ISkillType> {
     McMMOPlaceholderExpansion expansion;
@@ -51,6 +52,9 @@ protected void postInit() {
 
             //%mcmmo_rank_<skillname>%
             getExpansion().registerPlaceholder(new SkillRankPlaceholder(this, skill));
+
+            //%mcmmo_xprate_<skillname>%
+            getExpansion().registerPlaceholder(new SkillXpRatePlaceholder(this, skill));
         });
 
 
@@ -111,5 +115,7 @@ public McMMOPlaceholderExpansion getExpansion() {
 
     public abstract String getXpRate(Player player);
 
+    public abstract String getSkillXpRate(ISkillType skill, Player player);
+
     public abstract String isExpEventActive(Player player);
 }

mcmmo-placeholders-bridge/src/main/java/pw/valaria/placeholders/mcmmo/bridge/placeholders/SkillXpRatePlaceholder.java

@@ -0,0 +1,26 @@
+package pw.valaria.placeholders.mcmmo.bridge.placeholders;
+
+import org.bukkit.entity.Player;
+import pw.valaria.placeholders.mcmmo.bridge.McmmoBridge;
+import pw.valaria.placeholders.mcmmo.bridge.data.ISkillType;
+
+public class SkillXpRatePlaceholder implements Placeholder {
+    private McmmoBridge bridge;
+    private ISkillType skillType;
+
+    public SkillXpRatePlaceholder(McmmoBridge bridge, ISkillType skillType) {
+        this.bridge = bridge;
+        this.skillType = skillType;
+    }
+
+    @Override
+    public String process(Player p, String params) {
+        final String skillLevel = bridge.getSkillXpRate(skillType, p);
+        return (skillLevel == null) ? "" : skillLevel;
+    }
+
+    @Override
+    public String getName() {
+        return "xprate_" + skillType;
+    }
+}