Skip to content

Commit 8bf5029

Browse files
okx-codeokx-code
committed
3.14.1
1 parent 2a88bb5 commit 8bf5029

File tree

8 files changed

+55
-51
lines changed

8 files changed

+55
-51
lines changed

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pitest {
1414
}
1515

1616
group 'sh.okx'
17-
version '3.14'
17+
version '3.14.1'
1818

1919
java {
2020
sourceCompatibility = JavaVersion.VERSION_1_8
@@ -46,7 +46,7 @@ dependencies {
4646
implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'
4747

4848
compileOnly 'org.jetbrains:annotations:22.0.0'
49-
compileOnly 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT'
49+
compileOnly 'org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT'
5050
compileOnly('com.github.Realizedd:TokenManager:3.2.4') {
5151
transitive = false
5252
}
@@ -62,7 +62,7 @@ dependencies {
6262
compileOnly('com.github.mcMMO-Dev:mcMMO:601297') {
6363
exclude group: 'com.sk89q.worldguard'
6464
}
65-
compileOnly ('com.bencodez:votingplugin:6.9.5') {
65+
compileOnly ('com.bencodez:votingplugin:6.13.1') {
6666
transitive = false
6767
}
6868

‎src/main/java/sh/okx/rankup/RankupPlugin.java‎

Lines changed: 11 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
package sh.okx.rankup;
22

33
import com.electronwill.nightconfig.toml.TomlFormat;
4-
import java.io.File;
5-
import java.io.FileNotFoundException;
6-
import java.io.FileReader;
7-
import java.util.HashMap;
8-
import java.util.List;
9-
import java.util.Map;
104
import lombok.Getter;
115
import org.bukkit.Bukkit;
126
import org.bukkit.ChatColor;
@@ -21,12 +15,7 @@
2115
import org.bukkit.plugin.PluginManager;
2216
import org.bukkit.plugin.java.JavaPlugin;
2317
import org.bukkit.plugin.java.JavaPluginLoader;
24-
import sh.okx.rankup.commands.InfoCommand;
25-
import sh.okx.rankup.commands.MaxRankupCommand;
26-
import sh.okx.rankup.commands.PrestigeCommand;
27-
import sh.okx.rankup.commands.PrestigesCommand;
28-
import sh.okx.rankup.commands.RanksCommand;
29-
import sh.okx.rankup.commands.RankupCommand;
18+
import sh.okx.rankup.commands.*;
3019
import sh.okx.rankup.economy.Economy;
3120
import sh.okx.rankup.economy.EconomyProvider;
3221
import sh.okx.rankup.economy.VaultEconomyProvider;
@@ -49,37 +38,15 @@
4938
import sh.okx.rankup.ranksgui.RanksGuiListener;
5039
import sh.okx.rankup.requirements.Requirement;
5140
import sh.okx.rankup.requirements.RequirementRegistry;
52-
import sh.okx.rankup.requirements.requirement.AdvancementRequirement;
53-
import sh.okx.rankup.requirements.requirement.BlockBreakRequirement;
54-
import sh.okx.rankup.requirements.requirement.CraftItemRequirement;
55-
import sh.okx.rankup.requirements.requirement.GroupRequirement;
56-
import sh.okx.rankup.requirements.requirement.ItemDeductibleRequirement;
57-
import sh.okx.rankup.requirements.requirement.ItemRequirement;
58-
import sh.okx.rankup.requirements.requirement.MobKillsRequirement;
59-
import sh.okx.rankup.requirements.requirement.MoneyDeductibleRequirement;
60-
import sh.okx.rankup.requirements.requirement.MoneyRequirement;
61-
import sh.okx.rankup.requirements.requirement.PermissionRequirement;
62-
import sh.okx.rankup.requirements.requirement.PlaceholderRequirement;
63-
import sh.okx.rankup.requirements.requirement.PlayerKillsRequirement;
64-
import sh.okx.rankup.requirements.requirement.PlaytimeMinutesRequirement;
65-
import sh.okx.rankup.requirements.requirement.TotalMobKillsRequirement;
66-
import sh.okx.rankup.requirements.requirement.UseItemRequirement;
67-
import sh.okx.rankup.requirements.requirement.WorldRequirement;
68-
import sh.okx.rankup.requirements.requirement.XpLevelDeductibleRequirement;
69-
import sh.okx.rankup.requirements.requirement.XpLevelRequirement;
41+
import sh.okx.rankup.requirements.requirement.*;
7042
import sh.okx.rankup.requirements.requirement.advancedachievements.AdvancedAchievementsAchievementRequirement;
7143
import sh.okx.rankup.requirements.requirement.advancedachievements.AdvancedAchievementsTotalRequirement;
7244
import sh.okx.rankup.requirements.requirement.mcmmo.McMMOPowerLevelRequirement;
7345
import sh.okx.rankup.requirements.requirement.mcmmo.McMMOSkillRequirement;
7446
import sh.okx.rankup.requirements.requirement.superbvote.SuperbVoteVotesRequirement;
7547
import sh.okx.rankup.requirements.requirement.tokenmanager.TokensDeductibleRequirement;
7648
import sh.okx.rankup.requirements.requirement.tokenmanager.TokensRequirement;
77-
import sh.okx.rankup.requirements.requirement.towny.TownyKingNumberResidentsRequirement;
78-
import sh.okx.rankup.requirements.requirement.towny.TownyKingNumberTownsRequirement;
79-
import sh.okx.rankup.requirements.requirement.towny.TownyKingRequirement;
80-
import sh.okx.rankup.requirements.requirement.towny.TownyMayorNumberResidentsRequirement;
81-
import sh.okx.rankup.requirements.requirement.towny.TownyMayorRequirement;
82-
import sh.okx.rankup.requirements.requirement.towny.TownyResidentRequirement;
49+
import sh.okx.rankup.requirements.requirement.towny.*;
8350
import sh.okx.rankup.requirements.requirement.votingplugin.VotingPluginPointsDeductibleRequirement;
8451
import sh.okx.rankup.requirements.requirement.votingplugin.VotingPluginPointsRequirement;
8552
import sh.okx.rankup.requirements.requirement.votingplugin.VotingPluginVotesRequirement;
@@ -89,6 +56,13 @@
8956
import sh.okx.rankup.util.UpdateNotifier;
9057
import sh.okx.rankup.util.VersionChecker;
9158

59+
import java.io.File;
60+
import java.io.FileNotFoundException;
61+
import java.io.FileReader;
62+
import java.util.HashMap;
63+
import java.util.List;
64+
import java.util.Map;
65+
9266
public class RankupPlugin extends JavaPlugin {
9367

9468
public static final int CONFIG_VERSION = 10;
@@ -327,7 +301,7 @@ public void refreshRanks() {
327301

328302

329303

330-
} catch (Exception e) {
304+
} catch (RuntimeException e) {
331305
this.errorMessage = e.getClass().getName() + ": " + e.getMessage();
332306
e.printStackTrace();
333307
}

‎src/main/java/sh/okx/rankup/ranks/RankList.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package sh.okx.rankup.ranks;
22

3-
import java.util.ArrayList;
4-
import java.util.Collection;
5-
import java.util.Collections;
6-
import java.util.List;
7-
import java.util.Objects;
83
import lombok.Getter;
94
import org.bukkit.entity.Player;
105
import sh.okx.rankup.RankupPlugin;
116

7+
import java.util.*;
8+
129
public abstract class RankList<T extends Rank> {
1310

1411
protected RankupPlugin plugin;

‎src/main/java/sh/okx/rankup/ranksgui/RanksGuiCommand.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
1818
if (!(sender instanceof Player)) {
1919
return false;
2020
}
21+
if (plugin.error(sender)) {
22+
return true;
23+
}
2124
Player player = (Player) sender;
2225

2326
listener.open(new RanksGui(plugin, player));

‎src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginPointsDeductibleRequirement.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package sh.okx.rankup.requirements.requirement.votingplugin;
22

3-
import com.bencodez.votingplugin.user.UserManager;
43
import com.bencodez.votingplugin.user.VotingPluginUser;
54
import org.bukkit.entity.Player;
65
import sh.okx.rankup.RankupPlugin;
@@ -19,7 +18,7 @@ protected VotingPluginPointsDeductibleRequirement(Requirement clone) {
1918

2019
@Override
2120
public void apply(Player player, double multiplier) {
22-
VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
21+
VotingPluginUser user = VotingPluginUtil.getInstance().getUserManager().getVotingPluginUser(player);
2322
if(!user.removePoints(getValueInt())) {
2423
plugin.getLogger().warning("Unable to remove VotingPlugin points");
2524
}

‎src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginPointsRequirement.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package sh.okx.rankup.requirements.requirement.votingplugin;
22

3-
import com.bencodez.votingplugin.user.UserManager;
43
import org.bukkit.entity.Player;
54
import sh.okx.rankup.RankupPlugin;
65
import sh.okx.rankup.requirements.ProgressiveRequirement;
@@ -18,7 +17,7 @@ protected VotingPluginPointsRequirement(Requirement clone) {
1817

1918
@Override
2019
public double getProgress(Player player) {
21-
return UserManager.getInstance().getVotingPluginUser(player).getPoints();
20+
return VotingPluginUtil.getInstance().getUserManager().getVotingPluginUser(player).getPoints();
2221
}
2322

2423
@Override

‎src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginUtil.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package sh.okx.rankup.requirements.requirement.votingplugin;
2+
3+
import com.bencodez.votingplugin.VotingPluginMain;
4+
import com.bencodez.votingplugin.user.UserManager;
5+
6+
import java.lang.reflect.InvocationTargetException;
7+
8+
public class VotingPluginUtil {
9+
private static VotingPluginUtil instance;
10+
11+
private UserManager userManager;
12+
13+
private VotingPluginUtil() {
14+
try {
15+
userManager = (UserManager) UserManager.class.getMethod("getInstance").invoke(null);
16+
} catch (NoSuchMethodException e) {
17+
userManager = VotingPluginMain.getPlugin().getVotingPluginUserManager();
18+
} catch (InvocationTargetException | IllegalAccessException e) {
19+
throw new RuntimeException(e);
20+
}
21+
}
22+
23+
public static VotingPluginUtil getInstance() {
24+
if (instance == null) {
25+
instance = new VotingPluginUtil();
26+
}
27+
return instance;
28+
}
29+
30+
public UserManager getUserManager() {
31+
return userManager;
32+
}
33+
}

‎src/main/java/sh/okx/rankup/requirements/requirement/votingplugin/VotingPluginVotesRequirement.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package sh.okx.rankup.requirements.requirement.votingplugin;
22

33
import com.bencodez.votingplugin.topvoter.TopVoter;
4-
import com.bencodez.votingplugin.user.UserManager;
54
import org.bukkit.entity.Player;
65
import sh.okx.rankup.RankupPlugin;
76
import sh.okx.rankup.requirements.ProgressiveRequirement;
@@ -18,7 +17,7 @@ protected VotingPluginVotesRequirement(Requirement clone) {
1817

1918
@Override
2019
public double getProgress(Player player) {
21-
return UserManager.getInstance().getVotingPluginUser(player).getTotal(TopVoter.AllTime);
20+
return VotingPluginUtil.getInstance().getUserManager().getVotingPluginUser(player).getTotal(TopVoter.AllTime);
2221
}
2322

2423
@Override

0 commit comments

Comments
 (0)