diff --git a/build.gradle b/build.gradle index efc04d6..2e1fff3 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ dependencies { implementation('com.github.mcMMO-Dev:mcMMO:601297') { exclude group: 'com.sk89q.worldguard' } - implementation 'com.github.Ben12345rocks:VotingPlugin:5.21.1' + implementation 'com.github.BenCodez:VotingPlugin:6.0' implementation 'com.github.LlmDl:Towny:25fc18a' } diff --git a/src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginPointsDeductibleRequirement.java b/src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginPointsDeductibleRequirement.java index 721cf1d..880020e 100644 --- a/src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginPointsDeductibleRequirement.java +++ b/src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginPointsDeductibleRequirement.java @@ -1,32 +1,32 @@ -package sh.okx.rankup.requirements.requirement.votingplugin; - -import com.Ben12345rocks.VotingPlugin.Objects.User; -import com.Ben12345rocks.VotingPlugin.UserManager.UserManager; -import org.bukkit.entity.Player; -import sh.okx.rankup.RankupPlugin; -import sh.okx.rankup.requirements.DeductibleRequirement; -import sh.okx.rankup.requirements.Requirement; - -public class VotingPluginPointsDeductibleRequirement extends VotingPluginPointsRequirement implements DeductibleRequirement { - - public VotingPluginPointsDeductibleRequirement(RankupPlugin plugin, String name) { - super(plugin, name); - } - - protected VotingPluginPointsDeductibleRequirement(Requirement clone) { - super(clone); - } - - @Override - public void apply(Player player, double multiplier) { - User user = UserManager.getInstance().getVotingPluginUser(player); - if(!user.removePoints(getValueInt())) { - plugin.getLogger().warning("Unable to remove VotingPlugin points"); - } - } - - @Override - public Requirement clone() { - return new VotingPluginPointsDeductibleRequirement(this); - } -} +package sh.okx.rankup.requirements.requirement.votingplugin; + +import com.bencodez.votingplugin.user.UserManager; +import com.bencodez.votingplugin.user.VotingPluginUser; +import org.bukkit.entity.Player; +import sh.okx.rankup.RankupPlugin; +import sh.okx.rankup.requirements.DeductibleRequirement; +import sh.okx.rankup.requirements.Requirement; + +public class VotingPluginPointsDeductibleRequirement extends VotingPluginPointsRequirement implements DeductibleRequirement { + + public VotingPluginPointsDeductibleRequirement(RankupPlugin plugin, String name) { + super(plugin, name); + } + + protected VotingPluginPointsDeductibleRequirement(Requirement clone) { + super(clone); + } + + @Override + public void apply(Player player, double multiplier) { + VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player); + if(!user.removePoints(getValueInt())) { + plugin.getLogger().warning("Unable to remove VotingPlugin points"); + } + } + + @Override + public Requirement clone() { + return new VotingPluginPointsDeductibleRequirement(this); + } +} diff --git a/src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginPointsRequirement.java b/src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginPointsRequirement.java index 6ffb45f..67c1c52 100644 --- a/src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginPointsRequirement.java +++ b/src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginPointsRequirement.java @@ -1,28 +1,28 @@ -package sh.okx.rankup.requirements.requirement.votingplugin; - -import com.Ben12345rocks.VotingPlugin.UserManager.UserManager; -import org.bukkit.entity.Player; -import sh.okx.rankup.RankupPlugin; -import sh.okx.rankup.requirements.ProgressiveRequirement; -import sh.okx.rankup.requirements.Requirement; - -public class VotingPluginPointsRequirement extends ProgressiveRequirement { - - public VotingPluginPointsRequirement(RankupPlugin plugin, String name) { - super(plugin, name); - } - - protected VotingPluginPointsRequirement(Requirement clone) { - super(clone); - } - - @Override - public double getProgress(Player player) { - return UserManager.getInstance().getVotingPluginUser(player).getPoints(); - } - - @Override - public Requirement clone() { - return new VotingPluginPointsRequirement(this); - } -} +package sh.okx.rankup.requirements.requirement.votingplugin; + +import com.bencodez.votingplugin.user.UserManager; +import org.bukkit.entity.Player; +import sh.okx.rankup.RankupPlugin; +import sh.okx.rankup.requirements.ProgressiveRequirement; +import sh.okx.rankup.requirements.Requirement; + +public class VotingPluginPointsRequirement extends ProgressiveRequirement { + + public VotingPluginPointsRequirement(RankupPlugin plugin, String name) { + super(plugin, name); + } + + protected VotingPluginPointsRequirement(Requirement clone) { + super(clone); + } + + @Override + public double getProgress(Player player) { + return UserManager.getInstance().getVotingPluginUser(player).getPoints(); + } + + @Override + public Requirement clone() { + return new VotingPluginPointsRequirement(this); + } +} 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 index 1684fe6..be691f0 100644 --- a/src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginVotesRequirement.java +++ b/src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginVotesRequirement.java @@ -1,28 +1,28 @@ -package sh.okx.rankup.requirements.requirement.votingplugin; - -import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter; -import com.Ben12345rocks.VotingPlugin.UserManager.UserManager; -import org.bukkit.entity.Player; -import sh.okx.rankup.RankupPlugin; -import sh.okx.rankup.requirements.Requirement; -import sh.okx.rankup.requirements.ProgressiveRequirement; - -public class VotingPluginVotesRequirement extends ProgressiveRequirement { - public VotingPluginVotesRequirement(RankupPlugin plugin) { - super(plugin, "votingplugin-votes"); - } - - protected VotingPluginVotesRequirement(Requirement clone) { - super(clone); - } - - @Override - public double getProgress(Player player) { - return UserManager.getInstance().getVotingPluginUser(player).getTotal(TopVoter.AllTime); - } - - @Override - public Requirement clone() { - return new VotingPluginVotesRequirement(this); - } -} +package sh.okx.rankup.requirements.requirement.votingplugin; + +import com.bencodez.votingplugin.topvoter.TopVoter; +import com.bencodez.votingplugin.user.UserManager; +import org.bukkit.entity.Player; +import sh.okx.rankup.RankupPlugin; +import sh.okx.rankup.requirements.ProgressiveRequirement; +import sh.okx.rankup.requirements.Requirement; + +public class VotingPluginVotesRequirement extends ProgressiveRequirement { + public VotingPluginVotesRequirement(RankupPlugin plugin) { + super(plugin, "votingplugin-votes"); + } + + protected VotingPluginVotesRequirement(Requirement clone) { + super(clone); + } + + @Override + public double getProgress(Player player) { + return UserManager.getInstance().getVotingPluginUser(player).getTotal(TopVoter.AllTime); + } + + @Override + public Requirement clone() { + return new VotingPluginVotesRequirement(this); + } +}