Changed stuff

Iridium-Development · Oct 21, 2023 · d1550af · d1550af
1 parent 75fa917
commit d1550af
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 32 deletions.
diff --git a/src/main/java/com/iridium/iridiumskyblock/commands/RegenCommand.java b/src/main/java/com/iridium/iridiumskyblock/commands/RegenCommand.java
@@ -1,18 +1,24 @@
 package com.iridium.iridiumskyblock.commands;
 
+import com.iridium.iridiumcore.utils.Placeholder;
 import com.iridium.iridiumcore.utils.StringUtils;
 import com.iridium.iridiumskyblock.IridiumSkyblock;
 import com.iridium.iridiumskyblock.configs.Schematics;
 import com.iridium.iridiumskyblock.database.Island;
 import com.iridium.iridiumskyblock.database.User;
 import com.iridium.iridiumskyblock.gui.RegenGUI;
 import com.iridium.iridiumteams.IridiumTeams;
+import com.iridium.iridiumteams.bank.BankItem;
 import com.iridium.iridiumteams.commands.Command;
+import com.iridium.iridiumteams.database.TeamBank;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class RegenCommand extends Command<Island, User> {
 
@@ -47,23 +53,36 @@ public boolean execute(User user, Island island, String[] args, IridiumTeams<Isl
 
         Schematics.SchematicConfig schematicConfig = IridiumSkyblock.getInstance().getSchematics().schematics.get(schematic.get());
 
-        if(schematicConfig.regenCost.money != 0 || !schematicConfig.regenCost.bankItems.isEmpty()) {
-            if(!IridiumSkyblock.getInstance().getSchematicManager().buy(player, schematicConfig)) {
+        if (schematicConfig.regenCost.money != 0 || !schematicConfig.regenCost.bankItems.isEmpty()) {
+            if (!IridiumSkyblock.getInstance().getSchematicManager().buy(player, schematicConfig)) {
                 return false;
             }
         }
 
+        List<Placeholder> bankPlaceholders = IridiumSkyblock.getInstance().getBankItemList().stream()
+                .map(BankItem::getName)
+                .map(name -> new Placeholder(name + "_cost", formatPrice(getBankBalance(player, name))))
+                .collect(Collectors.toList());
+
         IridiumSkyblock.getInstance().getIslandManager().getTeamMembers(island).stream()
                 .map(User::getPlayer)
                 .filter(Objects::nonNull)
-                .forEach(member -> member.sendMessage(StringUtils.color(IridiumSkyblock.getInstance().getMessages().regeneratingIsland
-                        .replace("%prefix%", IridiumSkyblock.getInstance().getConfiguration().prefix)
+                .forEach(member -> member.sendMessage(StringUtils.color(StringUtils.processMultiplePlaceholders(IridiumSkyblock.getInstance().getMessages().paidForRegen
+                                .replace("%prefix%", IridiumSkyblock.getInstance().getConfiguration().prefix)
+                                .replace("%player%", player.getName())
+                                .replace("%schematic%", StringUtils.color(schematicConfig.item.displayName))
+                                .replace("%vault_cost%", formatPrice(schematicConfig.regenCost.money)),
+                        bankPlaceholders)
                 )));
 
+        player.sendMessage(StringUtils.color(IridiumSkyblock.getInstance().getMessages().regeneratingIsland
+                .replace("%prefix%", IridiumSkyblock.getInstance().getConfiguration().prefix)
+        ));
+
         IridiumSkyblock.getInstance().getIslandManager().clearTeamInventory(island);
 
         IridiumSkyblock.getInstance().getIslandManager().generateIsland(island, schematicConfig).thenRun(() -> Bukkit.getScheduler().runTask(IridiumSkyblock.getInstance(), () -> {
-          
+
             if (IridiumSkyblock.getInstance().getTeamManager().teleport(player, island.getHome(), island)) {
                 player.sendMessage(StringUtils.color(IridiumSkyblock.getInstance().getMessages().teleportingHome
                         .replace("%prefix%", IridiumSkyblock.getInstance().getConfiguration().prefix)
@@ -74,6 +93,28 @@ public boolean execute(User user, Island island, String[] args, IridiumTeams<Isl
         return true;
     }
 
+    private double getBankBalance(Player player, String bankItem) {
+        User user = IridiumSkyblock.getInstance().getUserManager().getUser(player);
+        return IridiumSkyblock.getInstance().getTeamManager().getTeamViaID(user.getTeamID())
+                .map(team -> IridiumSkyblock.getInstance().getTeamManager().getTeamBank(team, bankItem))
+                .map(TeamBank::getNumber)
+                .orElse(0.0);
+    }
+
+    private double round(double value, int places) {
+        BigDecimal bigDecimal = BigDecimal.valueOf(value);
+        bigDecimal = bigDecimal.setScale(places, RoundingMode.HALF_UP);
+        return bigDecimal.doubleValue();
+    }
+
+    public String formatPrice(double value) {
+        value = round(value, 2);
+        if (IridiumSkyblock.getInstance().getSchematics().abbreviatePrices) {
+            return IridiumSkyblock.getInstance().getConfiguration().numberFormatter.format(value);
+        }
+        return String.valueOf(value);
+    }
+
     @Override
     public List<String> onTabComplete(CommandSender commandSender, String[] args, IridiumTeams<Island, User> iridiumTeams) {
         return new ArrayList<>(IridiumSkyblock.getInstance().getSchematics().schematics.keySet());

diff --git a/src/main/java/com/iridium/iridiumskyblock/managers/SchematicManager.java b/src/main/java/com/iridium/iridiumskyblock/managers/SchematicManager.java
@@ -138,19 +138,6 @@ public boolean buy(Player player, Schematics.SchematicConfig schematic) {
         }
 
         purchase(player, schematic);
-
-        List<Placeholder> bankPlaceholders = IridiumSkyblock.getInstance().getBankItemList().stream()
-                .map(BankItem::getName)
-                .map(name -> new Placeholder(name + "_cost", formatPrice(getBankBalance(player, name))))
-                .collect(Collectors.toList());
-
-        player.sendMessage(StringUtils.color(StringUtils.processMultiplePlaceholders(IridiumSkyblock.getInstance().getMessages().paidForRegen
-                        .replace("%prefix%", IridiumSkyblock.getInstance().getConfiguration().prefix)
-                        .replace("%player%", player.getName())
-                        .replace("%schematic%", StringUtils.color(schematic.item.displayName))
-                        .replace("%vault_cost%", formatPrice(schematic.regenCost.money)),
-                bankPlaceholders)
-        ));
         return true;
     }
 
@@ -190,18 +177,4 @@ private void purchase(Player player, Schematics.SchematicConfig schematic) {
         }
         IridiumSkyblock.getInstance().getSchematics().successSound.play(player);
     }
-
-    private double round(double value, int places) {
-        BigDecimal bigDecimal = BigDecimal.valueOf(value);
-        bigDecimal = bigDecimal.setScale(places, RoundingMode.HALF_UP);
-        return bigDecimal.doubleValue();
-    }
-
-    public String formatPrice(double value) {
-        value = round(value, 2);
-        if (IridiumSkyblock.getInstance().getSchematics().abbreviatePrices) {
-            return IridiumSkyblock.getInstance().getConfiguration().numberFormatter.format(value);
-        }
-        return String.valueOf(value);
-    }
 }