[1.21.5] , various fixes

.github/workflows/ci.yaml

@@ -16,15 +16,15 @@ jobs:
 
     steps:
       - name: Checkout Git repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Restore Gradle cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
 
@@ -35,24 +35,73 @@ jobs:
           java-version: 21
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Build with Gradle
         run: |
           chmod +x gradlew
           ./gradlew build --stacktrace
 
-      - name: Install rename
-        run: sudo apt-get install -y rename
-
-# This is only needed when using shadow jar
-#      - name: Rename file
-#        run: |
-#          cd ./build/libs/
-#          rename -f 's/-all//;' '' *
-
       - name: Archive plugin jars on GitHub
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: AutomaticInventory
           path: build/libs
+          overwrite: 'true'
+
+  release:
+    name: Release
+    needs: build
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+
+    permissions:
+      contents: write  # Required to create/delete tags and releases
+
+    steps:
+      - name: Checkout Git repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Git user
+        run: |
+          git config user.name "github-actions"
+          git config user.email "[email protected]"
+
+      - name: Get short commit SHA
+        id: vars
+        run: echo "sha_short=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
+
+      - name: Delete previous release (if exists)
+        continue-on-error: true
+        run: |
+          gh release delete latest --yes
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Delete previous tag (if exists)
+        continue-on-error: true
+        run: |
+          git tag -d latest || true
+          git push origin :refs/tags/latest || true
+
+      - name: Create new tag
+        run: |
+          git tag latest
+          git push origin latest
+
+      - name: Download artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: AutomaticInventory
+          path: artifacts
+
+      - name: Create GitHub Release
+        run: |
+          ls artifacts  # optional: see what's there
+          gh release create latest artifacts/* \
+            --title "Latest Build (${{ steps.vars.outputs.sha_short }})" \
+            --notes "Automated build from commit ${{ steps.vars.outputs.sha_short }}"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "java.configuration.updateBuildConfiguration": "automatic"
+    "java.configuration.updateBuildConfiguration": "automatic",
+    "java.compile.nullAnalysis.mode": "automatic"
 }

build.gradle.kts

@@ -15,7 +15,7 @@ plugins {
 }
 
 group = "dev.chaws.automaticinventory"
-version = "4.0.0"
+version = "4.1.0"
 description = "Automatic Inventory PaperMC Plugin"
 
 repositories {
@@ -74,7 +74,7 @@ bukkitPluginYaml {
     main = "dev.chaws.automaticinventory.AutomaticInventory"
     // TODO: Try POSTWORLD
     load = BukkitPluginYaml.PluginLoadOrder.STARTUP
-    authors = listOf("Chaws", "Pugabyte", "AllTheCode", "RoboMWM", "Big_Scary")
+    authors = listOf("Bittiez", "Chaws", "Pugabyte", "AllTheCode", "RoboMWM", "Big_Scary")
     apiVersion = "1.21"
     commands.register("autosort") {
         description = "Toggles auto-sorting options."

src/main/java/dev/chaws/automaticinventory/commands/AutoSortCommand.java

@@ -19,7 +19,7 @@
 public class AutoSortCommand extends AutomaticInventoryCommand {
 	@Override
 	public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-		if (!(sender instanceof Player player)) {
+		if (!(sender instanceof Player player) || args.length == 0) {
 			return true;
 		}
 

src/main/java/dev/chaws/automaticinventory/commands/DepositAllCommand.java

@@ -28,6 +28,8 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
 			return true;
 		}
 
+		Chat.sendMessage(player, Level.Info, Messages.StartingDepositAll);
+
 		//gather snapshots of adjacent chunks
 		var location = player.getLocation();
 		var centerChunk = location.getChunk();

src/main/java/dev/chaws/automaticinventory/configuration/PlayerConfig.java

@@ -54,7 +54,7 @@ public static PlayerConfig fromPlayer(Player player) {
 		if (data.isEmpty()) {
 			return new PlayerConfig(player);
 		} else {
-			return (PlayerConfig)data.get(0).value();
+			return (PlayerConfig) data.get(0).value();
 		}
 	}
 
@@ -176,9 +176,9 @@ public void setGotQuickDepositInfo(boolean newValue) {
 	}
 
 	public void saveChanges() {
-        if (!this.isDirty) {
-            return;
-        }
+		if (!this.isDirty) {
+			return;
+		}
 
 		this.waitForLoadComplete();
 		this.savingThread = new Thread(new DataSaver());
@@ -242,17 +242,21 @@ private void readDataFromFile() {
 				needRetry = false;
 				FileConfiguration config = YamlConfiguration.loadConfiguration(this.playerConfigFile);
 				this.sortChests = config.getBoolean("Sort Chests", GlobalConfig.autosortEnabledByDefault);
-				this.sortInventory = config.getBoolean("Sort Personal Inventory", GlobalConfig.autosortEnabledByDefault);
-				this.quickDepositEnabled = config.getBoolean("Quick Deposit Enabled", GlobalConfig.quickDepositEnabledByDefault);
-				this.autoRefillEnabled = config.getBoolean("Auto Refill Enabled", GlobalConfig.autoRefillEnabledByDefault);
+				this.sortInventory = config.getBoolean("Sort Personal Inventory",
+						GlobalConfig.autosortEnabledByDefault);
+				this.quickDepositEnabled = config.getBoolean("Quick Deposit Enabled",
+						GlobalConfig.quickDepositEnabledByDefault);
+				this.autoRefillEnabled = config.getBoolean("Auto Refill Enabled",
+						GlobalConfig.autoRefillEnabledByDefault);
 				this.usedQuickDeposit = config.getBoolean("Used Quick Deposit", false);
 				this.receivedChestSortInfo = config.getBoolean("Received Messages.Chest Inventory", false);
 				this.receivedInventorySortInfo = config.getBoolean("Received Messages.Personal Inventory", false);
 				this.receivedRestackInfo = config.getBoolean("Received Messages.Restacker", false);
 				this.receivedDepositAllInfo = config.getBoolean("Received Messages.Deposit All", false);
 			}
 
-			//if there's any problem with the file's content, retry up to 5 times with 5 milliseconds between
+			// if there's any problem with the file's content, retry up to 5 times with 5
+			// milliseconds between
 			catch (Exception e) {
 				latestException = e;
 				needRetry = true;
@@ -268,10 +272,11 @@ private void readDataFromFile() {
 
 		} while (needRetry && retriesRemaining >= 0);
 
-		//if last attempt failed, log information about the problem
+		// if last attempt failed, log information about the problem
 		if (needRetry) {
 			var errors = new StringWriter();
-			latestException.printStackTrace(new PrintWriter(errors));
+			if (latestException != null)
+				latestException.printStackTrace(new PrintWriter(errors));
 			AutomaticInventory.log.info("Failed to load data for " + playerID + " " + errors);
 		}
 	}

src/main/java/dev/chaws/automaticinventory/listeners/RefillStacksListener.java

@@ -5,7 +5,6 @@
 import dev.chaws.automaticinventory.configuration.GlobalConfig;
 import dev.chaws.automaticinventory.configuration.PlayerConfig;
 import dev.chaws.automaticinventory.tasks.AutoRefillHotBarTask;
-import dev.chaws.automaticinventory.utilities.ItemUtilities;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/dev/chaws/automaticinventory/listeners/SortChestsListener.java

@@ -31,7 +31,7 @@ public void onInventoryOpen(InventoryOpenEvent event) {
 
 		if (!player.isSneaking() && PlayerConfig.featureEnabled(Features.SortChests, player)) {
 			var topInventory = event.getView().getTopInventory();
-			if (!InventoryUtilities.isSortableChestInventory(topInventory, event.getView().getTitle())) {
+			if (!InventoryUtilities.isSortableChestInventory(topInventory, event.getView().title().examinableName())) {
 				return;
 			}
 

src/main/java/dev/chaws/automaticinventory/messaging/LocalizedMessages.java

@@ -47,6 +47,7 @@ public static void initialize(File dataFolder) {
 		instance.addDefault(defaults, Messages.AutoRefillHelp, "Options are /autorefill toggle, /autorefill enable, and /autorefill disable.");
 		instance.addDefault(defaults, Messages.AutoRefillEnabled, "Auto refill enabled.");
 		instance.addDefault(defaults, Messages.AutoRefillDisabled, "Auto refill disabled.");
+		instance.addDefault(defaults, Messages.StartingDepositAll, "Checking for items to deposit.. This may take a moment.");
 
 		//load the configuration file
 		FileConfiguration config = YamlConfiguration.loadConfiguration(localizationFile);
@@ -108,12 +109,10 @@ synchronized public String getMessage(Messages messageID, String... args) {
 	}
 
 	private static class LocalizedMessage {
-		public Messages id;
 		public String text;
 		public String notes;
 
 		public LocalizedMessage(Messages id, String text, String notes) {
-			this.id = id;
 			this.text = text;
 			this.notes = notes;
 		}

src/main/java/dev/chaws/automaticinventory/messaging/Messages.java

@@ -22,5 +22,6 @@ public enum Messages {
 	QuickDepositDisabled,
 	AutoRefillHelp,
 	AutoRefillEnabled,
-	AutoRefillDisabled
+	AutoRefillDisabled,
+	StartingDepositAll,
 }

src/main/java/dev/chaws/automaticinventory/tasks/AsyncChestDepositTask.java

@@ -184,7 +184,11 @@ public void run() {
 				var state = block.getState();
 				if (state instanceof InventoryHolder chest) {
 					var chestInventory = chest.getInventory();
-					if (!this.respectExclusions || InventoryUtilities.isSortableChestInventory(chestInventory, state instanceof Nameable nameable ? nameable.getCustomName() : null)) {
+					String name = chest.getClass().getSimpleName();
+					if (state instanceof Nameable nameable && nameable.customName() != null) {
+						name = nameable.customName().toString();
+					}
+					if (!this.respectExclusions || InventoryUtilities.isSortableChestInventory(chestInventory, name)) {
 						var playerInventory = player.getInventory();
 
 						var deposits = InventoryUtilities.depositMatching(playerInventory, chestInventory, false);
@@ -195,7 +199,7 @@ public void run() {
 			}
 
 			var chain = new QuickDepositChain(this.remainingChestLocations, this.runningDepositRecord, this.player, this.respectExclusions);
-			Bukkit.getScheduler().runTaskLater(AutomaticInventory.instance, chain, 1L);
+			Bukkit.getScheduler().runTaskLater(AutomaticInventory.instance, chain, 5L);
 		}
 	}
 }

src/main/java/dev/chaws/automaticinventory/tasks/AutoRefillHotBarTask.java

@@ -3,7 +3,6 @@
 import dev.chaws.automaticinventory.configuration.PlayerConfig;
 import dev.chaws.automaticinventory.messaging.Messages;
 import dev.chaws.automaticinventory.utilities.Chat;
-import dev.chaws.automaticinventory.utilities.ItemUtilities;
 import dev.chaws.automaticinventory.utilities.Level;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;

src/main/java/dev/chaws/automaticinventory/tasks/InventorySorter.java

@@ -1,12 +1,10 @@
 package dev.chaws.automaticinventory.tasks;
 
-import org.bukkit.craftbukkit.util.CraftMagicNumbers;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 
 public class InventorySorter implements Runnable {
@@ -73,18 +71,11 @@ public int compare(ItemStack a, ItemStack b) {
 				return result;
 			}
 
-            //noinspection removal
-            var aData = a.getData();
-			//noinspection removal
-			var bData = b.getData();
+			var aMeta = a.getItemMeta();
+			var bMeta = b.getItemMeta();
 
-            //noinspection deprecation
-            var aDataData = aData == null ? null : aData.getData();
-			//noinspection deprecation
-			var bDataData = bData == null ? null : bData.getData();
-
-			if (aDataData != null && bDataData != null) {
-				result = Byte.compare(bDataData, aDataData);
+			if (aMeta != null && bMeta != null) {
+				result = bMeta.toString().compareTo(aMeta.toString());
 				if (result != 0) {
 					return result;
 				}

src/main/java/dev/chaws/automaticinventory/utilities/BlockUtilities.java

@@ -1,6 +1,5 @@
 package dev.chaws.automaticinventory.utilities;
 
-import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.block.Barrel;
 import org.bukkit.block.Block;