1.7 - Rework SortSystem, fixing some bugs with DoubleChest sorting and block accessing issues.

Inventory Holders are more efficiently organized with this update, as a lot of logic was rather over-engineered.

Only top-level change with this update is that the sort command now gives feedback when sorting has been completed.

Author: Setloth

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.setloth</groupId>
     <artifactId>ModificationMaster</artifactId>
-    <version>1.6</version>
+    <version>1.7</version>
     <packaging>jar</packaging>
 
     <name>ModificationMaster</name>

src/main/java/me/setloth/modificationMaster/ModificationMaster.java

@@ -18,6 +18,18 @@ public final class ModificationMaster extends JavaPlugin {
 
   static ModificationMaster INSTANCE;
 
+  public static Plugin instance() {
+    return INSTANCE;
+  }
+
+  public static void log(String msg) {
+    log(msg, Level.INFO);
+  }
+
+  public static void log(String msg, Level level) {
+    INSTANCE.getLogger().log(level, msg);
+  }
+
   @Override
   @SuppressWarnings("all")
   public void onEnable() {
@@ -27,11 +39,12 @@ public void onEnable() {
     String ver = this.getPluginMeta().getVersion();
     String latestVer = VersionChecker.latestVersion();
 
-    log("Initializing plugin version "+ver);
+    log("Initializing plugin version " + ver);
     if (!ver.equals(latestVer)) {
-      log("\n\nPlugin is outdated!\nYour Version: "+ver+"\nLatest Version: "+latestVer+"\n\nFetch" +
-              " " +
-              "updates at https://github.com/Setloth/ModificationMaster\n\n", Level.WARNING);
+      log("\n\nPlugin is outdated!\nYour Version: " + ver + "\nLatest Version: " + latestVer + "\n\nFetch" +
+              " updates at https://github.com/Setloth/ModificationMaster\n\n", Level.WARNING);
+    } else {
+      log("\n\nPlugin is up to date at " + latestVer + "\n\nFetch updates at https://github.com/Setloth/ModificationMaster\n\n");
     }
 
     // Plugin startup logic
@@ -46,24 +59,12 @@ public void onEnable() {
     Objects.requireNonNull(getServer().getPluginCommand("craft")).setExecutor(new Craft());
     Objects.requireNonNull(getServer().getPluginCommand("veintoggle")).setExecutor(new VeinToggle());
 
-    log("Done! Took: "+(System.currentTimeMillis()-start)+" ms");
+    log("Done! Took: " + (System.currentTimeMillis() - start) + " ms");
   }
 
   @Override
   public void onDisable() {
     // Plugin shutdown logic
     log("Goodbye :(");
   }
-
-  public static Plugin instance() {
-    return INSTANCE;
-  }
-
-  public static void log(String msg) {
-    log(msg, Level.INFO);
-  }
-
-  public static void log(String msg, Level level) {
-    INSTANCE.getLogger().log(level, msg);
-  }
 }

src/main/java/me/setloth/modificationMaster/commands/Sort.java

@@ -1,8 +1,10 @@
 package me.setloth.modificationMaster.commands;
 
-import me.setloth.modificationMaster.util.Utility;
+import me.setloth.modificationMaster.util.SortSystem;
+import net.kyori.adventure.text.Component;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
+import org.bukkit.block.DoubleChest;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -31,11 +33,17 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
 
       BlockState bs = b.getState();
 
-      if (!(bs instanceof InventoryHolder ih)) return false;
-      inv = ih.getInventory();
+      if (bs instanceof InventoryHolder ih) {
+        if (ih instanceof DoubleChest dc) {
+          inv = dc.getInventory();
+        } else inv = ih.getInventory();
+
+      } else return false;
     }
 
-    Utility.sort(inv);
+    SortSystem.sort(inv);
+    p.sendMessage(inv.getType().defaultTitle().appendSpace().append(Component.text("has been " +
+            "sorted")));
 
     return true;
   }

src/main/java/me/setloth/modificationMaster/commands/VeinToggle.java

@@ -1,6 +1,6 @@
 package me.setloth.modificationMaster.commands;
 
-import me.setloth.modificationMaster.util.VeinToggled;
+import me.setloth.modificationMaster.util.VeinSystem;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -11,9 +11,9 @@ public class VeinToggle implements CommandExecutor {
   public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
     if (!(sender instanceof Player p)) return true;
 
-    VeinToggled.toggleVeinPlayer(p);
+    VeinSystem.toggleVeinPlayer(p);
+    VeinSystem.statusMessage(p);
 
-    VeinToggled.statusMessage(p);
     return true;
   }
 }

src/main/java/me/setloth/modificationMaster/listeners/BlockBreaking.java

@@ -1,7 +1,6 @@
 package me.setloth.modificationMaster.listeners;
 
