diff --git a/src/main/java/sh/okx/rankup/RankList.java b/src/main/java/sh/okx/rankup/RankList.java index 3574e50..19811e4 100644 --- a/src/main/java/sh/okx/rankup/RankList.java +++ b/src/main/java/sh/okx/rankup/RankList.java @@ -56,17 +56,13 @@ public class RankList { public T getByName(String name) { if (name == null) { - System.out.println("n"); return null; } for (T rank : ranks) { - System.out.println(name + " <> " + rank.getNext()); if (name.equalsIgnoreCase(rank.getRank())) { - System.out.println("y"); return rank; } } - System.out.println("l"); return null; } diff --git a/src/main/java/sh/okx/rankup/Rankup.java b/src/main/java/sh/okx/rankup/Rankup.java index 3f43acf..8b365e7 100644 --- a/src/main/java/sh/okx/rankup/Rankup.java +++ b/src/main/java/sh/okx/rankup/Rankup.java @@ -38,6 +38,7 @@ import sh.okx.rankup.requirements.requirement.advancedachievements.AdvancedAchie import sh.okx.rankup.requirements.requirement.mcmmo.McMMOPowerLevelRequirement; import sh.okx.rankup.requirements.requirement.mcmmo.McMMOSkillRequirement; import sh.okx.rankup.requirements.requirement.mcmmo.McMMOSkillUtil; +import sh.okx.rankup.requirements.requirement.votingplugin.VotingPluginVotesRequirement; import java.io.File; import java.text.DecimalFormat; @@ -229,6 +230,9 @@ public class Rankup extends JavaPlugin { requirementRegistry.addRequirement(new AdvancedAchievementsAchievementRequirement(this)); requirementRegistry.addRequirement(new AdvancedAchievementsTotalRequirement(this)); } + if (Bukkit.getPluginManager().isPluginEnabled("VotingPlugin")) { + requirementRegistry.addRequirement(new VotingPluginVotesRequirement(this)); + } } private void setupPermissions() { @@ -405,7 +409,6 @@ public class Rankup extends JavaPlugin { public boolean checkPrestige(Player player, boolean message) { Prestige prestige = prestiges.getByPlayer(player); - System.out.println(prestige.getNext() + " .."); if (!prestige.isIn(player)) { // check if in ladder getMessage(Message.NOT_HIGH_ENOUGH) .failIf(!message) diff --git a/src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginVotesRequirement.java b/src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginVotesRequirement.java new file mode 100644 index 0000000..29e8537 --- /dev/null +++ b/src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginVotesRequirement.java @@ -0,0 +1,31 @@ +package sh.okx.rankup.requirements.requirement.votingplugin; + +import com.Ben12345rocks.VotingPlugin.UserManager.UserManager; +import org.bukkit.entity.Player; +import sh.okx.rankup.Rankup; +import sh.okx.rankup.requirements.Requirement; + +public class VotingPluginVotesRequirement extends Requirement { + public VotingPluginVotesRequirement(Rankup plugin) { + super(plugin, "votingplugin-votes"); + } + + protected VotingPluginVotesRequirement(VotingPluginVotesRequirement clone) { + super(clone); + } + + @Override + public boolean check(Player player) { + return getRemaining(player) < 1; + } + + @Override + public double getRemaining(Player player) { + return Math.max(0, getValueDouble() - UserManager.getInstance().getVotingPluginUser(player).getPoints()); + } + + @Override + public Requirement clone() { + return new VotingPluginVotesRequirement(this); + } +}