3.5-beta.5

Update gradle wrapper
Fix current_prestige and next_prestige placeholders

src/main/java/sh/okx/rankup/requirements/DeductibleRequirement.java

@@ -19,6 +19,11 @@ public abstract class DeductibleRequirement extends ProgressiveRequirement {
    * and has returned true immediately prior to this.
    *
    * @param player the player to take from
+   * @param multiplier The multiplier for the value
    */
-  public abstract void apply(Player player);
+  public abstract void apply(Player player, double multiplier);
+
+  public final void apply(Player player) {
+    apply(player, 1);
+  }
 }

src/main/java/sh/okx/rankup/requirements/ProgressiveRequirement.java

@@ -9,6 +9,10 @@ public abstract class ProgressiveRequirement extends Requirement {
     super(plugin, name);
   }
 
+  public ProgressiveRequirement(Rankup plugin, String name, boolean subRequirement) {
+    super(plugin, name, subRequirement);
+  }
+
   protected ProgressiveRequirement(Requirement clone) {
     super(clone);
   }
@@ -19,8 +23,12 @@ public abstract class ProgressiveRequirement extends Requirement {
   }
 
   @Override
-  public double getRemaining(Player player) {
-    return Math.max(0, getValueDouble() - getProgress(player));
+  public final double getRemaining(Player player) {
+    return getRemaining(player, 1);
+  }
+
+  public double getRemaining(Player player, double multiplier) {
+    return Math.max(0, (multiplier * getValueDouble()) - getProgress(player));
   }
 
   public abstract double getProgress(Player player);

src/main/java/sh/okx/rankup/requirements/Requirement.java

@@ -12,10 +12,16 @@ public abstract class Requirement implements Cloneable {
   private String value;
   @Getter
   private String sub;
+  private boolean subRequirement;
 
   public Requirement(Rankup plugin, String name) {
+    this(plugin, name, false);
+  }
+
+  public Requirement(Rankup plugin, String name, boolean subRequirement) {
     this.plugin = plugin;
     this.name = name;
+    this.subRequirement = subRequirement;
   }
 
   protected Requirement(Requirement clone) {
@@ -71,8 +77,8 @@ public abstract class Requirement implements Cloneable {
     return check(player) ? 0 : 1;
   }
 
-  public boolean hasSubRequirement() {
-    return false;
+  public final boolean hasSubRequirement() {
+    return subRequirement;
   }
 
   public abstract Requirement clone();

src/main/java/sh/okx/rankup/requirements/requirement/BlockBreakRequirement.java

@@ -9,7 +9,7 @@ import sh.okx.rankup.requirements.Requirement;
 
 public class BlockBreakRequirement extends ProgressiveRequirement {
   public BlockBreakRequirement(Rankup plugin) {
-    super(plugin, "block-break");
+    super(plugin, "block-break", true);
   }
 
   @Override
@@ -30,9 +30,4 @@ public class BlockBreakRequirement extends ProgressiveRequirement {
   public Requirement clone() {
     return new BlockBreakRequirement(this);
   }
-
-  @Override
-  public boolean hasSubRequirement() {
-    return true;
-  }
 }

src/main/java/sh/okx/rankup/requirements/requirement/MobKillsRequirement.java

@@ -9,7 +9,7 @@ import sh.okx.rankup.requirements.Requirement;
 
 public class MobKillsRequirement extends ProgressiveRequirement {
   public MobKillsRequirement(Rankup plugin) {
-    super(plugin, "mob-kills");
+    super(plugin, "mob-kills", true);
   }
 
   protected MobKillsRequirement(Requirement clone) {
@@ -25,9 +25,4 @@ public class MobKillsRequirement extends ProgressiveRequirement {
   public Requirement clone() {
     return new MobKillsRequirement(this);
   }
-
-  @Override
-  public boolean hasSubRequirement() {
-    return true;
-  }
 }

src/main/java/sh/okx/rankup/requirements/requirement/MoneyRequirement.java

@@ -16,9 +16,9 @@ public class MoneyRequirement extends DeductibleRequirement {
   }
 
   @Override
-  public void apply(Player player) {
+  public void apply(Player player, double multiplier) {
     Economy economy = plugin.getEconomy();
-    economy.withdrawPlayer(player, getValueDouble());
+    economy.withdrawPlayer(player, getValueDouble() * multiplier);
   }
 
   @Override

src/main/java/sh/okx/rankup/requirements/requirement/WorldRequirement.java

@@ -15,7 +15,11 @@ public class WorldRequirement extends Requirement {
 
   @Override
   public boolean check(Player player) {
-    return player.getWorld().getName().equalsIgnoreCase(getValueString());
+    String[] worlds = getValuesString();
+    for (String world : worlds) {
+      return player.getWorld().getName().equalsIgnoreCase(world);
+    }
+    return false;
   }
 
   @Override

src/main/java/sh/okx/rankup/requirements/requirement/XpLevelRequirement.java

@@ -15,8 +15,8 @@ public class XpLevelRequirement extends DeductibleRequirement {
   }
 
   @Override
-  public void apply(Player player) {
-    player.setLevel(player.getLevel() - getValueInt());
+  public void apply(Player player, double multiplier) {
+    player.setLevel(player.getLevel() - (int) Math.round(getValueInt() * multiplier));
   }
 
   @Override

src/main/java/sh/okx/rankup/requirements/requirement/mcmmo/McMMOSkillRequirement.java

@@ -7,7 +7,7 @@ import sh.okx.rankup.requirements.ProgressiveRequirement;
 
 public class McMMOSkillRequirement extends ProgressiveRequirement {
   public McMMOSkillRequirement(Rankup plugin) {
-    super(plugin, "mcmmo");
+    super(plugin, "mcmmo", true);
   }
 
   protected McMMOSkillRequirement(McMMOSkillRequirement clone) {
@@ -19,11 +19,6 @@ public class McMMOSkillRequirement extends ProgressiveRequirement {
     return McMMOSkillUtil.getInstance().getSkillLevel(player, getValueString());
   }
 
-  @Override
-  public boolean hasSubRequirement() {
-    return true;
-  }
-
   @Override
   public Requirement clone() {
     return new McMMOSkillRequirement(this);