Fix multi merchants

build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
 }
 
 group = "io.github.cccm5"
-version = "2.0.0_beta-4"
+version = "2.0.0_beta-5"
 description = "Cargo"
 java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 

src/main/java/io/github/cccm5/CargoTask.java → src/main/java/io/github/cccm5/async/CargoTask.java

@@ -1,6 +1,8 @@
-package io.github.cccm5;
+package io.github.cccm5.async;
 
 import com.degitise.minevid.dtlTraders.guis.items.TradableGUIItem;
+import io.github.cccm5.CargoMain;
+import io.github.cccm5.config.Config;
 import net.countercraft.movecraft.craft.PlayerCraft;
 import net.countercraft.movecraft.craft.type.CraftType;
 import net.countercraft.movecraft.util.hitboxes.HitBox;
@@ -15,48 +17,44 @@ public abstract class CargoTask extends BukkitRunnable {
     protected final Player originalPilot;
     protected TradableGUIItem item;
 
-    // protected Stock stock;
-    // protected final StockItem item;
     protected CargoTask(PlayerCraft craft, TradableGUIItem guiItem) {
         if (craft == null) {
             throw new IllegalArgumentException("craft must not be null");
-        } else if (!(craft instanceof PlayerCraft)) {
-            throw new IllegalArgumentException("craft must not be a player craft");
-        } else
-            this.craft = (PlayerCraft) craft;
+        }
+        this.craft = craft;
         if (guiItem == null)
             throw new IllegalArgumentException("item must not be null");
         else
-            this.item = guiItem;
-        this.originalLocations = craft.getHitBox();
-        this.originalPilot = this.craft.getPilot();
+            item = guiItem;
+        originalLocations = craft.getHitBox();
+        originalPilot = craft.getPilot();
     }
 
     @Override
     public void run() {
         if (CraftManager.getInstance().getCraftByPlayer(originalPilot) == null) {
-            if (CargoMain.isDebug())
-                CargoMain.logger.info("canceling CargoTask due to missing player/craft");
+            if (Config.debug)
+                CargoMain.getInstance().getLogger().info("canceling CargoTask due to missing player/craft");
             CargoMain.getQue().remove(originalPilot);
-            this.cancel();
+            cancel();
             return;
         }
 
-        if (this.craft.getPilot() != originalPilot) {
+        if (craft.getPilot() != originalPilot) {
             originalPilot.sendMessage("Pilots changed!");
             CargoMain.getQue().remove(originalPilot);
-            this.cancel();
+            cancel();
             return;
         }
 
         if (craft.getHitBox() != originalLocations) {
             originalPilot.sendMessage("Blocks moved/changed!");
             CargoMain.getQue().remove(originalPilot);
-            this.cancel();
+            cancel();
             return;
         }
-        if (CargoMain.isDebug())
-            CargoMain.logger.info("Running execute method for CargoTask with address " + this + ". Pilot: "
+        if (Config.debug)
+            CargoMain.getInstance().getLogger().info("Running execute method for CargoTask with address " + this + ". Pilot: "
                     + originalPilot.getName() + " CraftSize: " + originalLocations.size() + " CraftType: "
                     + craft.getType().getStringProperty(CraftType.NAME) + " StockItem: "
                     + (item.getDisplayName().length() > 0 ? item.getDisplayName()

src/main/java/io/github/cccm5/LoadTask.java → src/main/java/io/github/cccm5/async/LoadTask.java

@@ -1,6 +1,9 @@
-package io.github.cccm5;
+package io.github.cccm5.async;
 
 import com.degitise.minevid.dtlTraders.guis.items.TradableGUIItem;
+import io.github.cccm5.CargoMain;
+import io.github.cccm5.config.Config;
+import io.github.cccm5.util.CraftInventoryUtil;
 import net.countercraft.movecraft.craft.PlayerCraft;
 
 import org.bukkit.Material;
@@ -15,7 +18,7 @@ public LoadTask(PlayerCraft craft, TradableGUIItem item) {
     }
 
     protected void execute() {
-        List<Inventory> invs = Utils.getInventoriesWithSpace(craft, item.getMainItem(), Material.CHEST,
+        List<Inventory> invs = CraftInventoryUtil.getInventoriesWithSpace(craft, item.getMainItem(), Material.CHEST,
                 Material.TRAPPED_CHEST, Material.BARREL);
 
         Inventory inv = invs.get(0);
@@ -27,26 +30,26 @@ protected void execute() {
                         ? item.getMainItem().getMaxStackSize()
                         : inv.getItem(i).getMaxStackSize() - inv.getItem(i).getAmount();
                 if (CargoMain.getEconomy().getBalance(originalPilot) > item.getTradePrice() * maxCount
-                        * (1 + CargoMain.getLoadTax())) {
+                        * (1 + Config.loadTax)) {
                     loaded += maxCount;
                     ItemStack tempItem = item.getMainItem().clone();
                     tempItem.setAmount(tempItem.getMaxStackSize());
                     inv.setItem(i, tempItem);
 
                 } else {
                     maxCount = (int) (CargoMain.getEconomy().getBalance(originalPilot)
-                            / (item.getTradePrice() * (1 + CargoMain.getLoadTax())));
+                            / (item.getTradePrice() * (1 + Config.loadTax)));
                     this.cancel();
                     CargoMain.getQue().remove(originalPilot);
-                    originalPilot.sendMessage(CargoMain.SUCCESS_TAG + "You ran out of money!");
+                    originalPilot.sendMessage(Config.SUCCESS_TAG + "You ran out of money!");
                     if (maxCount <= 0) {
-                        if (CargoMain.isDebug()) {
-                            CargoMain.logger.info("Balance: " + CargoMain.getEconomy().getBalance(originalPilot)
+                        if (Config.debug) {
+                            CargoMain.getInstance().getLogger().info("Balance: " + CargoMain.getEconomy().getBalance(originalPilot)
                                     + ". maxCount: " + maxCount + ".");
                         }
-                        originalPilot.sendMessage(CargoMain.SUCCESS_TAG + "Loaded " + loaded + " items worth $"
+                        originalPilot.sendMessage(Config.SUCCESS_TAG + "Loaded " + loaded + " items worth $"
                                 + String.format("%.2f", loaded * item.getTradePrice()) + " took a tax of "
-                                + String.format("%.2f", CargoMain.getLoadTax() * loaded * item.getTradePrice()));
+                                + String.format("%.2f", Config.loadTax * loaded * item.getTradePrice()));
                         return;
                     }
                     ItemStack tempItem = item.getMainItem().clone();
@@ -56,29 +59,29 @@ protected void execute() {
                         tempItem.setAmount(inv.getItem(i).getAmount() + maxCount);
                     inv.setItem(i, tempItem);
                     loaded += maxCount;
-                    if (CargoMain.isDebug()) {
-                        CargoMain.logger.info("Balance: " + CargoMain.getEconomy().getBalance(originalPilot)
+                    if (Config.debug) {
+                        CargoMain.getInstance().getLogger().info("Balance: " + CargoMain.getEconomy().getBalance(originalPilot)
                                 + ". maxCount: " + maxCount + ". Actual stack-size: " + tempItem.getAmount());
                     }
-                    originalPilot.sendMessage(CargoMain.SUCCESS_TAG + "Loaded " + loaded + " items worth $"
+                    originalPilot.sendMessage(Config.SUCCESS_TAG + "Loaded " + loaded + " items worth $"
                             + String.format("%.2f", loaded * item.getTradePrice()) + " took a tax of "
-                            + String.format("%.2f", CargoMain.getLoadTax() * loaded * item.getTradePrice()));
+                            + String.format("%.2f", Config.loadTax * loaded * item.getTradePrice()));
                     CargoMain.getEconomy().withdrawPlayer(originalPilot,
-                            loaded * item.getTradePrice() * (1 + CargoMain.getLoadTax()));
+                            loaded * item.getTradePrice() * (1 + Config.loadTax));
                     return;
                 }
                 CargoMain.getEconomy().withdrawPlayer(originalPilot,
-                        maxCount * item.getTradePrice() * (1 + CargoMain.getLoadTax()));
+                        maxCount * item.getTradePrice() * (1 + Config.loadTax));
             }
 
-        originalPilot.sendMessage(CargoMain.SUCCESS_TAG + "Loaded " + loaded + " items worth $"
+        originalPilot.sendMessage(Config.SUCCESS_TAG + "Loaded " + loaded + " items worth $"
                 + String.format("%.2f", loaded * item.getTradePrice()) + " took a tax of "
-                + String.format("%.2f", CargoMain.getLoadTax() * loaded * item.getTradePrice()));
+                + String.format("%.2f", Config.loadTax * loaded * item.getTradePrice()));
 
         if (invs.size() <= 1) {
             this.cancel();
             CargoMain.getQue().remove(originalPilot);
-            originalPilot.sendMessage(CargoMain.SUCCESS_TAG + "All cargo loaded");
+            originalPilot.sendMessage(Config.SUCCESS_TAG + "All cargo loaded");
             return;
         }
         new ProcessingTask(originalPilot, item, invs.size()).runTaskTimer(CargoMain.getInstance(), 0, 20);

src/main/java/io/github/cccm5/ProcessingTask.java → src/main/java/io/github/cccm5/async/ProcessingTask.java

@@ -1,6 +1,8 @@
-package io.github.cccm5;
+package io.github.cccm5.async;
 
 import com.degitise.minevid.dtlTraders.guis.items.TradableGUIItem;
+import io.github.cccm5.CargoMain;
+import io.github.cccm5.config.Config;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -18,23 +20,20 @@
 public class ProcessingTask extends BukkitRunnable implements Listener
 {
     private static final int DELAY_BETWEEN_DISPLAY = 1;
-    private int remainingTime,remainingChests;
+    private int remainingTime;
+    private final int remainingChests;
     private final Player player;
-    private final TradableGUIItem item;
-    private final String itemDisplayName;
-    private Scoreboard board;
-    private Objective objective;
+    private final Objective objective;
     public ProcessingTask(Player player, TradableGUIItem item, int remainingChests){//, int remainingChests){
         if (item == null) 
             throw new IllegalArgumentException("item must not be null");
         if (player == null) 
             throw new IllegalArgumentException("player must not be null");
         this.player = player;
-        this.item = item;
-        this.remainingTime = CargoMain.getDelay()/20;
+        this.remainingTime = Config.delay/20;
         this.remainingChests = remainingChests;
-        board = Bukkit.getScoreboardManager().getNewScoreboard();
-        itemDisplayName = item.getMainItem().getItemMeta().getDisplayName() != null && item.getMainItem().getItemMeta().getDisplayName().length() > 0  ? item.getMainItem().getItemMeta().getDisplayName() : item.getMainItem().getType().name().toLowerCase();
+        Scoreboard board = Bukkit.getScoreboardManager().getNewScoreboard();
+        String itemDisplayName = item.getMainItem().getItemMeta().getDisplayName() != null && item.getMainItem().getItemMeta().getDisplayName().length() > 0 ? item.getMainItem().getItemMeta().getDisplayName() : item.getMainItem().getType().name().toLowerCase();
         objective = itemDisplayName.length() <=14 ? board.registerNewObjective(ChatColor.DARK_AQUA + itemDisplayName, "dummy") : board.registerNewObjective(ChatColor.DARK_AQUA + "Cargo", "dummy","Cargo");
         objective.setDisplaySlot(DisplaySlot.SIDEBAR);
         player.setScoreboard(board);

src/main/java/io/github/cccm5/UnloadTask.java → src/main/java/io/github/cccm5/async/UnloadTask.java

@@ -1,6 +1,9 @@
-package io.github.cccm5;
+package io.github.cccm5.async;
 
 import com.degitise.minevid.dtlTraders.guis.items.TradableGUIItem;
+import io.github.cccm5.CargoMain;
+import io.github.cccm5.config.Config;
+import io.github.cccm5.util.CraftInventoryUtil;
 import net.countercraft.movecraft.craft.PlayerCraft;
 
 import org.bukkit.Material;
@@ -14,7 +17,7 @@ public UnloadTask(PlayerCraft craft, TradableGUIItem item) {
     }
 
     public void execute() {
-        List<Inventory> invs = Utils.getInventories(craft, item.getMainItem(), Material.CHEST, Material.TRAPPED_CHEST, Material.BARREL);
+        List<Inventory> invs = CraftInventoryUtil.getInventories(craft, item.getMainItem(), Material.CHEST, Material.TRAPPED_CHEST, Material.BARREL);
         Inventory inv = invs.get(0);
         int count = 0;
         for (int i = 0; i < inv.getSize(); i++) {
@@ -23,16 +26,16 @@ public void execute() {
                 inv.setItem(i, null);
             }
         }
-        originalPilot.sendMessage(CargoMain.SUCCESS_TAG + "Unloaded " + count + " worth $"
+        originalPilot.sendMessage(Config.SUCCESS_TAG + "Unloaded " + count + " worth $"
                 + String.format("%.2f", count * item.getTradePrice()) + " took a tax of "
-                + String.format("%.2f", CargoMain.getUnloadTax() * count * item.getTradePrice()));
+                + String.format("%.2f", Config.unloadTax * count * item.getTradePrice()));
         CargoMain.getEconomy().depositPlayer(originalPilot,
-                count * item.getTradePrice() * (1 - CargoMain.getUnloadTax()));
+                count * item.getTradePrice() * (1 - Config.unloadTax));
 
         if (invs.size() <= 1) {
             this.cancel();
             CargoMain.getQue().remove(originalPilot);
-            originalPilot.sendMessage(CargoMain.SUCCESS_TAG + "All cargo unloaded");
+            originalPilot.sendMessage(Config.SUCCESS_TAG + "All cargo unloaded");
             return;
         }
         new ProcessingTask(originalPilot, item, invs.size()).runTaskTimer(CargoMain.getInstance(), 0, 20);

src/main/java/io/github/cccm5/commands/CargoCommand.java

@@ -0,0 +1,30 @@
+package io.github.cccm5.commands;
+
+import io.github.cccm5.config.Config;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+public class CargoCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+        if (command.getName().equalsIgnoreCase("cargo"))
+            return false;
+
+        if (!sender.hasPermission("Cargo.cargo")) {
+            sender.sendMessage(Config.ERROR_TAG + "You don't have permission to do that!");
+            return true;
+        }
+
+        sender.sendMessage(ChatColor.WHITE + "--[ " + ChatColor.DARK_AQUA + "  Movecraft Cargo " + ChatColor.WHITE + " ]--");
+        sender.sendMessage(ChatColor.DARK_AQUA + "Scan Range: " + ChatColor.WHITE + Config.scanRange + " Blocks");
+        sender.sendMessage(ChatColor.DARK_AQUA + "Transfer Delay: " + ChatColor.WHITE + Config.delay + " ticks");
+        sender.sendMessage(ChatColor.DARK_AQUA + "Unload Tax: " + ChatColor.WHITE + String.format("%.2f",100*Config.unloadTax) + "%");
+        sender.sendMessage(ChatColor.DARK_AQUA + "Load Tax: " + ChatColor.WHITE + String.format("%.2f",100*Config.loadTax) + "%");
+        sender.sendMessage(ChatColor.DARK_AQUA + "Distance Type: " + ChatColor.WHITE + (Config.cardinalDistance ? "Cardinal" : "Direct"));
+
+        return true;
+    }
+}

src/main/java/io/github/cccm5/commands/LoadCommand.java

@@ -0,0 +1,25 @@
+package io.github.cccm5.commands;
+
+import io.github.cccm5.CargoMain;
+import io.github.cccm5.config.Config;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+public class LoadCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { // Plugin
+        if (!command.getName().equalsIgnoreCase("load"))
+            return false;
+
+        if (!(sender instanceof Player)) {
+            sender.sendMessage(Config.ERROR_TAG + "You need to be a player to execute that command!");
+            return true;
+        }
+
+        CargoMain.getInstance().load((Player) sender);
+        return true;
+    }
+}

src/main/java/io/github/cccm5/commands/UnloadCommand.java

@@ -0,0 +1,25 @@
+package io.github.cccm5.commands;
+
+import io.github.cccm5.CargoMain;
+import io.github.cccm5.config.Config;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+public class UnloadCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+        if (!command.getName().equalsIgnoreCase("unload"))
+            return false;
+
+        if (!(sender instanceof Player)) {
+            sender.sendMessage(Config.ERROR_TAG + "You need to be a player to execute that command!");
+            return true;
+        }
+
+        CargoMain.getInstance().unload((Player) sender);
+        return true;
+    }
+}

src/main/java/io/github/cccm5/config/Config.java

@@ -0,0 +1,15 @@
+package io.github.cccm5.config;
+
+import org.bukkit.ChatColor;
+
+public class Config {
+    public static final String ERROR_TAG = ChatColor.RED + "Error: " + ChatColor.DARK_RED;
+    public static final String SUCCESS_TAG = ChatColor.DARK_AQUA + "Cargo: " + ChatColor.WHITE;
+
+    public static double scanRange = 100.0;
+    public static int delay;
+    public static double loadTax = 0.01D;
+    public static double unloadTax = 0.01D;
+    public static boolean cardinalDistance = true;
+    public static boolean debug = false;
+}

src/main/java/io/github/cccm5/listener/SignClickListener.java

@@ -0,0 +1,31 @@
+package io.github.cccm5.listener;
+
+import io.github.cccm5.CargoMain;
+import org.bukkit.ChatColor;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.Sign;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.jetbrains.annotations.NotNull;
+
+public class SignClickListener implements Listener {
+    @EventHandler
+    public void onSignClick(@NotNull PlayerInteractEvent e) {
+        if (e.getAction() != Action.RIGHT_CLICK_BLOCK)
+            return;
+        BlockState state = e.getClickedBlock().getState();
+        if (!(state instanceof Sign))
+            return;
+
+        Sign sign = (Sign) e.getClickedBlock().getState();
+        if (sign.getLine(0).equals(ChatColor.DARK_AQUA + "[UnLoad]")) {
+            CargoMain.getInstance().unload(e.getPlayer());
+            return;
+        }
+        if (sign.getLine(0).equals(ChatColor.DARK_AQUA + "[Load]")) {
+            CargoMain.getInstance().load(e.getPlayer());
+        }
+    }
+}