-import me.setloth.modificationMaster.util.Utility;
-import me.setloth.modificationMaster.util.VeinToggled;
+import me.setloth.modificationMaster.util.VeinSystem;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -16,28 +15,24 @@ public class BlockBreaking implements Listener {
   public void onBlockBreak(BlockBreakEvent event) {
     Player p = event.getPlayer();
 
-    if (!VeinToggled.isVeinToggled(p)) return;
+    if (!VeinSystem.isVeinToggled(p)) return;
 
     Block b = event.getBlock();
     ItemStack stack = p.getInventory().getItemInMainHand();
 
     if (!b.isPreferredTool(stack)) return;
 
-    VeinToggled.toggleVeinPlayer(p);
+    VeinSystem.toggleVeinPlayer(p);
 
-    if (Utility.isWood(b.getType())) {
-      Utility.destroyBranch(p, b, false);
+    if (VeinSystem.isWood(b.getType())) {
+      VeinSystem.destroyBranch(p, b, false);
     }
-    if (Utility.isVeinBlock(b.getType())) {
-      Utility.destroyBranch(p, b, true);
+    if (VeinSystem.isOreBlock(b.getType())) {
+      VeinSystem.destroyBranch(p, b, true);
     }
 
-    VeinToggled.toggleVeinPlayer(p);
+    VeinSystem.toggleVeinPlayer(p);
   }
 
 
-
-
-
-
 }

src/main/java/me/setloth/modificationMaster/listeners/RightClickToggle.java

@@ -1,7 +1,6 @@
 package me.setloth.modificationMaster.listeners;
 
-import me.setloth.modificationMaster.util.Utility;
-import me.setloth.modificationMaster.util.VeinToggled;
+import me.setloth.modificationMaster.util.VeinSystem;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -28,11 +27,11 @@ public void onRightClick(PlayerInteractEvent event) {
     ItemStack stack = p.getInventory().getItemInMainHand();
     if (tb == null || !tb.isPreferredTool(stack)) return;
 
-    if (Utility.isWood(tb.getType()) || Utility.isVeinBlock(tb.getType())) { // only apply for
+    if (VeinSystem.isWood(tb.getType()) || VeinSystem.isOreBlock(tb.getType())) { // only apply for
       // vein-mine able blocks
       event.setCancelled(true); // prevent action consequence
-      VeinToggled.toggleVeinPlayer(event.getPlayer());
-      VeinToggled.statusMessage(event.getPlayer());
+      VeinSystem.toggleVeinPlayer(event.getPlayer());
+      VeinSystem.statusMessage(event.getPlayer());
     }
 
 

src/main/java/me/setloth/modificationMaster/util/SortSystem.java

@@ -0,0 +1,78 @@
+package me.setloth.modificationMaster.util;
+
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+
+import java.util.*;
+
+public class SortSystem {
+
+
+  public static ItemStack[] combine(ItemStack[] items) {
+
+    ArrayList<ItemStack> combined = new ArrayList<>();
+
+    for (ItemStack item : items) {
+      if (item == null || item.getAmount() == 0) continue;
+
+      boolean added = false;
+
+      for (ItemStack combinedItem : combined) {
+        if (combinedItem.isSimilar(item)) {
+          int maxStack = combinedItem.getMaxStackSize();
+          int combinedAmount = combinedItem.getAmount() + item.getAmount();
+
+          if (combinedAmount <= maxStack) {
+            combinedItem.setAmount(combinedAmount);
+            added = true;
+
+          } else {
+            combinedItem.setAmount(maxStack);
+            item.setAmount(combinedAmount - maxStack);
+          }
+        }
+      }
+
+      if (!added) combined.add(item);
+
+    }
+
+    ArrayList<ItemStack> sorted = new ArrayList<>();
+    for (ItemStack item : combined) {
+      if (sorted.contains(item)) continue;
+      List<ItemStack> similar = combined.stream().filter(i -> i.isSimilar(item)).toList();
+      sorted.addAll(similar);
+    }
+
+    return sorted.toArray(new ItemStack[0]);
+  }
+
+
+  public static void sort(Inventory inv) {
+    ItemStack[] contents = inv.getContents();
+    if (inv instanceof PlayerInventory pi) {
+      ItemStack[] storageContents = pi.getStorageContents();
+      ItemStack[] hotBar = new ItemStack[9];
+      System.arraycopy(storageContents, 0, hotBar, 0, 9);
+
+      ItemStack[] mainInventory = new ItemStack[storageContents.length - 9];
+      System.arraycopy(storageContents, 9, mainInventory, 0, storageContents.length - 9);
+
+      ItemStack[] sortedMain = combine(mainInventory);
+
+      ItemStack[] combinedContents = new ItemStack[storageContents.length];
+
+      System.arraycopy(hotBar, 0, combinedContents, 0, 9);
+      System.arraycopy(sortedMain, 0, combinedContents, 9, sortedMain.length);
+
+      pi.setStorageContents(combinedContents);
+    } else {
+
+      inv.clear();
+      inv.setContents(combine(contents));
+
+    }
+
+  }
+}