Merge pull request #22 from DrawethreeSoftware/1.12.4

1.12.4

Author: Drawethree

modules/core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>UltraPrisonCore</artifactId>
         <groupId>dev.drawethree</groupId>
-        <version>1.12.3</version>
+        <version>1.12.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

modules/core/src/main/java/dev/drawethree/ultraprisoncore/placeholders/UltraPrisonMVdWPlaceholder.java

@@ -146,15 +146,19 @@ private void registerRanksPlaceholders() {
 		PlaceholderAPI.registerPlaceholder(plugin, "ultraprison_rank", event -> plugin.getRanks().getApi().getPlayerRank(event.getPlayer()).getPrefix());
 
 		PlaceholderAPI.registerPlaceholder(plugin, "ultraprison_next_rank", event -> {
-			Rank nextRank = plugin.getRanks().getApi().getNextPlayerRank(event.getPlayer());
-			return nextRank == null ? "" : nextRank.getPrefix();
+			Optional<Rank> nextRank = plugin.getRanks().getApi().getNextPlayerRank(event.getPlayer());
+			if (nextRank.isEmpty()) {
+				return "";
+			} else {
+				return nextRank.get().getPrefix();
+			}
 		});
 
-		PlaceholderAPI.registerPlaceholder(plugin, "ultraprison_rankup_progress", event -> String.format("%d%%", plugin.getRanks().getRankManager().getRankupProgress(event.getPlayer())));
-		PlaceholderAPI.registerPlaceholder(plugin, "ultraprison_rankup_progress_bar", event -> plugin.getRanks().getRankManager().getRankupProgressBar(event.getPlayer()));
-		PlaceholderAPI.registerPlaceholder(plugin, "ultraprison_next_rank_cost_raw", event -> String.valueOf(plugin.getRanks().getRankManager().getNextRankCost(event.getPlayer())));
-		PlaceholderAPI.registerPlaceholder(plugin, "ultraprison_next_rank_cost", event -> String.format("%,.2f", plugin.getRanks().getRankManager().getNextRankCost(event.getPlayer())));
-		PlaceholderAPI.registerPlaceholder(plugin, "ultraprison_next_rank_cost_formatted", event -> MathUtils.formatNumber(plugin.getRanks().getRankManager().getNextRankCost(event.getPlayer())));
+		PlaceholderAPI.registerPlaceholder(plugin, "ultraprison_rankup_progress", event -> String.format("%d%%", plugin.getRanks().getRanksManager().getRankupProgress(event.getPlayer())));
+		PlaceholderAPI.registerPlaceholder(plugin, "ultraprison_rankup_progress_bar", event -> plugin.getRanks().getRanksManager().getRankupProgressBar(event.getPlayer()));
+		PlaceholderAPI.registerPlaceholder(plugin, "ultraprison_next_rank_cost_raw", event -> String.valueOf(plugin.getRanks().getRanksManager().getNextRankCost(event.getPlayer())));
+		PlaceholderAPI.registerPlaceholder(plugin, "ultraprison_next_rank_cost", event -> String.format("%,.2f", plugin.getRanks().getRanksManager().getNextRankCost(event.getPlayer())));
+		PlaceholderAPI.registerPlaceholder(plugin, "ultraprison_next_rank_cost_formatted", event -> MathUtils.formatNumber(plugin.getRanks().getRanksManager().getNextRankCost(event.getPlayer())));
 	}
 
 	private void registerMultipliersPlaceholders() {

modules/core/src/main/java/dev/drawethree/ultraprisoncore/placeholders/UltraPrisonPAPIPlaceholder.java

@@ -184,15 +184,15 @@ public String onPlaceholderRequest(Player player, String identifier) {
 			case "rank":
 				return plugin.getRanks().getApi().getPlayerRank(player).getPrefix();
 			case "next_rank": {
-				Rank nextRank = plugin.getRanks().getApi().getNextPlayerRank(player);
-				return nextRank == null ? "" : nextRank.getPrefix();
+				Optional<Rank> nextRank = plugin.getRanks().getApi().getNextPlayerRank(player);
+				return nextRank.isEmpty() ? "" : nextRank.get().getPrefix();
 			}
 			case "next_rank_cost_raw":
-				return String.valueOf(plugin.getRanks().getRankManager().getNextRankCost(player));
+				return String.valueOf(plugin.getRanks().getRanksManager().getNextRankCost(player));
 			case "next_rank_cost":
-				return String.format("%,.2f", plugin.getRanks().getRankManager().getNextRankCost(player));
+				return String.format("%,.2f", plugin.getRanks().getRanksManager().getNextRankCost(player));
 			case "next_rank_cost_formatted":
-				return MathUtils.formatNumber(plugin.getRanks().getRankManager().getNextRankCost(player));
+				return MathUtils.formatNumber(plugin.getRanks().getRanksManager().getNextRankCost(player));
 			case "prestige":
 				return plugin.getPrestiges().getApi().getPlayerPrestige(player).getPrefix();
 			case "prestige_id":
@@ -208,9 +208,9 @@ public String onPlaceholderRequest(Player player, String identifier) {
 			case "gems_3":
 				return MathUtils.formatNumber(plugin.getGems().getGemsManager().getPlayerGems(player));
 			case "rankup_progress":
-				return String.format("%d%%", plugin.getRanks().getRankManager().getRankupProgress(player));
+				return String.format("%d%%", plugin.getRanks().getRanksManager().getRankupProgress(player));
 			case "rankup_progress_bar":
-				return plugin.getRanks().getRankManager().getRankupProgressBar(player);
+				return plugin.getRanks().getRanksManager().getRankupProgressBar(player);
 			case "tokens_1":
 				return String.valueOf(plugin.getTokens().getTokensManager().getPlayerTokens(player));
 			case "blocks_1":

modules/core/src/main/java/dev/drawethree/ultraprisoncore/prestiges/manager/PrestigeManager.java

@@ -5,7 +5,7 @@
 import dev.drawethree.ultraprisoncore.prestiges.api.events.PlayerPrestigeEvent;
 import dev.drawethree.ultraprisoncore.prestiges.model.Prestige;
 import dev.drawethree.ultraprisoncore.ranks.UltraPrisonRanks;
-import dev.drawethree.ultraprisoncore.ranks.manager.RankManager;
+import dev.drawethree.ultraprisoncore.ranks.manager.RanksManager;
 import dev.drawethree.ultraprisoncore.utils.player.PlayerUtils;
 import dev.drawethree.ultraprisoncore.utils.text.TextUtils;
 import me.lucko.helper.Events;
@@ -539,11 +539,11 @@ private boolean areRanksEnabled() {
 		return this.plugin.getCore().isModuleEnabled(UltraPrisonRanks.MODULE_NAME);
 	}
 
-	private RankManager getRankManager() {
+	private RanksManager getRankManager() {
 		if (!areRanksEnabled()) {
 			throw new IllegalStateException("Ranks module is not enabled");
 		}
-		return this.plugin.getCore().getRanks().getRankManager();
+		return this.plugin.getCore().getRanks().getRanksManager();
 	}
 
 	public boolean isPrestiging(Player sender) {

modules/core/src/main/java/dev/drawethree/ultraprisoncore/ranks/UltraPrisonRanks.java

@@ -2,19 +2,16 @@
 
 import dev.drawethree.ultraprisoncore.UltraPrisonCore;
 import dev.drawethree.ultraprisoncore.UltraPrisonModule;
-import dev.drawethree.ultraprisoncore.config.FileManager;
 import dev.drawethree.ultraprisoncore.database.model.DatabaseType;
 import dev.drawethree.ultraprisoncore.ranks.api.UltraPrisonRanksAPI;
 import dev.drawethree.ultraprisoncore.ranks.api.UltraPrisonRanksAPIImpl;
-import dev.drawethree.ultraprisoncore.ranks.manager.RankManager;
-import dev.drawethree.ultraprisoncore.ranks.model.Rank;
-import dev.drawethree.ultraprisoncore.utils.player.PlayerUtils;
-import dev.drawethree.ultraprisoncore.utils.text.TextUtils;
+import dev.drawethree.ultraprisoncore.ranks.commands.MaxRankupCommand;
+import dev.drawethree.ultraprisoncore.ranks.commands.RankupCommand;
+import dev.drawethree.ultraprisoncore.ranks.commands.SetRankCommand;
+import dev.drawethree.ultraprisoncore.ranks.config.RanksConfig;
+import dev.drawethree.ultraprisoncore.ranks.listener.RanksListener;
+import dev.drawethree.ultraprisoncore.ranks.manager.RanksManager;
 import lombok.Getter;
-import me.lucko.helper.Commands;
-import org.bukkit.entity.Player;
-
-import java.util.HashMap;
 
 @Getter
 public final class UltraPrisonRanks implements UltraPrisonModule {
@@ -23,21 +20,18 @@ public final class UltraPrisonRanks implements UltraPrisonModule {
 	public static final String MODULE_NAME = "Ranks";
 
 	@Getter
-	private FileManager.Config config;
-
-	private RankManager rankManager;
-
+	private RanksConfig ranksConfig;
+	@Getter
+	private RanksManager ranksManager;
 	@Getter
 	private UltraPrisonRanksAPI api;
-
-	private HashMap<String, String> messages;
-
 	@Getter
 	private final UltraPrisonCore core;
+
 	private boolean enabled;
 
-	public UltraPrisonRanks(UltraPrisonCore UltraPrisonCore) {
-		this.core = UltraPrisonCore;
+	public UltraPrisonRanks(UltraPrisonCore core) {
+		this.core = core;
 	}
 
 	@Override
@@ -47,39 +41,28 @@ public boolean isEnabled() {
 
 	@Override
 	public void reload() {
-		this.config.reload();
-		this.loadMessages();
-		this.rankManager.reload();
+		this.ranksConfig.reload();
 	}
 
 	@Override
 	public void enable() {
 		this.enabled = true;
-
-		this.config = this.core.getFileManager().getConfig("ranks.yml").copyDefaults(true).save();
-
-		this.loadMessages();
-		this.rankManager = new RankManager(this);
-		api = new UltraPrisonRanksAPIImpl(this);
+		this.ranksConfig = new RanksConfig(this);
+		this.ranksConfig.load();
+		this.ranksManager = new RanksManager(this);
+		this.ranksManager.enable();
+		this.api = new UltraPrisonRanksAPIImpl(this.ranksManager);
 		this.registerCommands();
-		this.rankManager.loadAllData();
-	}
-
-	private void loadMessages() {
-		messages = new HashMap<>();
-		for (String key : this.getConfig().get().getConfigurationSection("messages").getKeys(false)) {
-			messages.put(key.toLowerCase(), TextUtils.applyColor(this.getConfig().get().getString("messages." + key)));
-		}
+		this.registerListeners();
 	}
 
-	public String getMessage(String key) {
-		return messages.getOrDefault(key.toLowerCase(), TextUtils.applyColor("&cMessage " + key + " not found."));
+	private void registerListeners() {
+		new RanksListener(this).register();
 	}
 
-
 	@Override
 	public void disable() {
-		this.rankManager.saveAllDataSync();
+		this.ranksManager.disable();
 		this.enabled = false;
 	}
 
@@ -113,36 +96,8 @@ public boolean isHistoryEnabled() {
 	}
 
 	private void registerCommands() {
-		Commands.create()
-				.assertPlayer()
-				.handler(c -> {
-					if (c.args().size() == 0) {
-						this.rankManager.buyNextRank(c.sender());
-					}
-				}).registerAndBind(core, "rankup");
-		Commands.create()
-				.assertPermission("ultraprison.ranks.admin")
-				.handler(c -> {
-					if (c.args().size() == 2) {
-						Player target = c.arg(0).parseOrFail(Player.class);
-						Rank rank = this.getRankManager().getRankById(c.arg(1).parseOrFail(Integer.class));
-
-						if (rank == null) {
-							PlayerUtils.sendMessage(c.sender(), "&cInvalid rank id provided.");
-							return;
-						}
-
-						this.rankManager.setRank(target, rank, c.sender());
-					}
-				}).registerAndBind(core, "setrank");
-
-		Commands.create()
-				.assertPermission("ultraprison.ranks.maxrankup", this.getMessage("no_permission"))
-				.assertPlayer()
-				.handler(c -> {
-					if (c.args().size() == 0) {
-						this.rankManager.buyMaxRank(c.sender());
-					}
-				}).registerAndBind(core, "maxrankup", "mru");
+		new RankupCommand(this).register();
+		new MaxRankupCommand(this).register();
+		new SetRankCommand(this).register();
 	}
 }

modules/core/src/main/java/dev/drawethree/ultraprisoncore/ranks/api/UltraPrisonRanksAPI.java

@@ -4,6 +4,8 @@
 import dev.drawethree.ultraprisoncore.ranks.model.Rank;
 import org.bukkit.entity.Player;
 
+import java.util.Optional;
+
 public interface UltraPrisonRanksAPI {
 
 	/**
@@ -20,7 +22,7 @@ public interface UltraPrisonRanksAPI {
 	 * @param player Player
 	 * @return null if he has max rank, otherwise next Rank
 	 */
-	Rank getNextPlayerRank(Player player);
+	Optional<Rank> getNextPlayerRank(Player player);
 
 	/**
 	 * Method to get player's rankup progress

modules/core/src/main/java/dev/drawethree/ultraprisoncore/ranks/api/UltraPrisonRanksAPIImpl.java

@@ -1,34 +1,36 @@
 package dev.drawethree.ultraprisoncore.ranks.api;
 
-import dev.drawethree.ultraprisoncore.ranks.UltraPrisonRanks;
+import dev.drawethree.ultraprisoncore.ranks.manager.RanksManager;
 import dev.drawethree.ultraprisoncore.ranks.model.Rank;
 import org.bukkit.entity.Player;
 
-public class UltraPrisonRanksAPIImpl implements UltraPrisonRanksAPI {
+import java.util.Optional;
 
-	private UltraPrisonRanks plugin;
+public final class UltraPrisonRanksAPIImpl implements UltraPrisonRanksAPI {
 
-	public UltraPrisonRanksAPIImpl(UltraPrisonRanks plugin) {
-		this.plugin = plugin;
+	private final RanksManager manager;
+
+	public UltraPrisonRanksAPIImpl(RanksManager manager) {
+		this.manager = manager;
 	}
 
 	@Override
 	public Rank getPlayerRank(Player p) {
-		return plugin.getRankManager().getPlayerRank(p);
+		return manager.getPlayerRank(p);
 	}
 
 	@Override
-	public Rank getNextPlayerRank(Player player) {
-		return plugin.getRankManager().getNextRank(this.getPlayerRank(player).getId());
+	public Optional<Rank> getNextPlayerRank(Player player) {
+		return manager.getNextRank(this.getPlayerRank(player).getId());
 	}
 
 	@Override
 	public int getRankupProgress(Player player) {
-		return plugin.getRankManager().getRankupProgress(player);
+		return manager.getRankupProgress(player);
 	}
 
 	@Override
 	public void setPlayerRank(Player player, Rank rank) {
-		plugin.getRankManager().setRank(player, rank, null);
+		manager.setRank(player, rank, null);
 	}
 }

modules/core/src/main/java/dev/drawethree/ultraprisoncore/ranks/api/events/PlayerRankUpEvent.java

@@ -8,13 +8,12 @@
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 
-public class PlayerRankUpEvent extends UltraPrisonPlayerEvent implements Cancellable {
-
+public final class PlayerRankUpEvent extends UltraPrisonPlayerEvent implements Cancellable {
 
 	private static final HandlerList handlers = new HandlerList();
 
 	@Getter
-	private Rank oldRank;
+	private final Rank oldRank;
 
 	@Getter
 	@Setter

modules/core/src/main/java/dev/drawethree/ultraprisoncore/ranks/commands/MaxRankupCommand.java

@@ -0,0 +1,26 @@
+package dev.drawethree.ultraprisoncore.ranks.commands;
+
+import dev.drawethree.ultraprisoncore.ranks.UltraPrisonRanks;
+import me.lucko.helper.Commands;
+
+public class MaxRankupCommand {
+
+	private static final String[] COMMAND_ALIASES = {"maxrankup", "mru"};
+	private static final String PERMISSION_REQUIRED = "ultraprison.ranks.maxrankup";
+	private final UltraPrisonRanks plugin;
+
+	public MaxRankupCommand(UltraPrisonRanks plugin) {
+		this.plugin = plugin;
+	}
+
+	public void register() {
+		Commands.create()
+				.assertPermission(PERMISSION_REQUIRED, this.plugin.getRanksConfig().getMessage("no_permission"))
+				.assertPlayer()
+				.handler(c -> {
+					if (c.args().size() == 0) {
+						this.plugin.getRanksManager().buyMaxRank(c.sender());
+					}
+				}).registerAndBind(this.plugin.getCore(), COMMAND_ALIASES);
+	}
+}

modules/core/src/main/java/dev/drawethree/ultraprisoncore/ranks/commands/RankupCommand.java

@@ -0,0 +1,24 @@
+package dev.drawethree.ultraprisoncore.ranks.commands;
+
+import dev.drawethree.ultraprisoncore.ranks.UltraPrisonRanks;
+import me.lucko.helper.Commands;
+
+public class RankupCommand {
+
+	private static final String[] COMMAND_ALIASES = {"rankup"};
+	private final UltraPrisonRanks plugin;
+
+	public RankupCommand(UltraPrisonRanks plugin) {
+		this.plugin = plugin;
+	}
+
+	public void register() {
+		Commands.create()
+				.assertPlayer()
+				.handler(c -> {
+					if (c.args().size() == 0) {
+						this.plugin.getRanksManager().buyNextRank(c.sender());
+					}
+				}).registerAndBind(this.plugin.getCore(), COMMAND_ALIASES);
+	}
+}