Added ExtraValueCommand

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/iridium/iridiumskyblock/commands/ExtraValueCommand.java

@@ -0,0 +1,97 @@
+package com.iridium.iridiumskyblock.commands;
+
+import com.iridium.iridiumcore.utils.StringUtils;
+import com.iridium.iridiumskyblock.IridiumSkyblock;
+import com.iridium.iridiumskyblock.database.Island;
+import com.iridium.iridiumskyblock.database.User;
+import com.iridium.iridiumskyblock.utils.PlayerUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.time.Duration;
+import java.util.*;
+
+public class ExtraValueCommand extends Command {
+
+    /**
+     * The default constructor.
+     */
+    public ExtraValueCommand() {
+        super(Collections.singletonList("extravalue"), "Set extra values of island", "%prefix% &7/is extravalue <add/remove/set> <player> <amount>", "iridiumskyblock.extravalue", false, Duration.ZERO);
+    }
+
+    /**
+     * Executes the command for the specified {@link CommandSender} with the provided arguments.
+     * Not called when the command execution was invalid (no permission, no player or command disabled).
+     * Gives extra values to specific player's island
+     *
+     * @param sender The CommandSender which executes this command
+     * @param args   The arguments used with this command. They contain the sub-command
+     */
+    @Override
+    public boolean execute(CommandSender sender, String[] args) {
+        if (args.length < 4) {
+            sender.sendMessage(StringUtils.color(syntax.replace("%prefix%", IridiumSkyblock.getInstance().getConfiguration().prefix)));
+            return false;
+        }
+
+        Player player = Bukkit.getPlayer(args[2]);
+        if (player != null) {
+            User user = IridiumSkyblock.getInstance().getUserManager().getUser(player);
+            Optional<Island> island = user.getIsland();
+            if (island.isPresent()) {
+                try {
+                    double amount = Double.parseDouble(args[3]);
+                    switch (args[1].toUpperCase(Locale.ENGLISH)) {
+                        case "ADD":
+                            island.get().setExtraValue(island.get().getExtraValue() + amount);
+                            break;
+                        case "REMOVE":
+                            island.get().setExtraValue(island.get().getExtraValue() - amount);
+                            break;
+                        case "SET":
+                            island.get().setExtraValue(amount);
+                            break;
+                        default:
+                            sender.sendMessage(StringUtils.color(syntax.replace("%prefix%", IridiumSkyblock.getInstance().getConfiguration().prefix)));
+                            return false;
+
+                    }
+                    sender.sendMessage(StringUtils.color(IridiumSkyblock.getInstance().getMessages().setExtraValue.replace("%player%", player.getName()).replace("%amount%", String.valueOf(island.get().getExtraValue())).replace("%prefix%", IridiumSkyblock.getInstance().getConfiguration().prefix)));
+                    return true;
+                } catch (NumberFormatException e) {
+                    sender.sendMessage(StringUtils.color(IridiumSkyblock.getInstance().getMessages().notANumber.replace("%prefix%", IridiumSkyblock.getInstance().getConfiguration().prefix)));
+                }
+            } else {
+                sender.sendMessage(StringUtils.color(IridiumSkyblock.getInstance().getMessages().userNoIsland.replace("%prefix%", IridiumSkyblock.getInstance().getConfiguration().prefix)));
+            }
+        } else {
+            sender.sendMessage(StringUtils.color(IridiumSkyblock.getInstance().getMessages().notAPlayer.replace("%prefix%", IridiumSkyblock.getInstance().getConfiguration().prefix)));
+        }
+        return false;
+    }
+
+    /**
+     * Handles tab-completion for this command.
+     *
+     * @param commandSender The CommandSender which tries to tab-complete
+     * @param command       The command
+     * @param label         The label of the command
+     * @param args          The arguments already provided by the sender
+     * @return The list of tab completions for this command
+     */
+    @Override
+    public List<String> onTabComplete(CommandSender commandSender, org.bukkit.command.Command command, String label, String[] args) {
+        if (args.length == 3) {
+            return PlayerUtils.getOnlinePlayerNames();
+        }
+
+        if (args.length == 2) {
+            return Arrays.asList("add", "remove", "set");
+        }
+
+        return Collections.emptyList();
+    }
+
+}

src/main/java/com/iridium/iridiumskyblock/configs/Commands.java

@@ -29,6 +29,7 @@ public class Commands {
     public DepositCommand depositCommand = new DepositCommand();
     public EditWarpCommand editWarpCommand = new EditWarpCommand();
     public ExpelCommand expelCommand = new ExpelCommand();
+    public ExtraValueCommand extraValueCommand = new ExtraValueCommand();
     public FlyCommand flyCommand = new FlyCommand();
     public HelpCommand helpCommand = new HelpCommand();
     public HomeCommand homeCommand = new HomeCommand();

src/main/java/com/iridium/iridiumskyblock/configs/Messages.java

@@ -123,6 +123,7 @@ public class Messages {
     public String gaveBank = "%prefix% &7You gave %player% %amount% %item%.";
     public String setBank = "%prefix% &7You set %player%'s %amount% to %item%.";
     public String removedBank = "%prefix% &7You took %amount% %item%'s from %player%.";
+    public String setExtraValue = "%prefix% &7You have set %player%'s island extra value to %amount%.";
     public String invalidMissionType = "%prefix% &7That is not a valid mission type.";
     public String maxLevelReached = "%prefix% &7Maximum level reached.";
     public String cannotAfford = "%prefix% &7You cannot afford this.";

src/main/java/com/iridium/iridiumskyblock/database/Island.java

@@ -59,6 +59,9 @@ public final class Island {
     @DatabaseField(columnName = "experience")
     private int experience;
 
+    @DatabaseField(columnName = "extra_value")
+    private double extraValue;
+
     @DatabaseField(columnName = "color", canBeNull = false)
     private @NotNull Color color;
 
@@ -207,7 +210,7 @@ public LocalDateTime getCreateTime() {
      */
     public double getValue() {
         return valueCache.getCache(() -> {
-            double value = 0;
+            double value = extraValue;
 
             List<IslandBlocks> islandBlocks = IridiumSkyblock.getInstance().getDatabaseManager().getIslandBlocksTableManager().getEntries(this);
             List<IslandSpawners> islandSpawners = IridiumSkyblock.getInstance().getDatabaseManager().getIslandSpawnersTableManager().getEntries(this);

src/main/java/com/iridium/iridiumskyblock/managers/DatabaseManager.java

@@ -32,7 +32,7 @@
 @Getter
 public class DatabaseManager {
 
-    private final int version = 2;
+    private final int version = 3;
     private IslandTableManager islandTableManager;
     private UserTableManager userTableManager;
     private ForeignIslandTableManager<IslandBan, Integer> islandBanTableManager;

src/main/resources/patch_1.sql

@@ -10,4 +10,4 @@ CREATE UNIQUE INDEX island_rewards_id_island_id_uindex ON island_rewards (id, is
 CREATE UNIQUE INDEX island_spawners_id_spawner_type_island_id_uindex ON island_spawners (id, spawner_type, island_id);
 CREATE UNIQUE INDEX island_trusted_id_user_island_id_uindex ON island_trusted (id, user, island_id);
 CREATE UNIQUE INDEX island_upgrade_id_upgrade_island_id_uindex ON island_upgrade (id, upgrade, island_id);
-CREATE UNIQUE INDEX island_warps_id_name_island_id_uindex ON island_warps (id, name, island_id);
+CREATE UNIQUE INDEX island_warps_id_name_island_id_uindex ON island_warps (id, name, island_id);

src/main/resources/patch_2_mysql.sql

@@ -1 +1 @@
-ALTER TABLE islands MODIFY name VARCHAR(512) NULL
+ALTER TABLE islands MODIFY name VARCHAR(512) NULL

src/main/resources/patch_3.sql

@@ -0,0 +1 @@
+ALTER TABLE islands ADD COLUMN extra_value DOUBLE PRECISION;