Bump version to 4.4.6 for release

* Update to 1.21

* Add new InventoryView methods

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/workflows/automerge_dependabot.yml

@@ -0,0 +1,55 @@
+name: Auto-merge Dependabot PRs
+
+on:
+  workflow_run:
+    workflows: [ "Pull Request" ]
+    types: [ completed ]
+
+jobs:
+  merge-dependabot:
+    if: "github.actor == 'dependabot[bot]'
+      && github.event.workflow_run.event == 'pull_request'
+      && github.event.workflow_run.conclusion == 'success'"
+    runs-on: ubuntu-latest
+    steps:
+      # Note: this is directly from GitHub's example for using data from a triggering workflow:
+      # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#using-data-from-the-triggering-workflow
+      - name: 'Download artifact'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: context.payload.workflow_run.id,
+            });
+            let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "pr_number"
+            })[0];
+            let download = await github.rest.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            let fs = require('fs');
+            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/pr_number.zip`, Buffer.from(download.data));
+
+      # This might be a useless use of cat, but I'm not sure what shell Actions is going to be running.
+      - name: Add Pull Number Variable
+        run: |-
+          unzip pr_number.zip
+          echo "PR_NUMBER=$(cat pr_number)" >> "$GITHUB_ENV"
+
+      - name: Approve
+        uses: hmarr/auto-approve-action@v4.0.0
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+          pull-request-number: "${{ env.PR_NUMBER }}"
+      - name: Merge
+        uses: pascalgn/automerge-action@v0.16.3
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_LABELS: "dependencies,java"
+          MERGE_METHOD: "squash"
+          PULL_REQUEST: "${{ env.PR_NUMBER }}"

.github/workflows/ci.yml

@@ -2,31 +2,26 @@ name: OpenInv CI
 
 on:
   push:
-  pull_request_target:
+    branches:
+      - '**'
+    tags-ignore:
+      - '**'
+  # Enable running CI via other Actions, i.e. for drafting releases and handling PRs.
+  workflow_call:
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Set Up Java
-        uses: actions/setup-java@v2
+      - uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-version: '17'
+          distribution: 'temurin'
+          java-version: '21'
+          cache: 'maven'
 
-      # Use cache to speed up build
-      - name: Cache Maven Repo
-        uses: actions/cache@v2
-        id: cache
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-
-      # Install Spigot dependencies.
-      # This script uses Maven to check all required installations and ensure that they are present.
+      # Install Spigot dependencies if necessary.
       - name: Install Spigot Dependencies
         run: . scripts/install_spigot_dependencies.sh
 
@@ -36,42 +31,13 @@ jobs:
       # Upload artifacts
       - name: Upload Distributable Jar
         id: upload-final
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: dist
           path: ./target/OpenInv.jar
       - name: Upload API Jar
         id: upload-api
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: api
           path: ./api/target/openinvapi*.jar
-
-  release:
-    name: Create Github Release
-    needs: [ build ]
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set Release Variables
-        run: bash ./scripts/set_release_env.sh
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-
-      - name: Create Release
-        id: create-release
-        uses: softprops/action-gh-release@v0.1.5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          name: ${{ env.VERSIONED_NAME }}
-          body: ${{ env.GENERATED_CHANGELOG }}
-          draft: true
-          prerelease: false
-          files: ./dist/OpenInv.jar

.github/workflows/draft_release.yml

@@ -0,0 +1,39 @@
+name: Draft Github Release
+
+on:
+  push:
+    tags:
+      - '**'
+
+jobs:
+  run-ci:
+    uses: Jikoo/OpenInv/.github/workflows/ci.yml@master
+  draft-release:
+    needs: [ run-ci ]
+    runs-on: ubuntu-latest
+    steps:
+      # Fetch all history - used to assemble changelog.
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set Release Variables
+        run: bash ./scripts/set_release_env.sh
+
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist
+
+      - name: Create Release
+        id: create-release
+        uses: softprops/action-gh-release@v2.0.5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          name: ${{ env.VERSIONED_NAME }}
+          body: ${{ env.GENERATED_CHANGELOG }}
+          draft: true
+          prerelease: false
+          files: ./dist/OpenInv.jar

.github/workflows/external_release.yml

@@ -9,12 +9,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Fetch Github Release Asset
-        uses: dsaltares/fetch-gh-release-asset@0.0.5
+        uses: dsaltares/fetch-gh-release-asset@1.1.2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           version: ${{ github.event.release.id }}

.github/workflows/pull_request.yml

@@ -0,0 +1,22 @@
+name: Pull Request
+
+on:
+  pull_request:
+
+jobs:
+  run-ci:
+    uses: Jikoo/OpenInv/.github/workflows/ci.yml@master
+  store-dependabot-pr-data:
+    if: "github.actor == 'dependabot[bot]' && github.event_name == 'pull_request'"
+    runs-on: ubuntu-latest
+    steps:
+      # Note: this is directly from GitHub's example for using data from a triggering workflow:
+      # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#using-data-from-the-triggering-workflow
+      - name: Store Pull Number
+        run: |
+          mkdir -p ./pr
+          echo ${{ github.event.number }} > ./pr/pr_number
+      - uses: actions/upload-artifact@v4
+        with:
+          name: pr_number
+          path: pr/

api/pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2021 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2022 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
-    <version>4.1.10</version>
+    <version>4.4.6</version>
   </parent>
 
   <artifactId>openinvapi</artifactId>

api/src/main/java/com/lishid/openinv/IOpenInv.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,9 +22,7 @@ import com.lishid.openinv.internal.ISpecialEnderChest;
 import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import com.lishid.openinv.util.InventoryAccess;
-import com.lishid.openinv.util.StringMetric;
 import java.util.UUID;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -36,272 +34,254 @@ import org.jetbrains.annotations.Nullable;
 
 /**
  * Interface defining behavior for the OpenInv plugin.
- *
- * @author Jikoo
  */
 public interface IOpenInv {
 
     /**
-     * Check the configuration value for whether or not OpenInv saves player data when unloading
-     * players. This is exclusively for users who do not allow editing of inventories, only viewing,
-     * and wish to prevent any possibility of bugs such as lishid#40. If true, OpenInv will not ever
-     * save any edits made to players.
-     *
-     * @return false unless configured otherwise
-     */
-    boolean disableSaving();
-
-    /**
-     * Gets the active ISilentContainer implementation.
-     *
-     * @return the ISilentContainer
-     * @throws IllegalStateException if the server version is unsupported
-     */
-    @NotNull IAnySilentContainer getAnySilentContainer();
-
-    /**
-     * Gets the active IInventoryAccess implementation.
-     *
-     * @return the IInventoryAccess
-     * @throws IllegalStateException if the server version is unsupported
-     */
-    @Deprecated
-    default @NotNull IInventoryAccess getInventoryAccess() {
-        return new InventoryAccess();
-    }
-
-    /**
-     * Gets the provided player's AnyChest setting.
-     *
-     * @param player the OfflinePlayer
-     * @return true if AnyChest is enabled
-     * @throws IllegalStateException if the server version is unsupported
-     */
-    boolean getPlayerAnyChestStatus(@NotNull OfflinePlayer player);
-
-    /**
-     * Gets a unique identifier by which the OfflinePlayer can be referenced. Using the value
-     * returned to look up a Player will generally be much faster for later implementations.
-     *
-     * @param offline the OfflinePlayer
-     * @return the identifier
-     * @throws IllegalStateException if the server version is unsupported
-     */
-    default @NotNull String getPlayerID(@NotNull OfflinePlayer offline) {
-        return offline.getUniqueId().toString();
-    }
-
-    /**
-     * Gets a player's SilentChest setting.
-     *
-     * @param offline the OfflinePlayer
-     * @return true if SilentChest is enabled
-     * @throws IllegalStateException if the server version is unsupported
-     */
-    boolean getPlayerSilentChestStatus(@NotNull OfflinePlayer offline);
-
-    /**
-     * Gets an ISpecialEnderChest for the given Player.
-     *
-     * @param player the Player
-     * @param online true if the Player is currently online
-     * @return the ISpecialEnderChest
-     * @throws IllegalStateException  if the server version is unsupported
-     * @throws InstantiationException if the ISpecialEnderChest could not be instantiated
-     */
-    @NotNull ISpecialEnderChest getSpecialEnderChest(@NotNull Player player, boolean online) throws InstantiationException;
-
-    /**
-     * Gets an ISpecialPlayerInventory for the given Player.
-     *
-     * @param player the Player
-     * @param online true if the Player is currently online
-     * @return the ISpecialPlayerInventory
-     * @throws IllegalStateException  if the server version is unsupported
-     * @throws InstantiationException if the ISpecialPlayerInventory could not be instantiated
-     */
-    @NotNull ISpecialPlayerInventory getSpecialInventory(@NotNull Player player, boolean online) throws InstantiationException;
-
-    /**
-     * Checks if the server version is supported by OpenInv.
+     * Check if the server version is supported by OpenInv.
      *
      * @return true if the server version is supported
      */
     boolean isSupportedVersion();
 
     /**
-     * Load a Player from an OfflinePlayer. May return null under some circumstances.
+     * Check the configuration value for whether OpenInv saves player data when unloading players. This is exclusively
+     * for users who do not allow editing of inventories, only viewing, and wish to prevent any possibility of bugs such
+     * as lishid#40. If true, OpenInv will not ever save any edits made to players.
      *
-     * @param offline the OfflinePlayer to load a Player for
-     * @return the Player, or null
+     * @return false unless configured otherwise
+     */
+    boolean disableSaving();
+
+    /**
+     * Check the configuration value for whether OpenInv allows offline access. If true, OpenInv will not load or allow
+     * modification of players while they are not online. This does not prevent other plugins from using existing loaded
+     * players who have gone offline.
+     *
+     * @return false unless configured otherwise
+     * @since 4.2.0
+     */
+    boolean disableOfflineAccess();
+
+    /**
+     * Check the configuration value for whether OpenInv uses history for opening commands. If false, OpenInv will use
+     * the previous parameterized search when no parameters are provided.
+     *
+     * @return false unless configured otherwise
+     * @since 4.3.0
+     */
+    boolean noArgsOpensSelf();
+
+    /**
+     * Get the active {@link IAnySilentContainer} implementation.
+     *
+     * @return the active implementation for the server version
+     * @throws IllegalStateException if the server version is unsupported
+     */
+    @NotNull IAnySilentContainer getAnySilentContainer();
+
+    /**
+     * @deprecated Use static {@link InventoryAccess} methods.
+     */
+    @Deprecated(forRemoval = true)
+    default @NotNull IInventoryAccess getInventoryAccess() {
+        return new InventoryAccess();
+    }
+
+    /**
+     * @deprecated Use {@link #getAnyContainerStatus(OfflinePlayer)}. Not all containers are chests.
+     */
+    @Deprecated(forRemoval = true, since = "4.2.0")
+    default boolean getPlayerAnyChestStatus(@NotNull OfflinePlayer offline) {
+        return getAnyContainerStatus(offline);
+    }
+
+    /**
+     * Get whether a user has AnyContainer mode enabled.
+     *
+     * @param offline the user to obtain the state of
+     * @return true if AnyContainer mode is enabled
+     */
+    boolean getAnyContainerStatus(@NotNull OfflinePlayer offline);
+
+    /**
+     * @deprecated Use {@link #setAnyContainerStatus(OfflinePlayer, boolean)}. Not all containers are chests.
+     */
+    @Deprecated(forRemoval = true, since = "4.2.0")
+    default void setPlayerAnyChestStatus(@NotNull OfflinePlayer offline, boolean status) {
+        setAnyContainerStatus(offline, status);
+    }
+
+    /**
+     * Set whether a user has AnyContainer mode enabled.
+     *
+     * @param offline the user to set the state of
+     * @param status the state of the mode
+     */
+    void setAnyContainerStatus(@NotNull OfflinePlayer offline, boolean status);
+
+    /**
+     * @deprecated Use {@link #getSilentContainerStatus(OfflinePlayer)}. Not all containers are chests.
+     */
+    @Deprecated(forRemoval = true, since = "4.2.0")
+    default boolean getPlayerSilentChestStatus(@NotNull OfflinePlayer offline) {
+        return getSilentContainerStatus(offline);
+    }
+
+    /**
+     * Get whether a user has SilentContainer mode enabled.
+     *
+     * @param offline the user to obtain the state of
+     * @return true if SilentContainer mode is enabled
+     */
+    boolean getSilentContainerStatus(@NotNull OfflinePlayer offline);
+
+    /**
+     * @deprecated Use {@link #setSilentContainerStatus(OfflinePlayer, boolean)}. Not all containers are chests.
+     */
+    @Deprecated(forRemoval = true, since = "4.2.0")
+    default void setPlayerSilentChestStatus(@NotNull OfflinePlayer offline, boolean status) {
+        setSilentContainerStatus(offline, status);
+    }
+
+    /**
+     * Set whether a user has SilentContainer mode enabled.
+     *
+     * @param offline the user to set the state of
+     * @param status the state of the mode
+     */
+    void setSilentContainerStatus(@NotNull OfflinePlayer offline, boolean status);
+
+    /**
+     * Get a unique identifier by which the OfflinePlayer can be referenced.
+     *
+     * @deprecated Use {@link OfflinePlayer#getUniqueId()} and {@link UUID#toString()}. This was necessary for non-UUID
+     * versions of Minecraft, but support for them has been dropped for years.
+     * @param offline the OfflinePlayer
+     * @return the identifier
+     * @throws IllegalStateException if the server version is unsupported
+     */
+    @Deprecated(forRemoval = true)
+    default @NotNull String getPlayerID(@NotNull OfflinePlayer offline) {
+        return offline.getUniqueId().toString();
+    }
+
+    /**
+     * Get an {@link ISpecialEnderChest} for a user.
+     *
+     * @param player the {@link Player} owning the inventory
+     * @param online whether the owner is currently online
+     * @return the created inventory
+     * @throws IllegalStateException if the server version is unsupported
+     * @throws InstantiationException if there was an issue creating the inventory
+     */
+    @NotNull ISpecialEnderChest getSpecialEnderChest(@NotNull Player player, boolean online) throws InstantiationException;
+
+    /**
+     * Get an {@link ISpecialPlayerInventory} for a user.
+     *
+     * @param player the {@link Player} owning the inventory
+     * @param online whether the owner is currently online
+     * @return the created inventory
+     * @throws IllegalStateException if the server version is unsupported
+     * @throws InstantiationException if there was an issue creating the inventory
+     */
+    @NotNull ISpecialPlayerInventory getSpecialInventory(@NotNull Player player, boolean online) throws InstantiationException;
+
+    /**
+     * Open an {@link ISpecialInventory} for a {@link Player}.
+     *
+     * @param player the viewer
+     * @param inventory the inventory to open
+     * @return the resulting {@link InventoryView}
+     */
+    @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory);
+
+    /**
+     * Check if a {@link Player} is currently loaded by OpenInv.
+     *
+     * @param playerUuid the {@link UUID} of the {@code Player}
+     * @return whether the {@code Player} is loaded
+     * @since 4.2.0
+     */
+    boolean isPlayerLoaded(@NotNull UUID playerUuid);
+
+    /**
+     * Load a {@link Player} from an {@link OfflinePlayer}. If the user has not played before or the default world for
+     * the server is not loaded, this will return {@code null}.
+     *
+     * @param offline the {@code OfflinePlayer} to load a {@code Player} for
+     * @return the loaded {@code Player}
      * @throws IllegalStateException if the server version is unsupported
      */
     @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline);
 
     /**
-     * Get an OfflinePlayer by name.
-     * <p>
-     * Note: This method is potentially very heavily blocking. It should not ever be called on the
+     * Match an existing {@link OfflinePlayer}. If the name is a {@link UUID#toString() UUID string}, this will only
+     * return the user if they have actually played on the server before, unlike {@link Bukkit#getOfflinePlayer(UUID)}.
+     *
+     * <p>This method is potentially very heavily blocking. It should not ever be called on the
      * main thread, and if it is, a stack trace will be displayed alerting server owners to the
      * call.
      *
-     * @param name the name of the Player
-     * @return the OfflinePlayer with the closest matching name or null if no players have ever logged in
+     * @param name the string to match
+     * @return the user with the closest matching name
      */
-    default @Nullable OfflinePlayer matchPlayer(@NotNull String name) {
-
-        // Warn if called on the main thread - if we resort to searching offline players, this may take several seconds.
-        if (Bukkit.getServer().isPrimaryThread()) {
-            this.getLogger().warning("Call to OpenInv#matchPlayer made on the main thread!");
-            this.getLogger().warning("This can cause the server to hang, potentially severely.");
-            this.getLogger().log(Level.WARNING, new Throwable("Current stack trace"), () -> "Current stack trace");
-        }
-
-        OfflinePlayer player;
-
-        try {
-            UUID uuid = UUID.fromString(name);
-            player = Bukkit.getOfflinePlayer(uuid);
-            // Ensure player is a real player, otherwise return null
-            if (player.hasPlayedBefore() || player.isOnline()) {
-                return player;
-            }
-        } catch (IllegalArgumentException ignored) {
-            // Not a UUID
-        }
-
-        player = Bukkit.getServer().getPlayerExact(name);
-
-        if (player != null) {
-            return player;
-        }
-
-        player = Bukkit.getServer().getOfflinePlayer(name);
-
-        if (player.hasPlayedBefore()) {
-            return player;
-        }
-
-        player = Bukkit.getServer().getPlayer(name);
-
-        if (player != null) {
-            return player;
-        }
-
-        float bestMatch = 0;
-        for (OfflinePlayer offline : Bukkit.getServer().getOfflinePlayers()) {
-            if (offline.getName() == null) {
-                // Loaded by UUID only, name has never been looked up.
-                continue;
-            }
-
-            float currentMatch = StringMetric.compareJaroWinkler(name, offline.getName());
-
-            if (currentMatch == 1.0F) {
-                return offline;
-            }
-
-            if (currentMatch > bestMatch) {
-                bestMatch = currentMatch;
-                player = offline;
-            }
-        }
-
-        // Only null if no players have played ever, otherwise even the worst match will do.
-        return player;
-    }
+    @Nullable OfflinePlayer matchPlayer(@NotNull String name);
 
     /**
-     * Open an ISpecialInventory for a Player.
-     *
-     * @param player the Player
-     * @param inventory the ISpecialInventory
-     * @return the InventoryView for the opened ISpecialInventory
+     * @deprecated OpenInv uses action bar chat for notifications. Whether they show is based on language settings.
      */
-    @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory);
-
-    /**
-     * Check the configuration value for whether or not OpenInv displays a notification to the user
-     * when a container is activated with AnyChest.
-     *
-     * @return true unless configured otherwise
-     * @deprecated OpenInv uses action bar chat for notifications. Whether or not they show is based on language settings.
-     */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     default boolean notifyAnyChest() {
         return true;
     }
 
     /**
-     * Check the configuration value for whether or not OpenInv displays a notification to the user
-     * when a container is activated with SilentChest.
-     *
-     * @return true unless configured otherwise
-     * @deprecated OpenInv uses action bar chat for notifications. Whether or not they show is based on language settings.
+     * @deprecated OpenInv uses action bar chat for notifications. Whether they show is based on language settings.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     default boolean notifySilentChest() {
         return true;
     }
 
     /**
-     * Mark a Player as no longer in use by a Plugin to allow OpenInv to remove it from the cache
-     * when eligible.
-     *
-     * @param player the Player
-     * @param plugin the Plugin no longer holding a reference to the Player
-     * @throws IllegalStateException if the server version is unsupported
+     * @deprecated see {@link #retainPlayer(Player, Plugin)}
      */
-    void releasePlayer(@NotNull Player player, @NotNull Plugin plugin);
+    @Deprecated(forRemoval = true, since = "4.2.0")
+    default void releasePlayer(@NotNull Player player, @NotNull Plugin plugin) {}
 
     /**
-     * Mark a Player as in use by a Plugin to prevent it from being removed from the cache. Used to
-     * prevent issues with multiple copies of the same Player being loaded such as lishid#49.
-     * Changes made to loaded copies overwrite changes to the others when saved, leading to
-     * duplication bugs and more.
-     * <p>
-     * When finished with the Player object, be sure to call {@link #releasePlayer(Player, Plugin)}
-     * to prevent the cache from keeping it stored until the plugin is disabled.
-     * <p>
-     * When using a Player object from OpenInv, you must handle the Player coming online, replacing
-     * your Player reference with the Player from the PlayerJoinEvent. In addition, you must change
-     * any values in the Player to reflect any unsaved alterations to the existing Player which do
-     * not affect the inventory or ender chest contents.
-     * <p>
-     * OpenInv only saves player data when unloading a Player from the cache, and then only if
-     * {@link #disableSaving()} returns false. If you are making changes that OpenInv does not cause
-     * to persist when a Player logs in as noted above, it is suggested that you manually call
-     * {@link Player#saveData()} when releasing your reference to ensure your changes persist.
+     * @deprecated OpenInv no longer uses an internal cache beyond maintaining copies of currently open inventories.
+     * If you wish to use/modify a player, ensure either {@link IOpenInv#isPlayerLoaded(UUID)} is false or the player
+     * instance is the same memory address as the one in use by OpenInv.
+     * <pre>
+     *  public &#64;NotNull Player savePlayerData(&#64;NotNull Player player) {
+     *     IOpenInv openInv = ...
+     *     if (!openInv.disableSaving() && openInv.isPlayerLoaded(player.getUniqueId())) {
+     *         Player openInvLoadedPlayer = openInv.loadPlayer(myInUsePlayer);
+     *         if (openInvLoadedPlayer != player) {
+     *             // The copy loaded by OpenInv is not the same as our loaded copy. Push our changes.
+     *             copyPlayerModifications(player, openInvLoadedPlayer);
+     *         }
+     *         // OpenInv will handle saving data when the player is unloaded.
+     *         // Optionally, to be sure our changes will persist, save now.
+     *         // openInvLoadedPlayer.saveData();
+     *         return openInvLoadedPlayer;
+     *     }
      *
-     * @param player the Player
-     * @param plugin the Plugin holding the reference to the Player
-     * @throws IllegalStateException if the server version is unsupported
+     *     player.saveData();
+     *     return player;
+     * }
+     * </pre>
      */
-    void retainPlayer(@NotNull Player player, @NotNull Plugin plugin);
+    @Deprecated(forRemoval = true, since = "4.2.0")
+    default void retainPlayer(@NotNull Player player, @NotNull Plugin plugin) {}
 
     /**
-     * Sets a player's AnyChest setting.
+     * Forcibly close inventories of and unload any cached data for a user.
      *
-     * @param offline the OfflinePlayer
-     * @param status the status
-     * @throws IllegalStateException if the server version is unsupported
-     */
-    void setPlayerAnyChestStatus(@NotNull OfflinePlayer offline, boolean status);
-
-    /**
-     * Sets a player's SilentChest setting.
-     *
-     * @param offline the OfflinePlayer
-     * @param status the status
-     * @throws IllegalStateException if the server version is unsupported
-     */
-    void setPlayerSilentChestStatus(@NotNull OfflinePlayer offline, boolean status);
-
-    /**
-     * Forcibly unload a cached Player's data.
-     *
-     * @param offline the OfflinePlayer to unload
-     * @throws IllegalStateException if the server version is unsupported
+     * @param offline the {@link OfflinePlayer} to unload
      */
     void unload(@NotNull OfflinePlayer offline);
 

api/src/main/java/com/lishid/openinv/event/OpenPlayerSaveEvent.java

@@ -0,0 +1,74 @@
+package com.lishid.openinv.event;
+
+import com.lishid.openinv.internal.ISpecialInventory;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Event fired before OpenInv saves a player's data.
+ */
+public class OpenPlayerSaveEvent extends Event implements Cancellable {
+
+  private static final HandlerList HANDLERS = new HandlerList();
+
+  private final Player player;
+  private final ISpecialInventory inventory;
+  private boolean cancelled = false;
+
+  public OpenPlayerSaveEvent(@NotNull Player player, @NotNull ISpecialInventory inventory) {
+    this.player = player;
+    this.inventory = inventory;
+  }
+
+  /**
+   * Get the {@link Player} whose data is being saved.
+   *
+   * @return player the Player whose data is being saved
+   */
+  public @NotNull Player getPlayer() {
+    return player;
+  }
+
+  /**
+   * Get the {@link ISpecialInventory} that triggered the save by being closed.
+   *
+   * @return the special inventory
+   */
+  public @NotNull ISpecialInventory getInventory() {
+    return inventory;
+  }
+
+  /**
+   * Get whether the event is cancelled.
+   *
+   * @return true if the event is cancelled
+   */
+  @Override
+  public boolean isCancelled() {
+    return cancelled;
+  }
+
+  /**
+   * Set whether the event is cancelled.
+   *
+   * @param cancel whether the event is cancelled
+   */
+  @Override
+  public void setCancelled(boolean cancel) {
+    this.cancelled = cancel;
+  }
+
+  @NotNull
+  @Override
+  public HandlerList getHandlers() {
+    return HANDLERS;
+  }
+
+  public static HandlerList getHandlerList() {
+    return HANDLERS;
+  }
+
+}

api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
 
 package com.lishid.openinv.internal;
 
-import org.bukkit.Material;
 import org.bukkit.block.Barrel;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -24,48 +23,49 @@ import org.bukkit.block.BlockState;
 import org.bukkit.block.EnderChest;
 import org.bukkit.block.ShulkerBox;
 import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Directional;
 import org.bukkit.block.data.type.Chest;
 import org.bukkit.entity.Cat;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.util.BoundingBox;
 import org.jetbrains.annotations.NotNull;
 
 public interface IAnySilentContainer {
 
     /**
-     * Opens the container at the given coordinates for the Player. If you do not want blocked
-     * containers to open, be sure to check {@link #isAnyContainerNeeded(Block)}
-     * first.
+     * Forcibly open the container at the given coordinates for the Player. This will open blocked containers! Be sure
+     * to check {@link #isAnyContainerNeeded(Block)} first if that is not desirable.
      *
-     * @param player    the Player opening the container
-     * @param silent    whether the container's noise is to be silenced
-     * @param block     the Block
+     * @param player the {@link Player} opening the container
+     * @param silent whether the container's noise is to be silenced
+     * @param block  the {@link Block} of the container
      * @return true if the container can be opened
      */
     boolean activateContainer(@NotNull Player player, boolean silent, @NotNull Block block);
 
     /**
-     * Closes the Player's currently open container silently, if necessary.
+     * Perform operations required to close the current container silently.
      *
-     * @param player the Player closing a container
+     * @param player the {@link Player} closing a container
      */
     void deactivateContainer(@NotNull Player player);
 
     /**
-     * @deprecated use {@link #isAnyContainerNeeded(Block)}
      * @param player the player opening the container
-     * @param block the block
+     * @param block  the {@link Block} of the container
      * @return true if the container is blocked
+     * @deprecated use {@link #isAnyContainerNeeded(Block)}
      */
-    @Deprecated
+    @Deprecated(forRemoval = true, since = "4.1.9")
     default boolean isAnyContainerNeeded(@NotNull Player player, @NotNull Block block) {
         return isAnyContainerNeeded(block);
     }
 
     /**
-     * Checks if the container at the given coordinates is blocked.
+     * Check if the container at the given coordinates is blocked.
      *
-     * @param block  the Block
+     * @param block the {@link Block} of the container
      * @return true if the container is blocked
      */
     default boolean isAnyContainerNeeded(@NotNull Block block) {
@@ -81,11 +81,9 @@ public interface IAnySilentContainer {
             return block.getRelative(0, 1, 0).getType().isOccluding();
         }
 
-        // Shulker boxes require 1/2 a block clear in the direction they open.
+        // Shulker boxes require half a block clear in the direction they open.
         if (blockState instanceof ShulkerBox) {
-            if (isShulkerBlocked((ShulkerBox) blockState)) {
-                return true;
-            }
+            return isShulkerBlocked(block);
         }
 
         if (!(blockState instanceof org.bukkit.block.Chest)) {
@@ -97,11 +95,10 @@ public interface IAnySilentContainer {
         }
 
         BlockData blockData = block.getBlockData();
-        if (!(blockData instanceof Chest) || ((Chest) blockData).getType() == Chest.Type.SINGLE) {
+        if (!(blockData instanceof Chest chest) || ((Chest) blockData).getType() == Chest.Type.SINGLE) {
             return false;
         }
 
-        Chest chest = (Chest) blockData;
         int ordinal = (chest.getFacing().ordinal() + 4 + (chest.getType() == Chest.Type.RIGHT ? -1 : 1)) % 4;
         BlockFace relativeFace = BlockFace.values()[ordinal];
         org.bukkit.block.Block relative = block.getRelative(relativeFace);
@@ -111,11 +108,10 @@ public interface IAnySilentContainer {
         }
 
         BlockData relativeData = relative.getBlockData();
-        if (!(relativeData instanceof Chest)) {
+        if (!(relativeData instanceof Chest relativeChest)) {
             return false;
         }
 
-        Chest relativeChest = (Chest) relativeData;
         if (relativeChest.getFacing() != chest.getFacing()
                 || relativeChest.getType() != (chest.getType() == Chest.Type.RIGHT ? Chest.Type.LEFT : Chest.Type.RIGHT)) {
             return false;
@@ -124,34 +120,78 @@ public interface IAnySilentContainer {
         return isChestBlocked(relative);
     }
 
-    boolean isShulkerBlocked(ShulkerBox block);
-
     /**
-     * Determine whether or not a chest is blocked.
+     * Check if a {@link ShulkerBox} cannot be opened under ordinary circumstances.
      *
-     * @param chest the chest block
-     * @return true if the chest block cannot be opened under ordinary circumstances
+     * @deprecated Use {@link #isShulkerBlocked(Block)}.
+     * @param shulkerBox the shulker box container
+     * @return whether the container is blocked
      */
-    default boolean isChestBlocked(Block chest) {
-        org.bukkit.block.Block relative = chest.getRelative(0, 1, 0);
-        return relative.getType().isOccluding()
-                || chest.getWorld().getNearbyEntities(BoundingBox.of(relative), entity -> entity instanceof Cat).size() > 0;
+    @Deprecated(since = "4.4.4", forRemoval = true)
+    default boolean isShulkerBlocked(@NotNull ShulkerBox shulkerBox) {
+        return isShulkerBlocked(shulkerBox.getBlock());
     }
 
     /**
-     * Checks if the given block is a container which can be unblocked or silenced.
+     * Check if a shulker box block cannot be opened under ordinary circumstances.
      *
-     * @param block the BlockState
-     * @return true if the Block is a supported container
+     * @param shulkerBox the shulker box block
+     * @return whether the container is blocked
+     */
+    default boolean isShulkerBlocked(@NotNull Block shulkerBox) {
+        Directional directional = (Directional) shulkerBox.getBlockData();
+        BlockFace facing = directional.getFacing();
+        BoundingBox box = new BoundingBox(0, 0, 0, 1, 1, 1);
+        box.expand(facing, 0.5);
+        box.shift(facing.getOppositeFace().getDirection());
+        return shulkerBox.getRelative(facing).getCollisionShape().overlaps(box);
+    }
+
+    /**
+     * Check if a chest cannot be opened under ordinary circumstances.
+     *
+     * @param chest the chest block
+     * @return whether the container is blocked
+     */
+    default boolean isChestBlocked(@NotNull Block chest) {
+        org.bukkit.block.Block relative = chest.getRelative(0, 1, 0);
+        return relative.getType().isOccluding()
+                || !chest.getWorld().getNearbyEntities(BoundingBox.of(relative), Cat.class::isInstance).isEmpty();
+    }
+
+    /**
+     * Check if the given {@link Block} is a container which can be unblocked or silenced.
+     *
+     * @param block the potential container
+     * @return true if the type is a supported container
      */
     default boolean isAnySilentContainer(@NotNull Block block) {
-        if (block.getType() == Material.ENDER_CHEST) {
-            return true;
-        }
-        BlockState state = block.getState();
-        return state instanceof org.bukkit.block.Chest
-                || state instanceof org.bukkit.block.ShulkerBox
-                || state instanceof org.bukkit.block.Barrel;
+        return isAnySilentContainer(block.getState());
+    }
+
+    /**
+     * Check if the given {@link BlockState} is a container which can be unblocked or silenced.
+     *
+     * @param blockState the potential container
+     * @return true if the type is a supported container
+     */
+    default boolean isAnySilentContainer(@NotNull BlockState blockState) {
+        return blockState instanceof InventoryHolder holder && isAnySilentContainer(holder)
+                || blockState instanceof EnderChest;
+    }
+
+    /**
+     * Check if the given {@link InventoryHolder} is a container which can be unblocked or silenced.
+     *
+     * @param holder the potential container
+     * @return true if the type is a supported container
+     */
+    default boolean isAnySilentContainer(@NotNull InventoryHolder holder) {
+        return holder instanceof org.bukkit.block.EnderChest
+                || holder instanceof org.bukkit.block.Chest
+                || holder instanceof org.bukkit.block.DoubleChest
+                || holder instanceof org.bukkit.block.ShulkerBox
+                || holder instanceof org.bukkit.block.Barrel;
     }
 
 }

api/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,49 +16,47 @@
 
 package com.lishid.openinv.internal;
 
+import com.lishid.openinv.util.InventoryAccess;
 import org.bukkit.inventory.Inventory;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-@Deprecated
+/**
+ * @deprecated Use static {@link InventoryAccess} methods.
+ */
+@Deprecated(forRemoval = true)
 public interface IInventoryAccess {
 
     /**
-     * Gets an ISpecialEnderChest from an Inventory or null if the Inventory is not backed by an
-     * ISpecialEnderChest.
-     *
-     * @param inventory the Inventory
-     * @return the ISpecialEnderChest or null
+     * @deprecated Use static {@link InventoryAccess} methods.
      */
-    @Deprecated
-    @Nullable ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory);
+    @Deprecated(forRemoval = true)
+    default @Nullable ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
+        return InventoryAccess.getEnderChest(inventory);
+    }
 
     /**
-     * Gets an ISpecialPlayerInventory from an Inventory or null if the Inventory is not backed by
-     * an ISpecialPlayerInventory.
-     *
-     * @param inventory the Inventory
-     * @return the ISpecialPlayerInventory or null
+     * @deprecated Use static {@link InventoryAccess} methods.
      */
-    @Deprecated
-    @Nullable ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory);
+    @Deprecated(forRemoval = true)
+    default @Nullable ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
+        return InventoryAccess.getPlayerInventory(inventory);
+    }
 
     /**
-     * Check if an Inventory is an ISpecialEnderChest implementation.
-     *
-     * @param inventory the Inventory
-     * @return true if the Inventory is backed by an ISpecialEnderChest
+     * @deprecated Use static {@link InventoryAccess} methods.
      */
-    @Deprecated
-    boolean isSpecialEnderChest(@NotNull Inventory inventory);
+    @Deprecated(forRemoval = true)
+    default boolean isSpecialEnderChest(@NotNull Inventory inventory) {
+        return InventoryAccess.isEnderChest(inventory);
+    }
 
     /**
-     * Check if an Inventory is an ISpecialPlayerInventory implementation.
-     *
-     * @param inventory the Inventory
-     * @return true if the Inventory is backed by an ISpecialPlayerInventory
+     * @deprecated Use static {@link InventoryAccess} methods.
      */
-    @Deprecated
-    boolean isSpecialPlayerInventory(@NotNull Inventory inventory);
+    @Deprecated(forRemoval = true)
+    default boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
+        return InventoryAccess.isPlayerInventory(inventory);
+    }
 
 }

api/src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,6 +16,9 @@
 
 package com.lishid.openinv.internal;
 
+/**
+ * An {@link ISpecialInventory} representing an ender chest.
+ */
 public interface ISpecialEnderChest extends ISpecialInventory {
 
 }

api/src/main/java/com/lishid/openinv/internal/ISpecialInventory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,38 +21,43 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.jetbrains.annotations.NotNull;
 
+/**
+ * Interface defining behavior for special inventories backed by other inventories' content listings.
+ */
 public interface ISpecialInventory {
 
     /**
-     * Gets the Inventory associated with this ISpecialInventory.
+     * Get the {@link Inventory} associated with this {@code ISpecialInventory}.
      *
-     * @return the Inventory
+     * @return the Bukkit inventory
      */
     @NotNull Inventory getBukkitInventory();
 
     /**
-     * Sets the Player associated with this ISpecialInventory online.
+     * Set the owning {@link Player} instance to a newly-joined user.
      *
-     * @param player the Player coming online
+     * @param player the user coming online
      */
     void setPlayerOnline(@NotNull Player player);
 
     /**
-     * Sets the Player associated with this ISpecialInventory offline.
+     * Mark the owner of the inventory offline.
      */
     void setPlayerOffline();
 
     /**
-     * Gets whether or not this ISpecialInventory is in use.
+     * Get whether the inventory is being viewed by any users.
      *
-     * @return true if the ISpecialInventory is in use
+     * @return true if the inventory is being viewed
      */
-    boolean isInUse();
+    default boolean isInUse() {
+        return !getBukkitInventory().getViewers().isEmpty();
+    }
 
     /**
-     * Gets the Player associated with this ISpecialInventory.
+     * Get the {@link Player} who owns the inventory.
      *
-     * @return the HumanEntity
+     * @return the {@link HumanEntity} who owns the inventory
      */
     @NotNull HumanEntity getPlayer();
 

api/src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,6 +16,35 @@
 
 package com.lishid.openinv.internal;
 
+import java.util.List;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+/**
+ * An {@link ISpecialInventory} representing a player inventory.
+ */
 public interface ISpecialPlayerInventory extends ISpecialInventory {
 
+    /*
+     * Player inventory usage varies from all other inventories - as the inventory is technically open at all times,
+     * if the player is online or has been online while the inventory is open, they are in the viewer list.
+     */
+    @Override
+    default boolean isInUse() {
+        Inventory inventory = getBukkitInventory();
+        List<HumanEntity> viewers = inventory.getViewers();
+
+        if (viewers.size() != 1) {
+            return !viewers.isEmpty();
+        }
+
+        HumanEntity viewer = viewers.get(0);
+
+        if (!viewer.getUniqueId().equals(getPlayer().getUniqueId())) {
+            return true;
+        }
+
+        return viewer.getOpenInventory().getTopInventory().equals(inventory);
+    }
+
 }

api/src/main/java/com/lishid/openinv/util/InventoryAccess.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ import org.bukkit.inventory.Inventory;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class InventoryAccess implements IInventoryAccess {
+public final class InventoryAccess implements IInventoryAccess {
 
     private static Class<?> craftInventory = null;
     private static Method getInventory = null;
@@ -35,16 +35,14 @@ public class InventoryAccess implements IInventoryAccess {
         String packageName = Bukkit.getServer().getClass().getPackage().getName();
         try {
             craftInventory = Class.forName(packageName + ".inventory.CraftInventory");
-        } catch (ClassNotFoundException ignored) {}
-        try {
             getInventory = craftInventory.getDeclaredMethod("getInventory");
-        } catch (NoSuchMethodException ignored) {}
+        } catch (ClassNotFoundException | NoSuchMethodException ignored) {}
     }
 
     /**
      * @deprecated use {@link #isUsable()}
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public static boolean isUseable() {
         return isUsable();
     }
@@ -53,25 +51,51 @@ public class InventoryAccess implements IInventoryAccess {
         return craftInventory != null && getInventory != null;
     }
 
+    /**
+     * Check if an {@link Inventory} is an {@link ISpecialPlayerInventory} implementation.
+     *
+     * @param inventory the Bukkit inventory
+     * @return true if backed by the correct implementation
+     */
     public static boolean isPlayerInventory(@NotNull Inventory inventory) {
         return getPlayerInventory(inventory) != null;
     }
 
+    /**
+     * Get the {@link ISpecialPlayerInventory} backing an {@link Inventory}. Returns {@code null} if the inventory is
+     * not backed by the correct class.
+     *
+     * @param inventory the Bukkit inventory
+     * @return the backing implementation if available
+     */
     public static @Nullable ISpecialPlayerInventory getPlayerInventory(@NotNull Inventory inventory) {
         return getSpecialInventory(ISpecialPlayerInventory.class, inventory);
     }
 
+    /**
+     * Check if an {@link Inventory} is an {@link ISpecialEnderChest} implementation.
+     *
+     * @param inventory the Bukkit inventory
+     * @return true if backed by the correct implementation
+     */
     public static boolean isEnderChest(@NotNull Inventory inventory) {
         return getEnderChest(inventory) != null;
     }
 
+    /**
+     * Get the {@link ISpecialEnderChest} backing an {@link Inventory}. Returns {@code null} if the inventory is
+     * not backed by the correct class.
+     *
+     * @param inventory the Bukkit inventory
+     * @return the backing implementation if available
+     */
     public static @Nullable ISpecialEnderChest getEnderChest(@NotNull Inventory inventory) {
         return getSpecialInventory(ISpecialEnderChest.class, inventory);
     }
 
     private static <T extends ISpecialInventory> @Nullable T getSpecialInventory(@NotNull Class<T> expected, @NotNull Inventory inventory) {
         Object inv;
-        if (craftInventory != null && getInventory != null && craftInventory.isAssignableFrom(inventory.getClass())) {
+        if (isUsable() && craftInventory.isAssignableFrom(inventory.getClass())) {
             try {
                 inv = getInventory.invoke(inventory);
                 if (expected.isInstance(inv)) {
@@ -90,28 +114,10 @@ public class InventoryAccess implements IInventoryAccess {
         return null;
     }
 
-    @Deprecated
-    @Override
-    public @Nullable ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
-        return getEnderChest(inventory);
-    }
-
-    @Deprecated
-    @Override
-    public @Nullable ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
-        return getPlayerInventory(inventory);
-    }
-
-    @Deprecated
-    @Override
-    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
-        return isEnderChest(inventory);
-    }
-
-    @Deprecated
-    @Override
-    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
-        return isPlayerInventory(inventory);
-    }
+    /**
+     * @deprecated Do not create a new instance to use static methods.
+     */
+    @Deprecated(forRemoval = true, since = "4.2.0")
+    public InventoryAccess() {}
 
 }

assembly/pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2021 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2022 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>4.1.10</version>
+    <version>4.4.6</version>
   </parent>
 
   <artifactId>openinvassembly</artifactId>

internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/OpenPlayer.java

@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_17_R1;
-
-import java.io.File;
-import net.minecraft.Util;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtIo;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.storage.PlayerDataStorage;
-import org.apache.logging.log4j.LogManager;
-import org.bukkit.craftbukkit.v1_17_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
-
-public class OpenPlayer extends CraftPlayer {
-
-    public OpenPlayer(CraftServer server, ServerPlayer entity) {
-        super(server, entity);
-    }
-
-    @Override
-    public void loadData() {
-        // See CraftPlayer#loadData
-        CompoundTag loaded = this.server.getHandle().playerIo.load(this.getHandle());
-        if (loaded != null) {
-            readExtraData(loaded);
-        }
-    }
-
-    @Override
-    public void saveData() {
-        ServerPlayer player = this.getHandle();
-        // See net.minecraft.world.level.storage.PlayerDataStorage#save(EntityHuman)
-        try {
-            PlayerDataStorage worldNBTStorage = player.server.getPlayerList().playerIo;
-
-            CompoundTag playerData = player.saveWithoutId(new CompoundTag());
-            setExtraData(playerData);
-
-            if (!isOnline()) {
-                // Special case: save old vehicle data
-                CompoundTag oldData = worldNBTStorage.load(player);
-
-                if (oldData != null && oldData.contains("RootVehicle", 10)) {
-                    // See net.minecraft.server.PlayerList#a(NetworkManager, EntityPlayer) and net.minecraft.server.EntityPlayer#b(NBTTagCompound)
-                    playerData.put("RootVehicle", oldData.getCompound("RootVehicle"));
-                }
-            }
-
-            File file = File.createTempFile(player.getStringUUID() + "-", ".dat", worldNBTStorage.getPlayerDir());
-            NbtIo.writeCompressed(playerData, file);
-            File file1 = new File(worldNBTStorage.getPlayerDir(), player.getStringUUID() + ".dat");
-            File file2 = new File(worldNBTStorage.getPlayerDir(), player.getStringUUID() + ".dat_old");
-            Util.safeReplaceFile(file1, file, file2);
-        } catch (Exception e) {
-            LogManager.getLogger().warn("Failed to save player data for {}", player.getName().getString());
-        }
-    }
-
-}

internal/v1_18_R1/src/main/java/com/lishid/openinv/internal/v1_18_R1/OpenPlayer.java

@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_18_R1;
-
-import java.io.File;
-import net.minecraft.Util;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtIo;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.storage.PlayerDataStorage;
-import org.apache.logging.log4j.LogManager;
-import org.bukkit.craftbukkit.v1_18_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer;
-
-public class OpenPlayer extends CraftPlayer {
-
-    public OpenPlayer(CraftServer server, ServerPlayer entity) {
-        super(server, entity);
-    }
-
-    @Override
-    public void loadData() {
-        // See CraftPlayer#loadData
-        CompoundTag loaded = this.server.getHandle().playerIo.load(this.getHandle());
-        if (loaded != null) {
-            readExtraData(loaded);
-        }
-    }
-
-    @Override
-    public void saveData() {
-        ServerPlayer player = this.getHandle();
-        // See net.minecraft.world.level.storage.PlayerDataStorage#save(EntityHuman)
-        try {
-            PlayerDataStorage worldNBTStorage = player.server.getPlayerList().playerIo;
-
-            CompoundTag playerData = player.saveWithoutId(new CompoundTag());
-            setExtraData(playerData);
-
-            if (!isOnline()) {
-                // Special case: save old vehicle data
-                CompoundTag oldData = worldNBTStorage.load(player);
-
-                if (oldData != null && oldData.contains("RootVehicle", 10)) {
-                    // See net.minecraft.server.PlayerList#a(NetworkManager, EntityPlayer) and net.minecraft.server.EntityPlayer#b(NBTTagCompound)
-                    playerData.put("RootVehicle", oldData.getCompound("RootVehicle"));
-                }
-            }
-
-            File file = File.createTempFile(player.getStringUUID() + "-", ".dat", worldNBTStorage.getPlayerDir());
-            NbtIo.writeCompressed(playerData, file);
-            File file1 = new File(worldNBTStorage.getPlayerDir(), player.getStringUUID() + ".dat");
-            File file2 = new File(worldNBTStorage.getPlayerDir(), player.getStringUUID() + ".dat_old");
-            Util.safeReplaceFile(file1, file, file2);
-        } catch (Exception e) {
-            LogManager.getLogger().warn("Failed to save player data for {}", player.getName().getString());
-        }
-    }
-
-}

internal/v1_18_R2/src/main/java/com/lishid/openinv/internal/v1_18_R2/OpenPlayer.java

@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_18_R2;
-
-import java.io.File;
-import net.minecraft.Util;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtIo;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.storage.PlayerDataStorage;
-import org.apache.logging.log4j.LogManager;
-import org.bukkit.craftbukkit.v1_18_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
-
-public class OpenPlayer extends CraftPlayer {
-
-    public OpenPlayer(CraftServer server, ServerPlayer entity) {
-        super(server, entity);
-    }
-
-    @Override
-    public void loadData() {
-        // See CraftPlayer#loadData
-        CompoundTag loaded = this.server.getHandle().playerIo.load(this.getHandle());
-        if (loaded != null) {
-            readExtraData(loaded);
-        }
-    }
-
-    @Override
-    public void saveData() {
-        ServerPlayer player = this.getHandle();
-        // See net.minecraft.world.level.storage.PlayerDataStorage#save(EntityHuman)
-        try {
-            PlayerDataStorage worldNBTStorage = player.server.getPlayerList().playerIo;
-
-            CompoundTag playerData = player.saveWithoutId(new CompoundTag());
-            setExtraData(playerData);
-
-            if (!isOnline()) {
-                // Special case: save old vehicle data
-                CompoundTag oldData = worldNBTStorage.load(player);
-
-                if (oldData != null && oldData.contains("RootVehicle", 10)) {
-                    // See net.minecraft.server.PlayerList#a(NetworkManager, EntityPlayer) and net.minecraft.server.EntityPlayer#b(NBTTagCompound)
-                    playerData.put("RootVehicle", oldData.getCompound("RootVehicle"));
-                }
-            }
-
-            File file = File.createTempFile(player.getStringUUID() + "-", ".dat", worldNBTStorage.getPlayerDir());
-            NbtIo.writeCompressed(playerData, file);
-            File file1 = new File(worldNBTStorage.getPlayerDir(), player.getStringUUID() + ".dat");
-            File file2 = new File(worldNBTStorage.getPlayerDir(), player.getStringUUID() + ".dat_old");
-            Util.safeReplaceFile(file1, file, file2);
-        } catch (Exception e) {
-            LogManager.getLogger().warn("Failed to save player data for {}", player.getName().getString());
-        }
-    }
-
-}

internal/v1_20_R3/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2011-2022 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2023 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -23,16 +23,16 @@
     <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
     <relativePath>../../pom.xml</relativePath>
-    <version>4.1.10</version>
+    <version>4.4.6</version>
   </parent>
 
-  <artifactId>openinvadapter1_18_R1</artifactId>
-  <name>OpenInvAdapter1_18_R1</name>
+  <artifactId>openinvadapter1_20_R3</artifactId>
+  <name>OpenInvAdapter1_20_R3</name>
 
   <properties>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
-    <spigot.version>1.18.1-R0.1-SNAPSHOT</spigot.version>
+    <spigot.version>1.20.4-R0.1-SNAPSHOT</spigot.version>
   </properties>
 
   <dependencies>
@@ -51,6 +51,7 @@
     <dependency>
       <artifactId>openinvapi</artifactId>
       <groupId>com.lishid</groupId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <artifactId>openinvplugincore</artifactId>
@@ -66,10 +67,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <!-- Cannot use minimizeJar until maven-shade-plugin 3.3.0 releases; ASM used does not support Java 17. -->
-        <configuration>
-          <minimizeJar>false</minimizeJar>
-        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

internal/v1_20_R3/src/main/java/com/lishid/openinv/internal/v1_20_R3/AnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,21 +14,16 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_18_R2;
+package com.lishid.openinv.internal.v1_20_R3;
 
 import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IAnySilentContainer;
 import com.lishid.openinv.util.ReflectionHelper;
-import java.lang.reflect.Field;
-import java.util.Optional;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.level.ServerPlayerGameMode;
-import net.minecraft.world.CompoundContainer;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.SimpleMenuProvider;
 import net.minecraft.world.entity.monster.Shulker;
@@ -39,26 +34,27 @@ import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.block.BarrelBlock;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.ChestBlock;
-import net.minecraft.world.level.block.DoubleBlockCombiner;
 import net.minecraft.world.level.block.ShulkerBoxBlock;
 import net.minecraft.world.level.block.TrappedChestBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.ChestBlockEntity;
 import net.minecraft.world.level.block.entity.EnderChestBlockEntity;
 import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity;
 import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
 import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.Statistic;
 import org.bukkit.block.ShulkerBox;
-import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.reflect.Field;
+import java.util.logging.Logger;
+
 public class AnySilentContainer implements IAnySilentContainer {
 
     private @Nullable Field serverPlayerGameModeGameType;
@@ -66,8 +62,6 @@ public class AnySilentContainer implements IAnySilentContainer {
     public AnySilentContainer() {
         try {
             try {
-                // IDE warns about field not existing, but SpecialSource does not remap strings used in reflection.
-                // The warning is not suppressed as a reminder that it must manually be checked on updates.
                 this.serverPlayerGameModeGameType = ServerPlayerGameMode.class.getDeclaredField("b");
                 this.serverPlayerGameModeGameType.setAccessible(true);
             } catch (NoSuchFieldException e) {
@@ -81,25 +75,25 @@ public class AnySilentContainer implements IAnySilentContainer {
         } catch (SecurityException e) {
             Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger();
             logger.warning("Unable to directly write player game mode! SilentContainer will fail.");
-            logger.log(Level.WARNING, "Error obtaining GameType field", e);
+            logger.log(java.util.logging.Level.WARNING, "Error obtaining GameType field", e);
         }
     }
 
     @Override
-    public boolean isShulkerBlocked(ShulkerBox box) {
-        org.bukkit.World bukkitWorld = box.getWorld();
+    public boolean isShulkerBlocked(@NotNull ShulkerBox shulkerBox) {
+        org.bukkit.World bukkitWorld = shulkerBox.getWorld();
         if (!(bukkitWorld instanceof CraftWorld)) {
             bukkitWorld = Bukkit.getWorld(bukkitWorld.getUID());
         }
 
         if (!(bukkitWorld instanceof CraftWorld craftWorld)) {
             Exception exception = new IllegalStateException("AnySilentContainer access attempted on an unknown world!");
-            OpenInv.getPlugin(OpenInv.class).getLogger().log(Level.WARNING, exception.getMessage(), exception);
+            OpenInv.getPlugin(OpenInv.class).getLogger().log(java.util.logging.Level.WARNING, exception.getMessage(), exception);
             return false;
         }
 
         final ServerLevel world = craftWorld.getHandle();
-        final BlockPos blockPosition = new BlockPos(box.getX(), box.getY(), box.getZ());
+        final BlockPos blockPosition = new BlockPos(shulkerBox.getX(), shulkerBox.getY(), shulkerBox.getZ());
         final BlockEntity tile = world.getBlockEntity(blockPosition);
 
         if (!(tile instanceof ShulkerBoxBlockEntity shulkerBoxBlockEntity)
@@ -131,7 +125,7 @@ public class AnySilentContainer implements IAnySilentContainer {
 
         ServerPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
-        final ServerLevel level = player.getLevel();
+        final net.minecraft.world.level.Level level = player.level();
         final BlockPos blockPos = new BlockPos(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
         final BlockEntity blockEntity = level.getBlockEntity(blockPos);
 
@@ -147,7 +141,7 @@ public class AnySilentContainer implements IAnySilentContainer {
                 MenuType<?> containers = PlayerDataManager.getContainers(enderChest.getContainerSize());
                 int rows = enderChest.getContainerSize() / 9;
                 return new ChestMenu(containers, containerCounter, playerInventory, enderChest, rows);
-            }, new TranslatableComponent("container.enderchest")));
+            }, Component.translatable(("container.enderchest"))));
             bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
             return true;
         }
@@ -162,33 +156,13 @@ public class AnySilentContainer implements IAnySilentContainer {
         if (block instanceof ChestBlock chestBlock) {
 
             // boolean flag: do not check if chest is blocked
-            Optional<MenuProvider> menuOptional = chestBlock.combine(blockState, level, blockPos, true).apply(
-                    // Combiner is a copy of private ChestBlock.MENU_PROVIDER_COMBINER
-                    new DoubleBlockCombiner.Combiner<ChestBlockEntity, Optional<MenuProvider>>() {
-                        @Override
-                        public Optional<MenuProvider> acceptDouble(ChestBlockEntity localChest1, ChestBlockEntity localChest2) {
-                            CompoundContainer doubleChest = new CompoundContainer(localChest1, localChest2);
-                            return Optional.of(new ChestBlock.DoubleInventory(localChest1, localChest2, doubleChest));
-                        }
+            menuProvider = chestBlock.getMenuProvider(blockState, level, blockPos, true);
 
-                        @Override
-                        public Optional<MenuProvider> acceptSingle(ChestBlockEntity localChest) {
-                            return Optional.of(localChest);
-                        }
-
-                        @Override
-                        public Optional<MenuProvider> acceptNone() {
-                            return Optional.empty();
-                        }
-                    });
-
-            if (menuOptional.isEmpty()) {
+            if (menuProvider == null) {
                 OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
                 return false;
             }
 
-            menuProvider = menuOptional.get();
-
             if (block instanceof TrappedChestBlock) {
                 bukkitPlayer.incrementStatistic(Statistic.TRAPPED_CHEST_TRIGGERED);
             } else {
@@ -231,21 +205,10 @@ public class AnySilentContainer implements IAnySilentContainer {
 
     @Override
     public void deactivateContainer(@NotNull final Player bukkitPlayer) {
-        if (this.serverPlayerGameModeGameType == null) {
+        if (this.serverPlayerGameModeGameType == null || bukkitPlayer.getGameMode() == GameMode.SPECTATOR) {
             return;
         }
 
-        InventoryView view = bukkitPlayer.getOpenInventory();
-        switch (view.getType()) {
-            case CHEST:
-            case ENDER_CHEST:
-            case SHULKER_BOX:
-            case BARREL:
-                break;
-            default:
-                return;
-        }
-
         ServerPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
         // Force game mode change without informing plugins or players.
@@ -274,7 +237,8 @@ public class AnySilentContainer implements IAnySilentContainer {
             this.serverPlayerGameModeGameType.setAccessible(true);
             this.serverPlayerGameModeGameType.set(player.gameMode, gameMode);
         } catch (IllegalArgumentException | IllegalAccessException e) {
-            e.printStackTrace();
+            Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger();
+            logger.log(java.util.logging.Level.WARNING, "Error bypassing GameModeChangeEvent", e);
         }
     }
 

internal/v1_20_R3/src/main/java/com/lishid/openinv/internal/v1_20_R3/OpenPlayer.java

@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_20_R3;
+
+import com.mojang.logging.LogUtils;
+import net.minecraft.Util;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtIo;
+import net.minecraft.nbt.NumericTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.storage.PlayerDataStorage;
+import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Set;
+
+public class OpenPlayer extends CraftPlayer {
+
+    private static final Set<String> RESET_TAGS = Set.of(
+        // net.minecraft.world.Entity#saveWithoutId(CompoundTag)
+        "CustomName",
+        "CustomNameVisible",
+        "Silent",
+        "NoGravity",
+        "Glowing",
+        "TicksFrozen",
+        "HasVisualFire",
+        "Tags",
+        "Passengers",
+        // net.minecraft.server.level.ServerPlayer#addAdditionalSaveData(CompoundTag)
+        // Intentional omissions to prevent mount loss: Attach, Entity, and RootVehicle
+        "warden_spawn_tracker",
+        "enteredNetherPosition",
+        "SpawnX",
+        "SpawnY",
+        "SpawnZ",
+        "SpawnForced",
+        "SpawnAngle",
+        "SpawnDimension",
+        // net.minecraft.world.entity.player.Player#addAdditionalSaveData(CompoundTag)
+        "ShoulderEntityLeft",
+        "ShoulderEntityRight",
+        "LastDeathLocation",
+        // net.minecraft.world.entity.LivingEntity#addAdditionalSaveData(CompoundTag)
+        "ActiveEffects", // Backwards compat: Renamed from 1.19
+        "active_effects",
+        "SleepingX",
+        "SleepingY",
+        "SleepingZ",
+        "Brain"
+    );
+
+    public OpenPlayer(CraftServer server, ServerPlayer entity) {
+        super(server, entity);
+    }
+
+    @Override
+    public void loadData() {
+        PlayerDataManager.loadData(getHandle());
+    }
+
+    @Override
+    public void saveData() {
+        ServerPlayer player = this.getHandle();
+        // See net.minecraft.world.level.storage.PlayerDataStorage#save(EntityHuman)
+        try {
+            PlayerDataStorage worldNBTStorage = player.server.getPlayerList().playerIo;
+
+            CompoundTag oldData = isOnline() ? null : worldNBTStorage.getPlayerData(player.getStringUUID());
+            CompoundTag playerData = getWritableTag(oldData);
+            playerData = player.saveWithoutId(playerData);
+            setExtraData(playerData);
+
+            if (oldData != null) {
+                // Revert certain special data values when offline.
+                revertSpecialValues(playerData, oldData);
+            }
+
+            Path playerDataDir = worldNBTStorage.getPlayerDir().toPath();
+            Path file = Files.createTempFile(playerDataDir, player.getStringUUID() + "-", ".dat");
+            NbtIo.writeCompressed(playerData, file);
+            Path dataFile = playerDataDir.resolve(player.getStringUUID() + ".dat");
+            Path backupFile = playerDataDir.resolve(player.getStringUUID() + ".dat_old");
+            Util.safeReplaceFile(dataFile, file, backupFile);
+        } catch (Exception e) {
+            LogUtils.getLogger().warn("Failed to save player data for {}: {}", player.getScoreboardName(), e);
+        }
+    }
+
+    @Contract("null -> new")
+    private @NotNull CompoundTag getWritableTag(@Nullable CompoundTag oldData) {
+        if (oldData == null) {
+            return new CompoundTag();
+        }
+
+        // Copy old data. This is a deep clone, so operating on it should be safe.
+        oldData = oldData.copy();
+
+        // Remove vanilla/server data that is not written every time.
+        oldData.getAllKeys()
+            .removeIf(key -> RESET_TAGS.contains(key) || key.startsWith("Bukkit"));
+
+        return oldData;
+    }
+
+    private void revertSpecialValues(@NotNull CompoundTag newData, @NotNull CompoundTag oldData) {
+        // Revert automatic updates to play timestamps.
+        copyValue(oldData, newData, "bukkit", "lastPlayed", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastSeen", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastLogin", NumericTag.class);
+    }
+
+    private <T extends Tag> void copyValue(
+        @NotNull CompoundTag source,
+        @NotNull CompoundTag target,
+        @NotNull String container,
+        @NotNull String key,
+        @NotNull Class<T> tagType) {
+        CompoundTag oldContainer = getTag(source, container, CompoundTag.class);
+        CompoundTag newContainer = getTag(target, container, CompoundTag.class);
+
+        // New container being null means the server implementation doesn't store this data.
+        if (newContainer == null) {
+            return;
+        }
+
+        // If old tag exists, copy it to new location, removing otherwise.
+        setTag(newContainer, key, getTag(oldContainer, key, tagType));
+    }
+
+    private <T extends Tag> @Nullable T getTag(
+        @Nullable CompoundTag container,
+        @NotNull String key,
+        @NotNull Class<T> dataType) {
+        if (container == null) {
+            return null;
+        }
+        Tag value = container.get(key);
+        if (value == null || !dataType.isAssignableFrom(value.getClass())) {
+            return null;
+        }
+        return dataType.cast(value);
+    }
+
+    private <T extends Tag> void setTag(
+        @NotNull CompoundTag container,
+        @NotNull String key,
+        @Nullable T data) {
+        if (data == null) {
+            container.remove(key);
+        } else {
+            container.put(key, data);
+        }
+    }
+
+}

internal/v1_20_R3/src/main/java/com/lishid/openinv/internal/v1_20_R3/PlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,46 +14,68 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_17_R1;
+package com.lishid.openinv.internal.v1_20_R3;
 
 import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IPlayerDataManager;
 import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.OpenInventoryView;
 import com.mojang.authlib.GameProfile;
-import java.lang.reflect.Field;
-import java.util.logging.Logger;
-import net.minecraft.network.chat.TextComponent;
+import com.mojang.serialization.Dynamic;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ClientInformation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.ChatVisiblity;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.dimension.DimensionType;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_17_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_17_R1.event.CraftEventFactory;
-import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftContainer;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R3.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftContainer;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryView;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.reflect.Field;
+import java.util.UUID;
+import java.util.logging.Logger;
+
 public class PlayerDataManager implements IPlayerDataManager {
 
+    private static boolean paper;
+
+    static {
+        try {
+            Class.forName("io.papermc.paper.configuration.Configuration");
+            paper = true;
+        } catch (ClassNotFoundException ignored) {
+            paper = false;
+        }
+    }
+
     private @Nullable Field bukkitEntity;
 
     public PlayerDataManager() {
         try {
             bukkitEntity = Entity.class.getDeclaredField("bukkitEntity");
         } catch (NoSuchFieldException e) {
-            Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger();
-            logger.warning("Unable to obtain field to inject custom save process - players' mounts may be deleted when loaded.");
+            Logger logger = JavaPlugin.getPlugin(OpenInv.class).getLogger();
+            logger.warning("Unable to obtain field to inject custom save process - certain player data may be lost when saving!");
             logger.log(java.util.logging.Level.WARNING, e.getMessage(), e);
             bukkitEntity = null;
         }
@@ -73,7 +95,7 @@ public class PlayerDataManager implements IPlayerDataManager {
 
         if (nmsPlayer == null) {
             // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+            throw new RuntimeException("Unable to fetch EntityPlayer from Player implementation " + player.getClass().getName());
         }
 
         return nmsPlayer;
@@ -86,10 +108,6 @@ public class PlayerDataManager implements IPlayerDataManager {
             return null;
         }
 
-        // Create a profile and entity to load the player data
-        // See net.minecraft.server.PlayerList#attemptLogin
-        GameProfile profile = new GameProfile(offline.getUniqueId(),
-                offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
         ServerLevel worldServer = server.getLevel(Level.OVERWORLD);
 
@@ -97,25 +115,105 @@ public class PlayerDataManager implements IPlayerDataManager {
             return null;
         }
 
-        ServerPlayer entity = new ServerPlayer(server, worldServer, profile);
+        // Create a new ServerPlayer.
+        ServerPlayer entity = createNewPlayer(server, worldServer, offline);
+
+        // Stop listening for advancement progression - if this is not cleaned up, loading causes a memory leak.
+        entity.getAdvancements().stopListening();
+
+        // Try to load the player's data.
+        if (loadData(entity)) {
+            // If data is loaded successfully, return the Bukkit entity.
+            return entity.getBukkitEntity();
+        }
+
+        return null;
+    }
+
+    private @NotNull ServerPlayer createNewPlayer(
+        @NotNull MinecraftServer server,
+        @NotNull ServerLevel worldServer,
+        @NotNull final OfflinePlayer offline) {
+        // See net.minecraft.server.players.PlayerList#canPlayerLogin(ServerLoginPacketListenerImpl, GameProfile)
+        // See net.minecraft.server.network.ServerLoginPacketListenerImpl#handleHello(ServerboundHelloPacket)
+        GameProfile profile = new GameProfile(offline.getUniqueId(),
+            offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
+
+        ClientInformation dummyInfo = new ClientInformation(
+            "en_us",
+            1, // Reduce distance just in case.
+            ChatVisiblity.HIDDEN, // Don't accept chat.
+            false,
+            ServerPlayer.DEFAULT_MODEL_CUSTOMIZATION,
+            ServerPlayer.DEFAULT_MAIN_HAND,
+            true,
+            false // Don't list in player list (not that this player is in the list anyway).
+        );
+
+        ServerPlayer entity = new ServerPlayer(server, worldServer, profile, dummyInfo);
 
         try {
             injectPlayer(entity);
         } catch (IllegalAccessException e) {
-            e.printStackTrace();
+            JavaPlugin.getPlugin(OpenInv.class).getLogger().log(
+                java.util.logging.Level.WARNING,
+                e,
+                () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
         }
 
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
+        return entity;
     }
 
-    void injectPlayer(ServerPlayer player) throws IllegalAccessException {
+    static boolean loadData(@NotNull ServerPlayer player) {
+        // See CraftPlayer#loadData
+        CompoundTag loadedData = player.server.getPlayerList().playerIo.load(player);
+
+        if (loadedData == null) {
+            // Exceptions with loading are logged by Mojang.
+            return false;
+        }
+
+        // Read basic data into the player.
+        player.load(loadedData);
+        // Also read "extra" data.
+        player.readAdditionalSaveData(loadedData);
+        // Game type settings are also loaded separately.
+        player.loadGameTypes(loadedData);
+
+        if (paper) {
+            // Paper: world is not loaded by ServerPlayer#load(CompoundTag).
+            parseWorld(player, loadedData);
+        }
+
+        return true;
+    }
+
+    private static void parseWorld(@NotNull ServerPlayer player, @NotNull CompoundTag loadedData) {
+        // See PlayerList#placeNewPlayer
+        World bukkitWorld;
+        if (loadedData.contains("WorldUUIDMost") && loadedData.contains("WorldUUIDLeast")) {
+            // Modern Bukkit world.
+            bukkitWorld = Bukkit.getServer().getWorld(new UUID(loadedData.getLong("WorldUUIDMost"), loadedData.getLong("WorldUUIDLeast")));
+        } else if (loadedData.contains("world", net.minecraft.nbt.Tag.TAG_STRING)) {
+            // Legacy Bukkit world.
+            bukkitWorld = Bukkit.getServer().getWorld(loadedData.getString("world"));
+        } else {
+            // Vanilla player data.
+            DimensionType.parseLegacy(new Dynamic<>(NbtOps.INSTANCE, loadedData.get("Dimension")))
+                .resultOrPartial(JavaPlugin.getPlugin(OpenInv.class).getLogger()::warning)
+                .map(player.server::getLevel)
+                // If ServerLevel exists, set, otherwise move to spawn.
+                .ifPresentOrElse(player::setServerLevel, () -> player.spawnIn(null));
+            return;
+        }
+        if (bukkitWorld == null) {
+            player.spawnIn(null);
+            return;
+        }
+        player.setServerLevel(((CraftWorld) bukkitWorld).getHandle());
+    }
+
+    private void injectPlayer(ServerPlayer player) throws IllegalAccessException {
         if (bukkitEntity == null) {
             return;
         }
@@ -125,22 +223,26 @@ public class PlayerDataManager implements IPlayerDataManager {
         bukkitEntity.set(player, new OpenPlayer(player.server.server, player));
     }
 
-    @NotNull
     @Override
-    public Player inject(@NotNull Player player) {
+    public @NotNull Player inject(@NotNull Player player) {
         try {
             ServerPlayer nmsPlayer = getHandle(player);
+            if (nmsPlayer.getBukkitEntity() instanceof OpenPlayer openPlayer) {
+                return openPlayer;
+            }
             injectPlayer(nmsPlayer);
             return nmsPlayer.getBukkitEntity();
         } catch (IllegalAccessException e) {
-            e.printStackTrace();
+            JavaPlugin.getPlugin(OpenInv.class).getLogger().log(
+                java.util.logging.Level.WARNING,
+                e,
+                () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
             return player;
         }
     }
 
-    @Nullable
     @Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
+    public @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
 
         ServerPlayer nmsPlayer = getHandle(player);
 
@@ -161,7 +263,7 @@ public class PlayerDataManager implements IPlayerDataManager {
             }
         };
 
-        container.setTitle(new TextComponent(view.getTitle()));
+        container.setTitle(Component.literal(view.getTitle()));
         container = CraftEventFactory.callInventoryOpenEvent(nmsPlayer, container);
 
         if (container == null) {
@@ -169,7 +271,7 @@ public class PlayerDataManager implements IPlayerDataManager {
         }
 
         nmsPlayer.connection.send(new ClientboundOpenScreenPacket(container.containerId, container.getType(),
-                new TextComponent(container.getBukkitView().getTitle())));
+                Component.literal(container.getBukkitView().getTitle())));
         nmsPlayer.containerMenu = container;
         nmsPlayer.initMenu(container);
 

internal/v1_20_R3/src/main/java/com/lishid/openinv/internal/v1_20_R3/SpecialEnderChest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,12 +14,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_18_R1;
+package com.lishid.openinv.internal.v1_20_R3;
 
 import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
 import net.minecraft.core.NonNullList;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
@@ -33,13 +30,17 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.EnderChestBlockEntity;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_18_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftInventory;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.InventoryHolder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
 public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpecialEnderChest {
 
     private final CraftInventory inventory;
@@ -60,11 +61,6 @@ public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpe
         return inventory;
     }
 
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
     @Override
     public void setPlayerOffline() {
         this.playerOnline = false;
@@ -72,18 +68,29 @@ public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpe
 
     @Override
     public void setPlayerOnline(@NotNull final org.bukkit.entity.Player player) {
-        if (!this.playerOnline) {
-            try {
-                this.owner = PlayerDataManager.getHandle(player);
-                PlayerEnderChestContainer enderChest = owner.getEnderChestInventory();
-                for (int i = 0; i < enderChest.getContainerSize(); ++i) {
-                    enderChest.setItem(i, this.items.get(i));
-                }
-                this.items = enderChest.items;
-                enderChest.transaction.addAll(this.transaction);
-            } catch (Exception ignored) {}
-            this.playerOnline = true;
+        if (this.playerOnline) {
+            return;
         }
+
+        ServerPlayer offlinePlayer = this.owner;
+        ServerPlayer onlinePlayer = PlayerDataManager.getHandle(player);
+
+        // Set owner to new player.
+        this.owner = onlinePlayer;
+
+        // Set player's ender chest contents to our modified contents.
+        PlayerEnderChestContainer onlineEnderChest = onlinePlayer.getEnderChestInventory();
+        for (int i = 0; i < onlineEnderChest.getContainerSize(); ++i) {
+            onlineEnderChest.setItem(i, this.items.get(i));
+        }
+
+        // Set our item array to the new inventory's array.
+        this.items = onlineEnderChest.items;
+
+        // Add viewers to new inventory.
+        onlineEnderChest.transaction.addAll(offlinePlayer.getEnderChestInventory().transaction);
+
+        this.playerOnline = true;
     }
 
     @Override
@@ -322,7 +329,7 @@ public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpe
 
     @Override
     public String toString() {
-        return this.items.stream().filter((itemStack) -> !itemStack.isEmpty()).collect(Collectors.toList()).toString();
+        return this.items.stream().filter((itemStack) -> !itemStack.isEmpty()).toList().toString();
     }
 
     @Override

internal/v1_20_R3/src/main/java/com/lishid/openinv/internal/v1_20_R3/SpecialPlayerInventory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,16 +14,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_18_R2;
+package com.lishid.openinv.internal.v1_20_R3;
 
 import com.google.common.collect.ImmutableList;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
 import net.minecraft.CrashReport;
 import net.minecraft.CrashReportCategory;
 import net.minecraft.ReportedException;
@@ -33,6 +27,7 @@ import net.minecraft.nbt.ListTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.tags.DamageTypeTags;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.Container;
 import net.minecraft.world.ContainerHelper;
@@ -46,13 +41,20 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftInventory;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.InventoryHolder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
 public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerInventory {
 
     private final CraftInventory inventory;
@@ -77,20 +79,37 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
 
     @Override
     public void setPlayerOnline(@NotNull org.bukkit.entity.Player player) {
-        if (!this.playerOnline) {
-            Player entityPlayer = PlayerDataManager.getHandle(player);
-            entityPlayer.getInventory().transaction.addAll(this.transaction);
-            this.player = entityPlayer;
-            for (int i = 0; i < getContainerSize(); ++i) {
-                this.player.getInventory().setItem(i, getRawItem(i));
-            }
-            this.player.getInventory().selected = this.selected;
-            this.items = this.player.getInventory().items;
-            this.armor = this.player.getInventory().armor;
-            this.offhand = this.player.getInventory().offhand;
-            this.compartments = ImmutableList.of(this.items, this.armor, this.offhand);
-            this.playerOnline = true;
+        if (this.playerOnline) {
+            return;
         }
+
+        Player offlinePlayer = this.player;
+        Player onlinePlayer = PlayerDataManager.getHandle(player);
+        onlinePlayer.getInventory().transaction.addAll(this.transaction);
+
+        // Set owner to new player.
+        this.player = onlinePlayer;
+
+        // Set player's inventory contents to our modified contents.
+        Inventory onlineInventory = onlinePlayer.getInventory();
+        for (int i = 0; i < getContainerSize(); ++i) {
+            onlineInventory.setItem(i, getRawItem(i));
+        }
+        onlineInventory.selected = this.selected;
+
+        // Set our item arrays to the new inventory's arrays.
+        this.items = onlineInventory.items;
+        this.armor = onlineInventory.armor;
+        this.offhand = onlineInventory.offhand;
+        this.compartments = ImmutableList.of(this.items, this.armor, this.offhand);
+
+        // Add existing viewers to new viewer list.
+        Inventory offlineInventory = offlinePlayer.getInventory();
+        // Remove self from listing - player is always a viewer of their own inventory, prevent duplicates.
+        offlineInventory.transaction.remove(offlinePlayer.getBukkitEntity());
+        onlineInventory.transaction.addAll(offlineInventory.transaction);
+
+        this.playerOnline = true;
     }
 
     @Override
@@ -103,12 +122,6 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
         this.playerOnline = false;
     }
 
-    @Override
-    public boolean isInUse() {
-        List<HumanEntity> viewers = this.getViewers();
-        return viewers.size() > 1 || !viewers.isEmpty() && !viewers.get(0).getUniqueId().equals(this.player.getUUID());
-    }
-
     @Override
     public @NotNull HumanEntity getPlayer() {
         return this.player.getBukkitEntity();
@@ -144,7 +157,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
         }
     }
 
-    private static record IndexedCompartment(@Nullable NonNullList<ItemStack> compartment, int index) {}
+    private record IndexedCompartment(@Nullable NonNullList<ItemStack> compartment, int index) {}
 
     private @NotNull SpecialPlayerInventory.IndexedCompartment getIndexedContent(int index) {
         if (index < items.size()) {
@@ -462,7 +475,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
         for (NonNullList<ItemStack> compartment : this.compartments) {
             for (int i = 0; i < compartment.size(); ++i) {
                 if (!compartment.get(i).isEmpty()) {
-                    compartment.get(i).inventoryTick(this.player.level, this.player, i, this.selected == i);
+                    compartment.get(i).inventoryTick(this.player.level(), this.player, i, this.selected == i);
                 }
             }
         }
@@ -708,7 +721,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
 
             for (int index : armorIndices) {
                 ItemStack itemstack = this.armor.get(index);
-                if ((!damagesource.isFire() || !itemstack.getItem().isFireResistant()) && itemstack.getItem() instanceof ArmorItem) {
+                if ((!damagesource.is(DamageTypeTags.IS_FIRE) || !itemstack.getItem().isFireResistant()) && itemstack.getItem() instanceof ArmorItem) {
                     itemstack.hurtAndBreak((int) damage, this.player, localPlayer -> localPlayer.broadcastBreakEvent(EquipmentSlot.byTypeAndIndex(EquipmentSlot.Type.ARMOR, index)));
                 }
             }
@@ -745,7 +758,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
 
     @Override
     public boolean contains(ItemStack itemstack) {
-        return contains(itemStack -> itemStack.isEmpty() && itemStack.sameItem(itemstack));
+        return contains(itemStack -> !itemStack.isEmpty() && itemStack.is(itemstack.getItem()));
     }
 
     @Override

internal/v1_20_R4/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2011-2022 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2023 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -23,16 +23,16 @@
     <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
     <relativePath>../../pom.xml</relativePath>
-    <version>4.1.10</version>
+    <version>4.4.6</version>
   </parent>
 
-  <artifactId>openinvadapter1_18_R2</artifactId>
-  <name>OpenInvAdapter1_18_R2</name>
+  <artifactId>openinvadapter1_20_R4</artifactId>
+  <name>OpenInvAdapter1_20_R4</name>
 
   <properties>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
-    <spigot.version>1.18.2-R0.1-SNAPSHOT</spigot.version>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
+    <spigot.version>1.20.6-R0.1-SNAPSHOT</spigot.version>
   </properties>
 
   <dependencies>
@@ -51,6 +51,7 @@
     <dependency>
       <artifactId>openinvapi</artifactId>
       <groupId>com.lishid</groupId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <artifactId>openinvplugincore</artifactId>
@@ -66,10 +67,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <!-- Cannot use minimizeJar until maven-shade-plugin 3.3.0 releases; ASM used does not support Java 17. -->
-        <configuration>
-          <minimizeJar>false</minimizeJar>
-        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

internal/v1_20_R4/src/main/java/com/lishid/openinv/internal/v1_20_R4/AnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,24 +14,17 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_18_R1;
+package com.lishid.openinv.internal.v1_20_R4;
 
 import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IAnySilentContainer;
 import com.lishid.openinv.util.ReflectionHelper;
-import java.lang.reflect.Field;
-import java.util.Optional;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.server.level.ServerLevel;
+import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.level.ServerPlayerGameMode;
-import net.minecraft.world.CompoundContainer;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.SimpleMenuProvider;
-import net.minecraft.world.entity.monster.Shulker;
 import net.minecraft.world.inventory.ChestMenu;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.inventory.PlayerEnderChestContainer;
@@ -39,26 +32,22 @@ import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.block.BarrelBlock;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.ChestBlock;
-import net.minecraft.world.level.block.DoubleBlockCombiner;
 import net.minecraft.world.level.block.ShulkerBoxBlock;
 import net.minecraft.world.level.block.TrappedChestBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.ChestBlockEntity;
 import net.minecraft.world.level.block.entity.EnderChestBlockEntity;
 import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity;
-import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.AABB;
-import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.Statistic;
-import org.bukkit.block.ShulkerBox;
-import org.bukkit.craftbukkit.v1_18_R1.CraftWorld;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.reflect.Field;
+import java.util.logging.Logger;
+
 public class AnySilentContainer implements IAnySilentContainer {
 
     private @Nullable Field serverPlayerGameModeGameType;
@@ -66,8 +55,6 @@ public class AnySilentContainer implements IAnySilentContainer {
     public AnySilentContainer() {
         try {
             try {
-                // IDE warns about field not existing, but SpecialSource does not remap strings used in reflection.
-                // The warning is not suppressed as a reminder that it must manually be checked on updates.
                 this.serverPlayerGameModeGameType = ServerPlayerGameMode.class.getDeclaredField("b");
                 this.serverPlayerGameModeGameType.setAccessible(true);
             } catch (NoSuchFieldException e) {
@@ -81,41 +68,10 @@ public class AnySilentContainer implements IAnySilentContainer {
         } catch (SecurityException e) {
             Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger();
             logger.warning("Unable to directly write player game mode! SilentContainer will fail.");
-            logger.log(Level.WARNING, "Error obtaining GameType field", e);
+            logger.log(java.util.logging.Level.WARNING, "Error obtaining GameType field", e);
         }
     }
 
-    @Override
-    public boolean isShulkerBlocked(ShulkerBox box) {
-        org.bukkit.World bukkitWorld = box.getWorld();
-        if (!(bukkitWorld instanceof CraftWorld)) {
-            bukkitWorld = Bukkit.getWorld(bukkitWorld.getUID());
-        }
-
-        if (!(bukkitWorld instanceof CraftWorld craftWorld)) {
-            Exception exception = new IllegalStateException("AnySilentContainer access attempted on an unknown world!");
-            OpenInv.getPlugin(OpenInv.class).getLogger().log(Level.WARNING, exception.getMessage(), exception);
-            return false;
-        }
-
-        final ServerLevel world = craftWorld.getHandle();
-        final BlockPos blockPosition = new BlockPos(box.getX(), box.getY(), box.getZ());
-        final BlockEntity tile = world.getBlockEntity(blockPosition);
-
-        if (!(tile instanceof ShulkerBoxBlockEntity shulkerBoxBlockEntity)
-                || shulkerBoxBlockEntity.getAnimationStatus() != ShulkerBoxBlockEntity.AnimationStatus.CLOSED) {
-            return false;
-        }
-
-        BlockState blockState = world.getBlockState(blockPosition);
-
-        // See net.minecraft.world.level.block.ShulkerBoxBlock#canOpen
-        AABB boundingBox = Shulker.getProgressDeltaAabb(blockState.getValue(ShulkerBoxBlock.FACING), 0.0F, 0.5F)
-                .move(blockPosition)
-                .deflate(1.0E-6D);
-        return !world.noCollision(boundingBox);
-    }
-
     @Override
     public boolean activateContainer(
             @NotNull final Player bukkitPlayer,
@@ -131,7 +87,7 @@ public class AnySilentContainer implements IAnySilentContainer {
 
         ServerPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
-        final ServerLevel level = player.getLevel();
+        final net.minecraft.world.level.Level level = player.level();
         final BlockPos blockPos = new BlockPos(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
         final BlockEntity blockEntity = level.getBlockEntity(blockPos);
 
@@ -147,7 +103,7 @@ public class AnySilentContainer implements IAnySilentContainer {
                 MenuType<?> containers = PlayerDataManager.getContainers(enderChest.getContainerSize());
                 int rows = enderChest.getContainerSize() / 9;
                 return new ChestMenu(containers, containerCounter, playerInventory, enderChest, rows);
-            }, new TranslatableComponent("container.enderchest")));
+            }, Component.translatable(("container.enderchest"))));
             bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
             return true;
         }
@@ -162,33 +118,13 @@ public class AnySilentContainer implements IAnySilentContainer {
         if (block instanceof ChestBlock chestBlock) {
 
             // boolean flag: do not check if chest is blocked
-            Optional<MenuProvider> menuOptional = chestBlock.combine(blockState, level, blockPos, true).apply(
-                    // Combiner is a copy of private ChestBlock.MENU_PROVIDER_COMBINER
-                    new DoubleBlockCombiner.Combiner<ChestBlockEntity, Optional<MenuProvider>>() {
-                        @Override
-                        public Optional<MenuProvider> acceptDouble(ChestBlockEntity localChest1, ChestBlockEntity localChest2) {
-                            CompoundContainer doubleChest = new CompoundContainer(localChest1, localChest2);
-                            return Optional.of(new ChestBlock.DoubleInventory(localChest1, localChest2, doubleChest));
-                        }
+            menuProvider = chestBlock.getMenuProvider(blockState, level, blockPos, true);
 
-                        @Override
-                        public Optional<MenuProvider> acceptSingle(ChestBlockEntity localChest) {
-                            return Optional.of(localChest);
-                        }
-
-                        @Override
-                        public Optional<MenuProvider> acceptNone() {
-                            return Optional.empty();
-                        }
-                    });
-
-            if (menuOptional.isEmpty()) {
+            if (menuProvider == null) {
                 OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
                 return false;
             }
 
-            menuProvider = menuOptional.get();
-
             if (block instanceof TrappedChestBlock) {
                 bukkitPlayer.incrementStatistic(Statistic.TRAPPED_CHEST_TRIGGERED);
             } else {
@@ -231,21 +167,10 @@ public class AnySilentContainer implements IAnySilentContainer {
 
     @Override
     public void deactivateContainer(@NotNull final Player bukkitPlayer) {
-        if (this.serverPlayerGameModeGameType == null) {
+        if (this.serverPlayerGameModeGameType == null || bukkitPlayer.getGameMode() == GameMode.SPECTATOR) {
             return;
         }
 
-        InventoryView view = bukkitPlayer.getOpenInventory();
-        switch (view.getType()) {
-            case CHEST:
-            case ENDER_CHEST:
-            case SHULKER_BOX:
-            case BARREL:
-                break;
-            default:
-                return;
-        }
-
         ServerPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
         // Force game mode change without informing plugins or players.
@@ -274,7 +199,8 @@ public class AnySilentContainer implements IAnySilentContainer {
             this.serverPlayerGameModeGameType.setAccessible(true);
             this.serverPlayerGameModeGameType.set(player.gameMode, gameMode);
         } catch (IllegalArgumentException | IllegalAccessException e) {
-            e.printStackTrace();
+            Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger();
+            logger.log(java.util.logging.Level.WARNING, "Error bypassing GameModeChangeEvent", e);
         }
     }
 

internal/v1_20_R4/src/main/java/com/lishid/openinv/internal/v1_20_R4/OpenPlayer.java

@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_20_R4;
+
+import com.mojang.logging.LogUtils;
+import net.minecraft.Util;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtIo;
+import net.minecraft.nbt.NumericTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.storage.PlayerDataStorage;
+import org.bukkit.craftbukkit.v1_20_R4.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R4.entity.CraftPlayer;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Set;
+
+public class OpenPlayer extends CraftPlayer {
+
+    /**
+     * List of tags to always reset when saving.
+     *
+     * @see net.minecraft.world.entity.Entity#saveWithoutId(CompoundTag)
+     * @see net.minecraft.server.level.ServerPlayer#addAdditionalSaveData(CompoundTag)
+     * @see net.minecraft.world.entity.player.Player#addAdditionalSaveData(CompoundTag)
+     * @see net.minecraft.world.entity.LivingEntity#addAdditionalSaveData(CompoundTag)
+     */
+    private static final Set<String> RESET_TAGS = Set.of(
+        // Entity#saveWithoutId(CompoundTag)
+        "CustomName",
+        "CustomNameVisible",
+        "Silent",
+        "NoGravity",
+        "Glowing",
+        "TicksFrozen",
+        "HasVisualFire",
+        "Tags",
+        "Passengers",
+        // ServerPlayer#addAdditionalSaveData(CompoundTag)
+        // Intentional omissions to prevent mount loss: Attach, Entity, and RootVehicle
+        "warden_spawn_tracker",
+        "enteredNetherPosition",
+        "SpawnX",
+        "SpawnY",
+        "SpawnZ",
+        "SpawnForced",
+        "SpawnAngle",
+        "SpawnDimension",
+        "raid_omen_position",
+        // Player#addAdditionalSaveData(CompoundTag)
+        "ShoulderEntityLeft",
+        "ShoulderEntityRight",
+        "LastDeathLocation",
+        "current_explosion_impact_pos",
+        // LivingEntity#addAdditionalSaveData(CompoundTag)
+        "ActiveEffects", // Backwards compat: Renamed from 1.19
+        "active_effects",
+        "SleepingX",
+        "SleepingY",
+        "SleepingZ",
+        "Brain"
+    );
+
+    public OpenPlayer(CraftServer server, ServerPlayer entity) {
+        super(server, entity);
+    }
+
+    @Override
+    public void loadData() {
+        PlayerDataManager.loadData(getHandle());
+    }
+
+    @Override
+    public void saveData() {
+        ServerPlayer player = this.getHandle();
+        // See net.minecraft.world.level.storage.PlayerDataStorage#save(EntityHuman)
+        try {
+            PlayerDataStorage worldNBTStorage = player.server.getPlayerList().playerIo;
+
+            CompoundTag oldData = isOnline() ? null : worldNBTStorage.load(player.getName().getString(), player.getStringUUID()).orElse(null);
+            CompoundTag playerData = getWritableTag(oldData);
+            playerData = player.saveWithoutId(playerData);
+            setExtraData(playerData);
+
+            if (oldData != null) {
+                // Revert certain special data values when offline.
+                revertSpecialValues(playerData, oldData);
+            }
+
+            Path playerDataDir = worldNBTStorage.getPlayerDir().toPath();
+            Path tempFile = Files.createTempFile(playerDataDir, player.getStringUUID() + "-", ".dat");
+            NbtIo.writeCompressed(playerData, tempFile);
+            Path dataFile = playerDataDir.resolve(player.getStringUUID() + ".dat");
+            Path backupFile = playerDataDir.resolve(player.getStringUUID() + ".dat_old");
+            Util.safeReplaceFile(dataFile, tempFile, backupFile);
+        } catch (Exception e) {
+            LogUtils.getLogger().warn("Failed to save player data for {}: {}", player.getScoreboardName(), e);
+        }
+    }
+
+    @Contract("null -> new")
+    private @NotNull CompoundTag getWritableTag(@Nullable CompoundTag oldData) {
+        if (oldData == null) {
+            return new CompoundTag();
+        }
+
+        // Copy old data. This is a deep clone, so operating on it should be safe.
+        oldData = oldData.copy();
+
+        // Remove vanilla/server data that is not written every time.
+        oldData.getAllKeys()
+            .removeIf(key -> RESET_TAGS.contains(key) || key.startsWith("Bukkit"));
+
+        return oldData;
+    }
+
+    private void revertSpecialValues(@NotNull CompoundTag newData, @NotNull CompoundTag oldData) {
+        // Revert automatic updates to play timestamps.
+        copyValue(oldData, newData, "bukkit", "lastPlayed", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastSeen", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastLogin", NumericTag.class);
+    }
+
+    private <T extends Tag> void copyValue(
+        @NotNull CompoundTag source,
+        @NotNull CompoundTag target,
+        @NotNull String container,
+        @NotNull String key,
+        @NotNull Class<T> tagType) {
+        CompoundTag oldContainer = getTag(source, container, CompoundTag.class);
+        CompoundTag newContainer = getTag(target, container, CompoundTag.class);
+
+        // New container being null means the server implementation doesn't store this data.
+        if (newContainer == null) {
+            return;
+        }
+
+        // If old tag exists, copy it to new location, removing otherwise.
+        setTag(newContainer, key, getTag(oldContainer, key, tagType));
+    }
+
+    private <T extends Tag> @Nullable T getTag(
+        @Nullable CompoundTag container,
+        @NotNull String key,
+        @NotNull Class<T> dataType) {
+        if (container == null) {
+            return null;
+        }
+        Tag value = container.get(key);
+        if (value == null || !dataType.isAssignableFrom(value.getClass())) {
+            return null;
+        }
+        return dataType.cast(value);
+    }
+
+    private <T extends Tag> void setTag(
+        @NotNull CompoundTag container,
+        @NotNull String key,
+        @Nullable T data) {
+        if (data == null) {
+            container.remove(key);
+        } else {
+            container.put(key, data);
+        }
+    }
+
+}

internal/v1_20_R4/src/main/java/com/lishid/openinv/internal/v1_20_R4/PlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,46 +14,68 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_18_R1;
+package com.lishid.openinv.internal.v1_20_R4;
 
 import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IPlayerDataManager;
 import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.OpenInventoryView;
 import com.mojang.authlib.GameProfile;
-import java.lang.reflect.Field;
-import java.util.logging.Logger;
-import net.minecraft.network.chat.TextComponent;
+import com.mojang.serialization.Dynamic;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ClientInformation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.ChatVisiblity;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.dimension.DimensionType;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_18_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_18_R1.event.CraftEventFactory;
-import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftContainer;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_20_R4.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R4.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R4.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R4.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v1_20_R4.inventory.CraftContainer;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryView;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.reflect.Field;
+import java.util.UUID;
+import java.util.logging.Logger;
+
 public class PlayerDataManager implements IPlayerDataManager {
 
+    private static boolean paper;
+
+    static {
+        try {
+            Class.forName("io.papermc.paper.configuration.Configuration");
+            paper = true;
+        } catch (ClassNotFoundException ignored) {
+            paper = false;
+        }
+    }
+
     private @Nullable Field bukkitEntity;
 
     public PlayerDataManager() {
         try {
             bukkitEntity = Entity.class.getDeclaredField("bukkitEntity");
         } catch (NoSuchFieldException e) {
-            Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger();
-            logger.warning("Unable to obtain field to inject custom save process - players' mounts may be deleted when loaded.");
+            Logger logger = JavaPlugin.getPlugin(OpenInv.class).getLogger();
+            logger.warning("Unable to obtain field to inject custom save process - certain player data may be lost when saving!");
             logger.log(java.util.logging.Level.WARNING, e.getMessage(), e);
             bukkitEntity = null;
         }
@@ -73,7 +95,7 @@ public class PlayerDataManager implements IPlayerDataManager {
 
         if (nmsPlayer == null) {
             // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+            throw new RuntimeException("Unable to fetch EntityPlayer from Player implementation " + player.getClass().getName());
         }
 
         return nmsPlayer;
@@ -86,10 +108,6 @@ public class PlayerDataManager implements IPlayerDataManager {
             return null;
         }
 
-        // Create a profile and entity to load the player data
-        // See net.minecraft.server.PlayerList#attemptLogin
-        GameProfile profile = new GameProfile(offline.getUniqueId(),
-                offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
         ServerLevel worldServer = server.getLevel(Level.OVERWORLD);
 
@@ -97,25 +115,105 @@ public class PlayerDataManager implements IPlayerDataManager {
             return null;
         }
 
-        ServerPlayer entity = new ServerPlayer(server, worldServer, profile);
+        // Create a new ServerPlayer.
+        ServerPlayer entity = createNewPlayer(server, worldServer, offline);
+
+        // Stop listening for advancement progression - if this is not cleaned up, loading causes a memory leak.
+        entity.getAdvancements().stopListening();
+
+        // Try to load the player's data.
+        if (loadData(entity)) {
+            // If data is loaded successfully, return the Bukkit entity.
+            return entity.getBukkitEntity();
+        }
+
+        return null;
+    }
+
+    private @NotNull ServerPlayer createNewPlayer(
+        @NotNull MinecraftServer server,
+        @NotNull ServerLevel worldServer,
+        @NotNull final OfflinePlayer offline) {
+        // See net.minecraft.server.players.PlayerList#canPlayerLogin(ServerLoginPacketListenerImpl, GameProfile)
+        // See net.minecraft.server.network.ServerLoginPacketListenerImpl#handleHello(ServerboundHelloPacket)
+        GameProfile profile = new GameProfile(offline.getUniqueId(),
+            offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
+
+        ClientInformation dummyInfo = new ClientInformation(
+            "en_us",
+            1, // Reduce distance just in case.
+            ChatVisiblity.HIDDEN, // Don't accept chat.
+            false,
+            ServerPlayer.DEFAULT_MODEL_CUSTOMIZATION,
+            ServerPlayer.DEFAULT_MAIN_HAND,
+            true,
+            false // Don't list in player list (not that this player is in the list anyway).
+        );
+
+        ServerPlayer entity = new ServerPlayer(server, worldServer, profile, dummyInfo);
 
         try {
             injectPlayer(entity);
         } catch (IllegalAccessException e) {
-            e.printStackTrace();
+            JavaPlugin.getPlugin(OpenInv.class).getLogger().log(
+                java.util.logging.Level.WARNING,
+                e,
+                () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
         }
 
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
+        return entity;
     }
 
-    void injectPlayer(ServerPlayer player) throws IllegalAccessException {
+    static boolean loadData(@NotNull ServerPlayer player) {
+        // See CraftPlayer#loadData
+        CompoundTag loadedData = player.server.getPlayerList().playerIo.load(player).orElse(null);
+
+        if (loadedData == null) {
+            // Exceptions with loading are logged by Mojang.
+            return false;
+        }
+
+        // Read basic data into the player.
+        player.load(loadedData);
+        // Also read "extra" data.
+        player.readAdditionalSaveData(loadedData);
+        // Game type settings are also loaded separately.
+        player.loadGameTypes(loadedData);
+
+        if (paper) {
+            // Paper: world is not loaded by ServerPlayer#load(CompoundTag).
+            parseWorld(player, loadedData);
+        }
+
+        return true;
+    }
+
+    private static void parseWorld(@NotNull ServerPlayer player, @NotNull CompoundTag loadedData) {
+        // See PlayerList#placeNewPlayer
+        World bukkitWorld;
+        if (loadedData.contains("WorldUUIDMost") && loadedData.contains("WorldUUIDLeast")) {
+            // Modern Bukkit world.
+            bukkitWorld = Bukkit.getServer().getWorld(new UUID(loadedData.getLong("WorldUUIDMost"), loadedData.getLong("WorldUUIDLeast")));
+        } else if (loadedData.contains("world", net.minecraft.nbt.Tag.TAG_STRING)) {
+            // Legacy Bukkit world.
+            bukkitWorld = Bukkit.getServer().getWorld(loadedData.getString("world"));
+        } else {
+            // Vanilla player data.
+            DimensionType.parseLegacy(new Dynamic<>(NbtOps.INSTANCE, loadedData.get("Dimension")))
+                .resultOrPartial(JavaPlugin.getPlugin(OpenInv.class).getLogger()::warning)
+                .map(player.server::getLevel)
+                // If ServerLevel exists, set, otherwise move to spawn.
+                .ifPresentOrElse(player::setServerLevel, () -> player.spawnIn(null));
+            return;
+        }
+        if (bukkitWorld == null) {
+            player.spawnIn(null);
+            return;
+        }
+        player.setServerLevel(((CraftWorld) bukkitWorld).getHandle());
+    }
+
+    private void injectPlayer(ServerPlayer player) throws IllegalAccessException {
         if (bukkitEntity == null) {
             return;
         }
@@ -125,22 +223,26 @@ public class PlayerDataManager implements IPlayerDataManager {
         bukkitEntity.set(player, new OpenPlayer(player.server.server, player));
     }
 
-    @NotNull
     @Override
-    public Player inject(@NotNull Player player) {
+    public @NotNull Player inject(@NotNull Player player) {
         try {
             ServerPlayer nmsPlayer = getHandle(player);
+            if (nmsPlayer.getBukkitEntity() instanceof OpenPlayer openPlayer) {
+                return openPlayer;
+            }
             injectPlayer(nmsPlayer);
             return nmsPlayer.getBukkitEntity();
         } catch (IllegalAccessException e) {
-            e.printStackTrace();
+            JavaPlugin.getPlugin(OpenInv.class).getLogger().log(
+                java.util.logging.Level.WARNING,
+                e,
+                () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
             return player;
         }
     }
 
-    @Nullable
     @Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
+    public @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
 
         ServerPlayer nmsPlayer = getHandle(player);
 
@@ -161,7 +263,7 @@ public class PlayerDataManager implements IPlayerDataManager {
             }
         };
 
-        container.setTitle(new TextComponent(view.getTitle()));
+        container.setTitle(Component.literal(view.getTitle()));
         container = CraftEventFactory.callInventoryOpenEvent(nmsPlayer, container);
 
         if (container == null) {
@@ -169,7 +271,7 @@ public class PlayerDataManager implements IPlayerDataManager {
         }
 
         nmsPlayer.connection.send(new ClientboundOpenScreenPacket(container.containerId, container.getType(),
-                new TextComponent(container.getBukkitView().getTitle())));
+                Component.literal(container.getBukkitView().getTitle())));
         nmsPlayer.containerMenu = container;
         nmsPlayer.initMenu(container);
 

internal/v1_20_R4/src/main/java/com/lishid/openinv/internal/v1_20_R4/SpecialEnderChest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,12 +14,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_17_R1;
+package com.lishid.openinv.internal.v1_20_R4;
 
 import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.core.NonNullList;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
@@ -33,13 +31,17 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.EnderChestBlockEntity;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_17_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_20_R4.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_20_R4.inventory.CraftInventory;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.InventoryHolder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
 public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpecialEnderChest {
 
     private final CraftInventory inventory;
@@ -60,11 +62,6 @@ public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpe
         return inventory;
     }
 
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
     @Override
     public void setPlayerOffline() {
         this.playerOnline = false;
@@ -72,18 +69,29 @@ public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpe
 
     @Override
     public void setPlayerOnline(@NotNull final org.bukkit.entity.Player player) {
-        if (!this.playerOnline) {
-            try {
-                this.owner = PlayerDataManager.getHandle(player);
-                PlayerEnderChestContainer enderChest = owner.getEnderChestInventory();
-                for (int i = 0; i < enderChest.getContainerSize(); ++i) {
-                    enderChest.setItem(i, this.items.get(i));
-                }
-                this.items = enderChest.items;
-                enderChest.transaction.addAll(this.transaction);
-            } catch (Exception ignored) {}
-            this.playerOnline = true;
+        if (this.playerOnline) {
+            return;
         }
+
+        ServerPlayer offlinePlayer = this.owner;
+        ServerPlayer onlinePlayer = PlayerDataManager.getHandle(player);
+
+        // Set owner to new player.
+        this.owner = onlinePlayer;
+
+        // Set player's ender chest contents to our modified contents.
+        PlayerEnderChestContainer onlineEnderChest = onlinePlayer.getEnderChestInventory();
+        for (int i = 0; i < onlineEnderChest.getContainerSize(); ++i) {
+            onlineEnderChest.setItem(i, this.items.get(i));
+        }
+
+        // Set our item array to the new inventory's array.
+        this.items = onlineEnderChest.items;
+
+        // Add viewers to new inventory.
+        onlineEnderChest.transaction.addAll(offlinePlayer.getEnderChestInventory().transaction);
+
+        this.playerOnline = true;
     }
 
     @Override
@@ -191,7 +199,7 @@ public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpe
     @Override
     public boolean canAddItem(ItemStack itemstack) {
         for (ItemStack itemstack1 : this.items) {
-            if (itemstack1.isEmpty() || ItemStack.isSameItemSameTags(itemstack1, itemstack) && itemstack1.getCount() < itemstack1.getMaxStackSize()) {
+            if (itemstack1.isEmpty() || ItemStack.isSameItemSameComponents(itemstack1, itemstack) && itemstack1.getCount() < itemstack1.getMaxStackSize()) {
                 return true;
             }
         }
@@ -213,7 +221,7 @@ public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpe
     private void moveItemToOccupiedSlotsWithSameType(ItemStack itemstack) {
         for(int i = 0; i < this.getContainerSize(); ++i) {
             ItemStack localItem = this.getItem(i);
-            if (ItemStack.isSameItemSameTags(localItem, itemstack)) {
+            if (ItemStack.isSameItemSameComponents(localItem, itemstack)) {
                 this.moveItemsBetweenStacks(itemstack, localItem);
                 if (itemstack.isEmpty()) {
                     return;
@@ -322,11 +330,11 @@ public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpe
 
     @Override
     public String toString() {
-        return this.items.stream().filter((itemStack) -> !itemStack.isEmpty()).collect(Collectors.toList()).toString();
+        return this.items.stream().filter((itemStack) -> !itemStack.isEmpty()).toList().toString();
     }
 
     @Override
-    public void fromTag(ListTag listTag) {
+    public void fromTag(ListTag listTag, HolderLookup.Provider holderLookup) {
         for (int i = 0; i < this.getContainerSize(); ++i) {
             this.setItem(i, ItemStack.EMPTY);
         }
@@ -335,7 +343,7 @@ public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpe
             CompoundTag compoundTag = listTag.getCompound(i);
             int j = compoundTag.getByte("Slot") & 255;
             if (j < this.getContainerSize()) {
-                this.setItem(j, ItemStack.of(compoundTag));
+                this.setItem(j, ItemStack.parseOptional(holderLookup, compoundTag));
             }
         }
 

internal/v1_20_R4/src/main/java/com/lishid/openinv/internal/v1_20_R4/SpecialPlayerInventory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,44 +14,43 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_17_R1;
+package com.lishid.openinv.internal.v1_20_R4;
 
 import com.google.common.collect.ImmutableList;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import net.minecraft.CrashReport;
+import net.minecraft.CrashReportCategory;
+import net.minecraft.ReportedException;
+import net.minecraft.core.NonNullList;
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.Container;
+import net.minecraft.world.ContainerHelper;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.player.StackedContents;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_20_R4.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_20_R4.inventory.CraftInventory;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.InventoryHolder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import net.minecraft.CrashReport;
-import net.minecraft.CrashReportCategory;
-import net.minecraft.ReportedException;
-import net.minecraft.core.NonNullList;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.tags.Tag;
-import net.minecraft.world.Container;
-import net.minecraft.world.ContainerHelper;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.player.StackedContents;
-import net.minecraft.world.item.ArmorItem;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.state.BlockState;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_17_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerInventory {
 
@@ -77,20 +76,37 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
 
     @Override
     public void setPlayerOnline(@NotNull org.bukkit.entity.Player player) {
-        if (!this.playerOnline) {
-            Player entityPlayer = PlayerDataManager.getHandle(player);
-            entityPlayer.getInventory().transaction.addAll(this.transaction);
-            this.player = entityPlayer;
-            for (int i = 0; i < getContainerSize(); ++i) {
-                this.player.getInventory().setItem(i, getRawItem(i));
-            }
-            this.player.getInventory().selected = this.selected;
-            this.items = this.player.getInventory().items;
-            this.armor = this.player.getInventory().armor;
-            this.offhand = this.player.getInventory().offhand;
-            this.compartments = ImmutableList.of(this.items, this.armor, this.offhand);
-            this.playerOnline = true;
+        if (this.playerOnline) {
+            return;
         }
+
+        Player offlinePlayer = this.player;
+        Player onlinePlayer = PlayerDataManager.getHandle(player);
+        onlinePlayer.getInventory().transaction.addAll(this.transaction);
+
+        // Set owner to new player.
+        this.player = onlinePlayer;
+
+        // Set player's inventory contents to our modified contents.
+        Inventory onlineInventory = onlinePlayer.getInventory();
+        for (int i = 0; i < getContainerSize(); ++i) {
+            onlineInventory.setItem(i, getRawItem(i));
+        }
+        onlineInventory.selected = this.selected;
+
+        // Set our item arrays to the new inventory's arrays.
+        this.items = onlineInventory.items;
+        this.armor = onlineInventory.armor;
+        this.offhand = onlineInventory.offhand;
+        this.compartments = ImmutableList.of(this.items, this.armor, this.offhand);
+
+        // Add existing viewers to new viewer list.
+        Inventory offlineInventory = offlinePlayer.getInventory();
+        // Remove self from listing - player is always a viewer of their own inventory, prevent duplicates.
+        offlineInventory.transaction.remove(offlinePlayer.getBukkitEntity());
+        onlineInventory.transaction.addAll(offlineInventory.transaction);
+
+        this.playerOnline = true;
     }
 
     @Override
@@ -103,12 +119,6 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
         this.playerOnline = false;
     }
 
-    @Override
-    public boolean isInUse() {
-        List<HumanEntity> viewers = this.getViewers();
-        return viewers.size() > 1 || !viewers.isEmpty() && !viewers.get(0).getUniqueId().equals(this.player.getUUID());
-    }
-
     @Override
     public @NotNull HumanEntity getPlayer() {
         return this.player.getBukkitEntity();
@@ -144,7 +154,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
         }
     }
 
-    private static record IndexedCompartment(@Nullable NonNullList<ItemStack> compartment, int index) {}
+    private record IndexedCompartment(@Nullable NonNullList<ItemStack> compartment, int index) {}
 
     private @NotNull SpecialPlayerInventory.IndexedCompartment getIndexedContent(int index) {
         if (index < items.size()) {
@@ -191,7 +201,8 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
         return i + 9;
     }
 
-    private boolean contains(Predicate<ItemStack> predicate) {
+    @Override
+    public boolean contains(Predicate<ItemStack> predicate) {
         return this.compartments.stream().flatMap(NonNullList::stream).anyMatch(predicate);
     }
 
@@ -251,7 +262,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
     }
 
     private boolean hasRemainingSpaceForItem(ItemStack itemstack, ItemStack itemstack1) {
-        return !itemstack.isEmpty() && ItemStack.isSameItemSameTags(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize();
+        return !itemstack.isEmpty() && ItemStack.isSameItemSameComponents(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize();
     }
 
     @Override
@@ -324,7 +335,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
     @Override
     public int findSlotMatchingItem(ItemStack itemstack) {
         for(int i = 0; i < this.items.size(); ++i) {
-            if (!this.items.get(i).isEmpty() && ItemStack.isSameItemSameTags(itemstack, this.items.get(i))) {
+            if (!this.items.get(i).isEmpty() && ItemStack.isSameItemSameComponents(itemstack, this.items.get(i))) {
                 return i;
             }
         }
@@ -336,7 +347,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
     public int findSlotMatchingUnusedItem(ItemStack itemStack) {
         for(int i = 0; i < this.items.size(); ++i) {
             ItemStack localItem = this.items.get(i);
-            if (!this.items.get(i).isEmpty() && ItemStack.isSameItemSameTags(itemStack, this.items.get(i)) && !this.items.get(i).isDamaged() && !localItem.isEnchanted() && !localItem.hasCustomHoverName()) {
+            if (!this.items.get(i).isEmpty() && ItemStack.isSameItemSameComponents(itemStack, this.items.get(i)) && !this.items.get(i).isDamaged() && !localItem.isEnchanted() && !localItem.has(DataComponents.CUSTOM_NAME)) {
                 return i;
             }
         }
@@ -367,15 +378,9 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
 
     @Override
     public void swapPaint(double d0) {
-        if (d0 > 0.0D) {
-            d0 = 1.0D;
-        }
+        int i = (int) Math.signum(d0);
 
-        if (d0 < 0.0D) {
-            d0 = -1.0D;
-        }
-
-        this.selected = (int) (this.selected - d0);
+        this.selected -= i;
 
         while (this.selected < 0) {
             this.selected += 9;
@@ -411,25 +416,14 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
     }
 
     private int addResource(int i, ItemStack itemstack) {
-        Item item = itemstack.getItem();
         int j = itemstack.getCount();
         ItemStack localItemStack = this.getRawItem(i);
         if (localItemStack.isEmpty()) {
-            localItemStack = new ItemStack(item, 0);
-            if (itemstack.hasTag()) {
-                // hasTag ensures tag not null
-                //noinspection ConstantConditions
-                localItemStack.setTag(itemstack.getTag().copy());
-            }
-
+            localItemStack = itemstack.copyWithCount(0);
             this.setRawItem(i, localItemStack);
         }
 
-        int k = Math.min(j, localItemStack.getMaxStackSize() - localItemStack.getCount());
-
-        if (k > this.getMaxStackSize() - localItemStack.getCount()) {
-            k = this.getMaxStackSize() - localItemStack.getCount();
-        }
+        int k = Math.min(j, this.getMaxStackSize(localItemStack) - localItemStack.getCount());
 
         if (k != 0) {
             j -= k;
@@ -462,7 +456,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
         for (NonNullList<ItemStack> compartment : this.compartments) {
             for (int i = 0; i < compartment.size(); ++i) {
                 if (!compartment.get(i).isEmpty()) {
-                    compartment.get(i).inventoryTick(this.player.level, this.player, i, this.selected == i);
+                    compartment.get(i).inventoryTick(this.player.level(), this.player, i, this.selected == i);
                 }
             }
         }
@@ -490,7 +484,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
                         this.items.get(i).setPopTime(5);
                         itemStack.setCount(0);
                         return true;
-                    } else if (this.player.getAbilities().instabuild) {
+                    } else if (this.player.hasInfiniteMaterials()) {
                         itemStack.setCount(0);
                         return true;
                     } else {
@@ -507,7 +501,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
                         }
                     } while(!itemStack.isEmpty() && itemStack.getCount() < j);
 
-                    if (itemStack.getCount() == j && this.player.getAbilities().instabuild) {
+                    if (itemStack.getCount() == j && this.player.hasInfiniteMaterials()) {
                         itemStack.setCount(0);
                         return true;
                     } else {
@@ -618,7 +612,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
             if (!this.items.get(i).isEmpty()) {
                 CompoundTag compoundTag = new CompoundTag();
                 compoundTag.putByte("Slot", (byte)i);
-                this.items.get(i).save(compoundTag);
+                this.items.get(i).save(this.player.registryAccess(), compoundTag);
                 listTag.add(compoundTag);
             }
         }
@@ -627,7 +621,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
             if (!this.armor.get(i).isEmpty()) {
                 CompoundTag compoundTag = new CompoundTag();
                 compoundTag.putByte("Slot", (byte)(i + 100));
-                this.armor.get(i).save(compoundTag);
+                this.armor.get(i).save(this.player.registryAccess(), compoundTag);
                 listTag.add(compoundTag);
             }
         }
@@ -636,7 +630,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
             if (!this.offhand.get(i).isEmpty()) {
                 CompoundTag compoundTag = new CompoundTag();
                 compoundTag.putByte("Slot", (byte)(i + 150));
-                this.offhand.get(i).save(compoundTag);
+                this.offhand.get(i).save(this.player.registryAccess(), compoundTag);
                 listTag.add(compoundTag);
             }
         }
@@ -653,15 +647,13 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
         for(int i = 0; i < listTag.size(); ++i) {
             CompoundTag compoundTag = listTag.getCompound(i);
             int j = compoundTag.getByte("Slot") & 255;
-            ItemStack itemstack = ItemStack.of(compoundTag);
-            if (!itemstack.isEmpty()) {
-                if (j < this.items.size()) {
-                    this.items.set(j, itemstack);
-                } else if (j >= 100 && j < this.armor.size() + 100) {
-                    this.armor.set(j - 100, itemstack);
-                } else if (j >= 150 && j < this.offhand.size() + 150) {
-                    this.offhand.set(j - 150, itemstack);
-                }
+            ItemStack itemstack = ItemStack.parse(this.player.registryAccess(), compoundTag).orElse(ItemStack.EMPTY);
+            if (j < this.items.size()) {
+                this.items.set(j, itemstack);
+            } else if (j >= 100 && j < this.armor.size() + 100) {
+                this.armor.set(j - 100, itemstack);
+            } else if (j >= 150 && j < this.offhand.size() + 150) {
+                this.offhand.set(j - 150, itemstack);
             }
         }
 
@@ -698,23 +690,6 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
         return this.armor.get(index);
     }
 
-    @Override
-    public void hurtArmor(DamageSource damagesource, float damage, int[] armorIndices) {
-        if (damage > 0.0F) {
-            damage /= 4.0F;
-            if (damage < 1.0F) {
-                damage = 1.0F;
-            }
-
-            for (int index : armorIndices) {
-                ItemStack itemstack = this.armor.get(index);
-                if ((!damagesource.isFire() || !itemstack.getItem().isFireResistant()) && itemstack.getItem() instanceof ArmorItem) {
-                    itemstack.hurtAndBreak((int) damage, this.player, localPlayer -> localPlayer.broadcastBreakEvent(EquipmentSlot.byTypeAndIndex(EquipmentSlot.Type.ARMOR, index)));
-                }
-            }
-        }
-    }
-
     @Override
     public void dropAll() {
         for (NonNullList<ItemStack> compartment : this.compartments) {
@@ -745,12 +720,12 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
 
     @Override
     public boolean contains(ItemStack itemstack) {
-        return contains(itemStack -> itemStack.isEmpty() && itemStack.sameItem(itemstack));
+        return contains(itemStack -> !itemStack.isEmpty() && ItemStack.isSameItemSameComponents(itemstack, itemStack));
     }
 
     @Override
-    public boolean contains(Tag<Item> tag) {
-        return contains(itemStack -> !itemStack.isEmpty() && itemStack.is(tag));
+    public boolean contains(TagKey<Item> tagKey) {
+        return contains(itemStack -> !itemStack.isEmpty() && itemStack.is(tagKey));
     }
 
     @Override

internal/v1_21_R1/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2011-2022 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2023 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -23,19 +23,24 @@
     <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
     <relativePath>../../pom.xml</relativePath>
-    <version>4.1.10</version>
+    <version>4.4.6</version>
   </parent>
 
-  <artifactId>openinvadapter1_17_R1</artifactId>
-  <name>OpenInvAdapter1_17_R1</name>
+  <artifactId>openinvadapter1_21_R1</artifactId>
+  <name>OpenInvAdapter1_21_R1</name>
 
   <properties>
-    <maven.compiler.source>16</maven.compiler.source>
-    <maven.compiler.target>16</maven.compiler.target>
-    <spigot.version>1.17.1-R0.1-SNAPSHOT</spigot.version>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
+    <spigot.version>1.21-R0.1-SNAPSHOT</spigot.version>
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot-api</artifactId>
+      <version>${spigot.version}</version>
+    </dependency>
     <dependency>
       <artifactId>spigot</artifactId>
       <groupId>org.spigotmc</groupId>
@@ -46,6 +51,7 @@
     <dependency>
       <artifactId>openinvapi</artifactId>
       <groupId>com.lishid</groupId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <artifactId>openinvplugincore</artifactId>
@@ -61,10 +67,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <!-- Cannot use minimizeJar until maven-shade-plugin 3.3.0 releases; ASM used does not support Java 16. -->
-        <configuration>
-          <minimizeJar>false</minimizeJar>
-        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/AnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,24 +14,17 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_17_R1;
+package com.lishid.openinv.internal.v1_21_R1;
 
 import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IAnySilentContainer;
 import com.lishid.openinv.util.ReflectionHelper;
-import java.lang.reflect.Field;
-import java.util.Optional;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.server.level.ServerLevel;
+import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.level.ServerPlayerGameMode;
-import net.minecraft.world.CompoundContainer;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.SimpleMenuProvider;
-import net.minecraft.world.entity.monster.Shulker;
 import net.minecraft.world.inventory.ChestMenu;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.inventory.PlayerEnderChestContainer;
@@ -39,26 +32,22 @@ import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.block.BarrelBlock;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.ChestBlock;
-import net.minecraft.world.level.block.DoubleBlockCombiner;
 import net.minecraft.world.level.block.ShulkerBoxBlock;
 import net.minecraft.world.level.block.TrappedChestBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.ChestBlockEntity;
 import net.minecraft.world.level.block.entity.EnderChestBlockEntity;
 import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity;
-import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.AABB;
-import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.Statistic;
-import org.bukkit.block.ShulkerBox;
-import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.reflect.Field;
+import java.util.logging.Logger;
+
 public class AnySilentContainer implements IAnySilentContainer {
 
     private @Nullable Field serverPlayerGameModeGameType;
@@ -66,8 +55,6 @@ public class AnySilentContainer implements IAnySilentContainer {
     public AnySilentContainer() {
         try {
             try {
-                // IDE warns about field not existing, but SpecialSource does not remap strings used in reflection.
-                // The warning is not suppressed as a reminder that it must manually be checked on updates.
                 this.serverPlayerGameModeGameType = ServerPlayerGameMode.class.getDeclaredField("b");
                 this.serverPlayerGameModeGameType.setAccessible(true);
             } catch (NoSuchFieldException e) {
@@ -81,41 +68,10 @@ public class AnySilentContainer implements IAnySilentContainer {
         } catch (SecurityException e) {
             Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger();
             logger.warning("Unable to directly write player game mode! SilentContainer will fail.");
-            logger.log(Level.WARNING, "Error obtaining GameType field", e);
+            logger.log(java.util.logging.Level.WARNING, "Error obtaining GameType field", e);
         }
     }
 
-    @Override
-    public boolean isShulkerBlocked(ShulkerBox box) {
-        org.bukkit.World bukkitWorld = box.getWorld();
-        if (!(bukkitWorld instanceof CraftWorld)) {
-            bukkitWorld = Bukkit.getWorld(bukkitWorld.getUID());
-        }
-
-        if (!(bukkitWorld instanceof CraftWorld craftWorld)) {
-            Exception exception = new IllegalStateException("AnySilentContainer access attempted on an unknown world!");
-            OpenInv.getPlugin(OpenInv.class).getLogger().log(Level.WARNING, exception.getMessage(), exception);
-            return false;
-        }
-
-        final ServerLevel world = craftWorld.getHandle();
-        final BlockPos blockPosition = new BlockPos(box.getX(), box.getY(), box.getZ());
-        final BlockEntity tile = world.getBlockEntity(blockPosition);
-
-        if (!(tile instanceof ShulkerBoxBlockEntity shulkerBoxBlockEntity)
-                || shulkerBoxBlockEntity.getAnimationStatus() != ShulkerBoxBlockEntity.AnimationStatus.CLOSED) {
-            return false;
-        }
-
-        BlockState blockState = world.getBlockState(blockPosition);
-
-        // See net.minecraft.world.level.block.ShulkerBoxBlock#canOpen
-        AABB boundingBox = Shulker.getProgressDeltaAabb(blockState.getValue(ShulkerBoxBlock.FACING), 0.0F, 0.5F)
-                .move(blockPosition)
-                .deflate(1.0E-6D);
-        return !world.noCollision(boundingBox);
-    }
-
     @Override
     public boolean activateContainer(
             @NotNull final Player bukkitPlayer,
@@ -131,7 +87,7 @@ public class AnySilentContainer implements IAnySilentContainer {
 
         ServerPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
-        final ServerLevel level = player.getLevel();
+        final net.minecraft.world.level.Level level = player.level();
         final BlockPos blockPos = new BlockPos(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
         final BlockEntity blockEntity = level.getBlockEntity(blockPos);
 
@@ -140,14 +96,14 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         if (blockEntity instanceof EnderChestBlockEntity enderChestTile) {
-            // Anychest ender chest. See net.minecraft.world.level.block.BlockEnderChest
+            // Anychest ender chest. See net.minecraft.world.level.block.EnderChestBlock
             PlayerEnderChestContainer enderChest = player.getEnderChestInventory();
             enderChest.setActiveChest(enderChestTile);
             player.openMenu(new SimpleMenuProvider((containerCounter, playerInventory, ignored) -> {
                 MenuType<?> containers = PlayerDataManager.getContainers(enderChest.getContainerSize());
                 int rows = enderChest.getContainerSize() / 9;
                 return new ChestMenu(containers, containerCounter, playerInventory, enderChest, rows);
-            }, new TranslatableComponent("container.enderchest")));
+            }, Component.translatable(("container.enderchest"))));
             bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
             return true;
         }
@@ -162,33 +118,13 @@ public class AnySilentContainer implements IAnySilentContainer {
         if (block instanceof ChestBlock chestBlock) {
 
             // boolean flag: do not check if chest is blocked
-            Optional<MenuProvider> menuOptional = chestBlock.combine(blockState, level, blockPos, true).apply(
-                    // Combiner is a copy of private ChestBlock.MENU_PROVIDER_COMBINER
-                    new DoubleBlockCombiner.Combiner<ChestBlockEntity, Optional<MenuProvider>>() {
-                        @Override
-                        public Optional<MenuProvider> acceptDouble(ChestBlockEntity localChest1, ChestBlockEntity localChest2) {
-                            CompoundContainer doubleChest = new CompoundContainer(localChest1, localChest2);
-                            return Optional.of(new ChestBlock.DoubleInventory(localChest1, localChest2, doubleChest));
-                        }
+            menuProvider = chestBlock.getMenuProvider(blockState, level, blockPos, true);
 
-                        @Override
-                        public Optional<MenuProvider> acceptSingle(ChestBlockEntity localChest) {
-                            return Optional.of(localChest);
-                        }
-
-                        @Override
-                        public Optional<MenuProvider> acceptNone() {
-                            return Optional.empty();
-                        }
-                    });
-
-            if (menuOptional.isEmpty()) {
+            if (menuProvider == null) {
                 OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
                 return false;
             }
 
-            menuProvider = menuOptional.get();
-
             if (block instanceof TrappedChestBlock) {
                 bukkitPlayer.incrementStatistic(Statistic.TRAPPED_CHEST_TRIGGERED);
             } else {
@@ -231,21 +167,10 @@ public class AnySilentContainer implements IAnySilentContainer {
 
     @Override
     public void deactivateContainer(@NotNull final Player bukkitPlayer) {
-        if (this.serverPlayerGameModeGameType == null) {
+        if (this.serverPlayerGameModeGameType == null || bukkitPlayer.getGameMode() == GameMode.SPECTATOR) {
             return;
         }
 
-        InventoryView view = bukkitPlayer.getOpenInventory();
-        switch (view.getType()) {
-            case CHEST:
-            case ENDER_CHEST:
-            case SHULKER_BOX:
-            case BARREL:
-                break;
-            default:
-                return;
-        }
-
         ServerPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
         // Force game mode change without informing plugins or players.
@@ -274,7 +199,8 @@ public class AnySilentContainer implements IAnySilentContainer {
             this.serverPlayerGameModeGameType.setAccessible(true);
             this.serverPlayerGameModeGameType.set(player.gameMode, gameMode);
         } catch (IllegalArgumentException | IllegalAccessException e) {
-            e.printStackTrace();
+            Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger();
+            logger.log(java.util.logging.Level.WARNING, "Error bypassing GameModeChangeEvent", e);
         }
     }
 

internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/OpenPlayer.java

@@ -0,0 +1,185 @@
+/*
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_21_R1;
+
+import com.mojang.logging.LogUtils;
+import net.minecraft.Util;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtIo;
+import net.minecraft.nbt.NumericTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.storage.PlayerDataStorage;
+import org.bukkit.craftbukkit.v1_21_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Set;
+
+public class OpenPlayer extends CraftPlayer {
+
+    /**
+     * List of tags to always reset when saving.
+     *
+     * @see net.minecraft.world.entity.Entity#saveWithoutId(CompoundTag)
+     * @see net.minecraft.server.level.ServerPlayer#addAdditionalSaveData(CompoundTag)
+     * @see net.minecraft.world.entity.player.Player#addAdditionalSaveData(CompoundTag)
+     * @see net.minecraft.world.entity.LivingEntity#addAdditionalSaveData(CompoundTag)
+     */
+    private static final Set<String> RESET_TAGS = Set.of(
+        // Entity#saveWithoutId(CompoundTag)
+        "CustomName",
+        "CustomNameVisible",
+        "Silent",
+        "NoGravity",
+        "Glowing",
+        "TicksFrozen",
+        "HasVisualFire",
+        "Tags",
+        "Passengers",
+        // ServerPlayer#addAdditionalSaveData(CompoundTag)
+        // Intentional omissions to prevent mount loss: Attach, Entity, and RootVehicle
+        "warden_spawn_tracker",
+        "enteredNetherPosition",
+        "SpawnX",
+        "SpawnY",
+        "SpawnZ",
+        "SpawnForced",
+        "SpawnAngle",
+        "SpawnDimension",
+        "raid_omen_position",
+        // Player#addAdditionalSaveData(CompoundTag)
+        "ShoulderEntityLeft",
+        "ShoulderEntityRight",
+        "LastDeathLocation",
+        "current_explosion_impact_pos",
+        // LivingEntity#addAdditionalSaveData(CompoundTag)
+        "active_effects",
+        "SleepingX",
+        "SleepingY",
+        "SleepingZ",
+        "Brain"
+    );
+
+    public OpenPlayer(CraftServer server, ServerPlayer entity) {
+        super(server, entity);
+    }
+
+    @Override
+    public void loadData() {
+        PlayerDataManager.loadData(getHandle());
+    }
+
+    @Override
+    public void saveData() {
+        ServerPlayer player = this.getHandle();
+        // See net.minecraft.world.level.storage.PlayerDataStorage#save(EntityHuman)
+        try {
+            PlayerDataStorage worldNBTStorage = player.server.getPlayerList().playerIo;
+
+            CompoundTag oldData = isOnline() ? null : worldNBTStorage.load(player.getName().getString(), player.getStringUUID()).orElse(null);
+            CompoundTag playerData = getWritableTag(oldData);
+            playerData = player.saveWithoutId(playerData);
+            setExtraData(playerData);
+
+            if (oldData != null) {
+                // Revert certain special data values when offline.
+                revertSpecialValues(playerData, oldData);
+            }
+
+            Path playerDataDir = worldNBTStorage.getPlayerDir().toPath();
+            Path tempFile = Files.createTempFile(playerDataDir, player.getStringUUID() + "-", ".dat");
+            NbtIo.writeCompressed(playerData, tempFile);
+            Path dataFile = playerDataDir.resolve(player.getStringUUID() + ".dat");
+            Path backupFile = playerDataDir.resolve(player.getStringUUID() + ".dat_old");
+            Util.safeReplaceFile(dataFile, tempFile, backupFile);
+        } catch (Exception e) {
+            LogUtils.getLogger().warn("Failed to save player data for {}: {}", player.getScoreboardName(), e);
+        }
+    }
+
+    @Contract("null -> new")
+    private @NotNull CompoundTag getWritableTag(@Nullable CompoundTag oldData) {
+        if (oldData == null) {
+            return new CompoundTag();
+        }
+
+        // Copy old data. This is a deep clone, so operating on it should be safe.
+        oldData = oldData.copy();
+
+        // Remove vanilla/server data that is not written every time.
+        oldData.getAllKeys()
+            .removeIf(key -> RESET_TAGS.contains(key) || key.startsWith("Bukkit"));
+
+        return oldData;
+    }
+
+    private void revertSpecialValues(@NotNull CompoundTag newData, @NotNull CompoundTag oldData) {
+        // Revert automatic updates to play timestamps.
+        copyValue(oldData, newData, "bukkit", "lastPlayed", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastSeen", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastLogin", NumericTag.class);
+    }
+
+    private <T extends Tag> void copyValue(
+        @NotNull CompoundTag source,
+        @NotNull CompoundTag target,
+        @NotNull String container,
+        @NotNull String key,
+        @NotNull Class<T> tagType) {
+        CompoundTag oldContainer = getTag(source, container, CompoundTag.class);
+        CompoundTag newContainer = getTag(target, container, CompoundTag.class);
+
+        // New container being null means the server implementation doesn't store this data.
+        if (newContainer == null) {
+            return;
+        }
+
+        // If old tag exists, copy it to new location, removing otherwise.
+        setTag(newContainer, key, getTag(oldContainer, key, tagType));
+    }
+
+    private <T extends Tag> @Nullable T getTag(
+        @Nullable CompoundTag container,
+        @NotNull String key,
+        @NotNull Class<T> dataType) {
+        if (container == null) {
+            return null;
+        }
+        Tag value = container.get(key);
+        if (value == null || !dataType.isAssignableFrom(value.getClass())) {
+            return null;
+        }
+        return dataType.cast(value);
+    }
+
+    private <T extends Tag> void setTag(
+        @NotNull CompoundTag container,
+        @NotNull String key,
+        @Nullable T data) {
+        if (data == null) {
+            container.remove(key);
+        } else {
+            container.put(key, data);
+        }
+    }
+
+}

internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/PlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,46 +14,68 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_18_R2;
+package com.lishid.openinv.internal.v1_21_R1;
 
 import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IPlayerDataManager;
 import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.OpenInventoryView;
 import com.mojang.authlib.GameProfile;
-import java.lang.reflect.Field;
-import java.util.logging.Logger;
-import net.minecraft.network.chat.TextComponent;
+import com.mojang.serialization.Dynamic;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ClientInformation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.ChatVisiblity;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.dimension.DimensionType;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_18_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_18_R2.event.CraftEventFactory;
-import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftContainer;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_21_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_21_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_21_R1.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftContainer;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryView;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.reflect.Field;
+import java.util.UUID;
+import java.util.logging.Logger;
+
 public class PlayerDataManager implements IPlayerDataManager {
 
+    private static boolean paper;
+
+    static {
+        try {
+            Class.forName("io.papermc.paper.configuration.Configuration");
+            paper = true;
+        } catch (ClassNotFoundException ignored) {
+            paper = false;
+        }
+    }
+
     private @Nullable Field bukkitEntity;
 
     public PlayerDataManager() {
         try {
             bukkitEntity = Entity.class.getDeclaredField("bukkitEntity");
         } catch (NoSuchFieldException e) {
-            Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger();
-            logger.warning("Unable to obtain field to inject custom save process - players' mounts may be deleted when loaded.");
+            Logger logger = JavaPlugin.getPlugin(OpenInv.class).getLogger();
+            logger.warning("Unable to obtain field to inject custom save process - certain player data may be lost when saving!");
             logger.log(java.util.logging.Level.WARNING, e.getMessage(), e);
             bukkitEntity = null;
         }
@@ -73,7 +95,7 @@ public class PlayerDataManager implements IPlayerDataManager {
 
         if (nmsPlayer == null) {
             // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+            throw new RuntimeException("Unable to fetch EntityPlayer from Player implementation " + player.getClass().getName());
         }
 
         return nmsPlayer;
@@ -86,10 +108,6 @@ public class PlayerDataManager implements IPlayerDataManager {
             return null;
         }
 
-        // Create a profile and entity to load the player data
-        // See net.minecraft.server.PlayerList#attemptLogin
-        GameProfile profile = new GameProfile(offline.getUniqueId(),
-                offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
         ServerLevel worldServer = server.getLevel(Level.OVERWORLD);
 
@@ -97,25 +115,105 @@ public class PlayerDataManager implements IPlayerDataManager {
             return null;
         }
 
-        ServerPlayer entity = new ServerPlayer(server, worldServer, profile);
+        // Create a new ServerPlayer.
+        ServerPlayer entity = createNewPlayer(server, worldServer, offline);
+
+        // Stop listening for advancement progression - if this is not cleaned up, loading causes a memory leak.
+        entity.getAdvancements().stopListening();
+
+        // Try to load the player's data.
+        if (loadData(entity)) {
+            // If data is loaded successfully, return the Bukkit entity.
+            return entity.getBukkitEntity();
+        }
+
+        return null;
+    }
+
+    private @NotNull ServerPlayer createNewPlayer(
+        @NotNull MinecraftServer server,
+        @NotNull ServerLevel worldServer,
+        @NotNull final OfflinePlayer offline) {
+        // See net.minecraft.server.players.PlayerList#canPlayerLogin(ServerLoginPacketListenerImpl, GameProfile)
+        // See net.minecraft.server.network.ServerLoginPacketListenerImpl#handleHello(ServerboundHelloPacket)
+        GameProfile profile = new GameProfile(offline.getUniqueId(),
+            offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
+
+        ClientInformation dummyInfo = new ClientInformation(
+            "en_us",
+            1, // Reduce distance just in case.
+            ChatVisiblity.HIDDEN, // Don't accept chat.
+            false,
+            ServerPlayer.DEFAULT_MODEL_CUSTOMIZATION,
+            ServerPlayer.DEFAULT_MAIN_HAND,
+            true,
+            false // Don't list in player list (not that this player is in the list anyway).
+        );
+
+        ServerPlayer entity = new ServerPlayer(server, worldServer, profile, dummyInfo);
 
         try {
             injectPlayer(entity);
         } catch (IllegalAccessException e) {
-            e.printStackTrace();
+            JavaPlugin.getPlugin(OpenInv.class).getLogger().log(
+                java.util.logging.Level.WARNING,
+                e,
+                () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
         }
 
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
+        return entity;
     }
 
-    void injectPlayer(ServerPlayer player) throws IllegalAccessException {
+    static boolean loadData(@NotNull ServerPlayer player) {
+        // See CraftPlayer#loadData
+        CompoundTag loadedData = player.server.getPlayerList().playerIo.load(player).orElse(null);
+
+        if (loadedData == null) {
+            // Exceptions with loading are logged by Mojang.
+            return false;
+        }
+
+        // Read basic data into the player.
+        player.load(loadedData);
+        // Also read "extra" data.
+        player.readAdditionalSaveData(loadedData);
+        // Game type settings are also loaded separately.
+        player.loadGameTypes(loadedData);
+
+        if (paper) {
+            // Paper: world is not loaded by ServerPlayer#load(CompoundTag).
+            parseWorld(player, loadedData);
+        }
+
+        return true;
+    }
+
+    private static void parseWorld(@NotNull ServerPlayer player, @NotNull CompoundTag loadedData) {
+        // See PlayerList#placeNewPlayer
+        World bukkitWorld;
+        if (loadedData.contains("WorldUUIDMost") && loadedData.contains("WorldUUIDLeast")) {
+            // Modern Bukkit world.
+            bukkitWorld = Bukkit.getServer().getWorld(new UUID(loadedData.getLong("WorldUUIDMost"), loadedData.getLong("WorldUUIDLeast")));
+        } else if (loadedData.contains("world", net.minecraft.nbt.Tag.TAG_STRING)) {
+            // Legacy Bukkit world.
+            bukkitWorld = Bukkit.getServer().getWorld(loadedData.getString("world"));
+        } else {
+            // Vanilla player data.
+            DimensionType.parseLegacy(new Dynamic<>(NbtOps.INSTANCE, loadedData.get("Dimension")))
+                .resultOrPartial(JavaPlugin.getPlugin(OpenInv.class).getLogger()::warning)
+                .map(player.server::getLevel)
+                // If ServerLevel exists, set, otherwise move to spawn.
+                .ifPresentOrElse(player::setServerLevel, () -> player.spawnIn(null));
+            return;
+        }
+        if (bukkitWorld == null) {
+            player.spawnIn(null);
+            return;
+        }
+        player.setServerLevel(((CraftWorld) bukkitWorld).getHandle());
+    }
+
+    private void injectPlayer(ServerPlayer player) throws IllegalAccessException {
         if (bukkitEntity == null) {
             return;
         }
@@ -125,22 +223,26 @@ public class PlayerDataManager implements IPlayerDataManager {
         bukkitEntity.set(player, new OpenPlayer(player.server.server, player));
     }
 
-    @NotNull
     @Override
-    public Player inject(@NotNull Player player) {
+    public @NotNull Player inject(@NotNull Player player) {
         try {
             ServerPlayer nmsPlayer = getHandle(player);
+            if (nmsPlayer.getBukkitEntity() instanceof OpenPlayer openPlayer) {
+                return openPlayer;
+            }
             injectPlayer(nmsPlayer);
             return nmsPlayer.getBukkitEntity();
         } catch (IllegalAccessException e) {
-            e.printStackTrace();
+            JavaPlugin.getPlugin(OpenInv.class).getLogger().log(
+                java.util.logging.Level.WARNING,
+                e,
+                () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
             return player;
         }
     }
 
-    @Nullable
     @Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
+    public @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
 
         ServerPlayer nmsPlayer = getHandle(player);
 
@@ -161,7 +263,7 @@ public class PlayerDataManager implements IPlayerDataManager {
             }
         };
 
-        container.setTitle(new TextComponent(view.getTitle()));
+        container.setTitle(Component.literal(view.getTitle()));
         container = CraftEventFactory.callInventoryOpenEvent(nmsPlayer, container);
 
         if (container == null) {
@@ -169,7 +271,7 @@ public class PlayerDataManager implements IPlayerDataManager {
         }
 
         nmsPlayer.connection.send(new ClientboundOpenScreenPacket(container.containerId, container.getType(),
-                new TextComponent(container.getBukkitView().getTitle())));
+                Component.literal(container.getBukkitView().getTitle())));
         nmsPlayer.containerMenu = container;
         nmsPlayer.initMenu(container);
 

internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/SpecialEnderChest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,12 +14,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_18_R2;
+package com.lishid.openinv.internal.v1_21_R1;
 
 import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.core.NonNullList;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
@@ -33,13 +31,17 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.EnderChestBlockEntity;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_21_R1.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventory;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.InventoryHolder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
 public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpecialEnderChest {
 
     private final CraftInventory inventory;
@@ -60,11 +62,6 @@ public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpe
         return inventory;
     }
 
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
     @Override
     public void setPlayerOffline() {
         this.playerOnline = false;
@@ -72,18 +69,29 @@ public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpe
 
     @Override
     public void setPlayerOnline(@NotNull final org.bukkit.entity.Player player) {
-        if (!this.playerOnline) {
-            try {
-                this.owner = PlayerDataManager.getHandle(player);
-                PlayerEnderChestContainer enderChest = owner.getEnderChestInventory();
-                for (int i = 0; i < enderChest.getContainerSize(); ++i) {
-                    enderChest.setItem(i, this.items.get(i));
-                }
-                this.items = enderChest.items;
-                enderChest.transaction.addAll(this.transaction);
-            } catch (Exception ignored) {}
-            this.playerOnline = true;
+        if (this.playerOnline) {
+            return;
         }
+
+        ServerPlayer offlinePlayer = this.owner;
+        ServerPlayer onlinePlayer = PlayerDataManager.getHandle(player);
+
+        // Set owner to new player.
+        this.owner = onlinePlayer;
+
+        // Set player's ender chest contents to our modified contents.
+        PlayerEnderChestContainer onlineEnderChest = onlinePlayer.getEnderChestInventory();
+        for (int i = 0; i < onlineEnderChest.getContainerSize(); ++i) {
+            onlineEnderChest.setItem(i, this.items.get(i));
+        }
+
+        // Set our item array to the new inventory's array.
+        this.items = onlineEnderChest.items;
+
+        // Add viewers to new inventory.
+        onlineEnderChest.transaction.addAll(offlinePlayer.getEnderChestInventory().transaction);
+
+        this.playerOnline = true;
     }
 
     @Override
@@ -191,7 +199,7 @@ public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpe
     @Override
     public boolean canAddItem(ItemStack itemstack) {
         for (ItemStack itemstack1 : this.items) {
-            if (itemstack1.isEmpty() || ItemStack.isSameItemSameTags(itemstack1, itemstack) && itemstack1.getCount() < itemstack1.getMaxStackSize()) {
+            if (itemstack1.isEmpty() || ItemStack.isSameItemSameComponents(itemstack1, itemstack) && itemstack1.getCount() < itemstack1.getMaxStackSize()) {
                 return true;
             }
         }
@@ -213,7 +221,7 @@ public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpe
     private void moveItemToOccupiedSlotsWithSameType(ItemStack itemstack) {
         for(int i = 0; i < this.getContainerSize(); ++i) {
             ItemStack localItem = this.getItem(i);
-            if (ItemStack.isSameItemSameTags(localItem, itemstack)) {
+            if (ItemStack.isSameItemSameComponents(localItem, itemstack)) {
                 this.moveItemsBetweenStacks(itemstack, localItem);
                 if (itemstack.isEmpty()) {
                     return;
@@ -322,11 +330,11 @@ public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpe
 
     @Override
     public String toString() {
-        return this.items.stream().filter((itemStack) -> !itemStack.isEmpty()).collect(Collectors.toList()).toString();
+        return this.items.stream().filter((itemStack) -> !itemStack.isEmpty()).toList().toString();
     }
 
     @Override
-    public void fromTag(ListTag listTag) {
+    public void fromTag(ListTag listTag, HolderLookup.Provider holderLookup) {
         for (int i = 0; i < this.getContainerSize(); ++i) {
             this.setItem(i, ItemStack.EMPTY);
         }
@@ -335,7 +343,7 @@ public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpe
             CompoundTag compoundTag = listTag.getCompound(i);
             int j = compoundTag.getByte("Slot") & 255;
             if (j < this.getContainerSize()) {
-                this.setItem(j, ItemStack.of(compoundTag));
+                this.setItem(j, ItemStack.parseOptional(holderLookup, compoundTag));
             }
         }
 

internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/SpecialPlayerInventory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,44 +14,43 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_18_R1;
+package com.lishid.openinv.internal.v1_21_R1;
 
 import com.google.common.collect.ImmutableList;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import net.minecraft.CrashReport;
+import net.minecraft.CrashReportCategory;
+import net.minecraft.ReportedException;
+import net.minecraft.core.NonNullList;
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.Container;
+import net.minecraft.world.ContainerHelper;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.player.StackedContents;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_21_R1.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventory;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.InventoryHolder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import net.minecraft.CrashReport;
-import net.minecraft.CrashReportCategory;
-import net.minecraft.ReportedException;
-import net.minecraft.core.NonNullList;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.tags.Tag;
-import net.minecraft.world.Container;
-import net.minecraft.world.ContainerHelper;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.player.StackedContents;
-import net.minecraft.world.item.ArmorItem;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.state.BlockState;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_18_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerInventory {
 
@@ -77,20 +76,37 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
 
     @Override
     public void setPlayerOnline(@NotNull org.bukkit.entity.Player player) {
-        if (!this.playerOnline) {
-            Player entityPlayer = PlayerDataManager.getHandle(player);
-            entityPlayer.getInventory().transaction.addAll(this.transaction);
-            this.player = entityPlayer;
-            for (int i = 0; i < getContainerSize(); ++i) {
-                this.player.getInventory().setItem(i, getRawItem(i));
-            }
-            this.player.getInventory().selected = this.selected;
-            this.items = this.player.getInventory().items;
-            this.armor = this.player.getInventory().armor;
-            this.offhand = this.player.getInventory().offhand;
-            this.compartments = ImmutableList.of(this.items, this.armor, this.offhand);
-            this.playerOnline = true;
+        if (this.playerOnline) {
+            return;
         }
+
+        Player offlinePlayer = this.player;
+        Player onlinePlayer = PlayerDataManager.getHandle(player);
+        onlinePlayer.getInventory().transaction.addAll(this.transaction);
+
+        // Set owner to new player.
+        this.player = onlinePlayer;
+
+        // Set player's inventory contents to our modified contents.
+        Inventory onlineInventory = onlinePlayer.getInventory();
+        for (int i = 0; i < getContainerSize(); ++i) {
+            onlineInventory.setItem(i, getRawItem(i));
+        }
+        onlineInventory.selected = this.selected;
+
+        // Set our item arrays to the new inventory's arrays.
+        this.items = onlineInventory.items;
+        this.armor = onlineInventory.armor;
+        this.offhand = onlineInventory.offhand;
+        this.compartments = ImmutableList.of(this.items, this.armor, this.offhand);
+
+        // Add existing viewers to new viewer list.
+        Inventory offlineInventory = offlinePlayer.getInventory();
+        // Remove self from listing - player is always a viewer of their own inventory, prevent duplicates.
+        offlineInventory.transaction.remove(offlinePlayer.getBukkitEntity());
+        onlineInventory.transaction.addAll(offlineInventory.transaction);
+
+        this.playerOnline = true;
     }
 
     @Override
@@ -103,12 +119,6 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
         this.playerOnline = false;
     }
 
-    @Override
-    public boolean isInUse() {
-        List<HumanEntity> viewers = this.getViewers();
-        return viewers.size() > 1 || !viewers.isEmpty() && !viewers.get(0).getUniqueId().equals(this.player.getUUID());
-    }
-
     @Override
     public @NotNull HumanEntity getPlayer() {
         return this.player.getBukkitEntity();
@@ -144,7 +154,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
         }
     }
 
-    private static record IndexedCompartment(@Nullable NonNullList<ItemStack> compartment, int index) {}
+    private record IndexedCompartment(@Nullable NonNullList<ItemStack> compartment, int index) {}
 
     private @NotNull SpecialPlayerInventory.IndexedCompartment getIndexedContent(int index) {
         if (index < items.size()) {
@@ -191,7 +201,8 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
         return i + 9;
     }
 
-    private boolean contains(Predicate<ItemStack> predicate) {
+    @Override
+    public boolean contains(Predicate<ItemStack> predicate) {
         return this.compartments.stream().flatMap(NonNullList::stream).anyMatch(predicate);
     }
 
@@ -251,7 +262,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
     }
 
     private boolean hasRemainingSpaceForItem(ItemStack itemstack, ItemStack itemstack1) {
-        return !itemstack.isEmpty() && ItemStack.isSameItemSameTags(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize();
+        return !itemstack.isEmpty() && ItemStack.isSameItemSameComponents(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize();
     }
 
     @Override
@@ -324,7 +335,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
     @Override
     public int findSlotMatchingItem(ItemStack itemstack) {
         for(int i = 0; i < this.items.size(); ++i) {
-            if (!this.items.get(i).isEmpty() && ItemStack.isSameItemSameTags(itemstack, this.items.get(i))) {
+            if (!this.items.get(i).isEmpty() && ItemStack.isSameItemSameComponents(itemstack, this.items.get(i))) {
                 return i;
             }
         }
@@ -336,7 +347,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
     public int findSlotMatchingUnusedItem(ItemStack itemStack) {
         for(int i = 0; i < this.items.size(); ++i) {
             ItemStack localItem = this.items.get(i);
-            if (!this.items.get(i).isEmpty() && ItemStack.isSameItemSameTags(itemStack, this.items.get(i)) && !this.items.get(i).isDamaged() && !localItem.isEnchanted() && !localItem.hasCustomHoverName()) {
+            if (!this.items.get(i).isEmpty() && ItemStack.isSameItemSameComponents(itemStack, this.items.get(i)) && !this.items.get(i).isDamaged() && !localItem.isEnchanted() && !localItem.has(DataComponents.CUSTOM_NAME)) {
                 return i;
             }
         }
@@ -367,15 +378,9 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
 
     @Override
     public void swapPaint(double d0) {
-        if (d0 > 0.0D) {
-            d0 = 1.0D;
-        }
+        int i = (int) Math.signum(d0);
 
-        if (d0 < 0.0D) {
-            d0 = -1.0D;
-        }
-
-        this.selected = (int) (this.selected - d0);
+        this.selected -= i;
 
         while (this.selected < 0) {
             this.selected += 9;
@@ -411,25 +416,14 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
     }
 
     private int addResource(int i, ItemStack itemstack) {
-        Item item = itemstack.getItem();
         int j = itemstack.getCount();
         ItemStack localItemStack = this.getRawItem(i);
         if (localItemStack.isEmpty()) {
-            localItemStack = new ItemStack(item, 0);
-            if (itemstack.hasTag()) {
-                // hasTag ensures tag not null
-                //noinspection ConstantConditions
-                localItemStack.setTag(itemstack.getTag().copy());
-            }
-
+            localItemStack = itemstack.copyWithCount(0);
             this.setRawItem(i, localItemStack);
         }
 
-        int k = Math.min(j, localItemStack.getMaxStackSize() - localItemStack.getCount());
-
-        if (k > this.getMaxStackSize() - localItemStack.getCount()) {
-            k = this.getMaxStackSize() - localItemStack.getCount();
-        }
+        int k = Math.min(j, this.getMaxStackSize(localItemStack) - localItemStack.getCount());
 
         if (k != 0) {
             j -= k;
@@ -462,7 +456,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
         for (NonNullList<ItemStack> compartment : this.compartments) {
             for (int i = 0; i < compartment.size(); ++i) {
                 if (!compartment.get(i).isEmpty()) {
-                    compartment.get(i).inventoryTick(this.player.level, this.player, i, this.selected == i);
+                    compartment.get(i).inventoryTick(this.player.level(), this.player, i, this.selected == i);
                 }
             }
         }
@@ -490,7 +484,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
                         this.items.get(i).setPopTime(5);
                         itemStack.setCount(0);
                         return true;
-                    } else if (this.player.getAbilities().instabuild) {
+                    } else if (this.player.hasInfiniteMaterials()) {
                         itemStack.setCount(0);
                         return true;
                     } else {
@@ -507,7 +501,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
                         }
                     } while(!itemStack.isEmpty() && itemStack.getCount() < j);
 
-                    if (itemStack.getCount() == j && this.player.getAbilities().instabuild) {
+                    if (itemStack.getCount() == j && this.player.hasInfiniteMaterials()) {
                         itemStack.setCount(0);
                         return true;
                     } else {
@@ -618,7 +612,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
             if (!this.items.get(i).isEmpty()) {
                 CompoundTag compoundTag = new CompoundTag();
                 compoundTag.putByte("Slot", (byte)i);
-                this.items.get(i).save(compoundTag);
+                this.items.get(i).save(this.player.registryAccess(), compoundTag);
                 listTag.add(compoundTag);
             }
         }
@@ -627,7 +621,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
             if (!this.armor.get(i).isEmpty()) {
                 CompoundTag compoundTag = new CompoundTag();
                 compoundTag.putByte("Slot", (byte)(i + 100));
-                this.armor.get(i).save(compoundTag);
+                this.armor.get(i).save(this.player.registryAccess(), compoundTag);
                 listTag.add(compoundTag);
             }
         }
@@ -636,7 +630,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
             if (!this.offhand.get(i).isEmpty()) {
                 CompoundTag compoundTag = new CompoundTag();
                 compoundTag.putByte("Slot", (byte)(i + 150));
-                this.offhand.get(i).save(compoundTag);
+                this.offhand.get(i).save(this.player.registryAccess(), compoundTag);
                 listTag.add(compoundTag);
             }
         }
@@ -653,15 +647,13 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
         for(int i = 0; i < listTag.size(); ++i) {
             CompoundTag compoundTag = listTag.getCompound(i);
             int j = compoundTag.getByte("Slot") & 255;
-            ItemStack itemstack = ItemStack.of(compoundTag);
-            if (!itemstack.isEmpty()) {
-                if (j < this.items.size()) {
-                    this.items.set(j, itemstack);
-                } else if (j >= 100 && j < this.armor.size() + 100) {
-                    this.armor.set(j - 100, itemstack);
-                } else if (j >= 150 && j < this.offhand.size() + 150) {
-                    this.offhand.set(j - 150, itemstack);
-                }
+            ItemStack itemstack = ItemStack.parse(this.player.registryAccess(), compoundTag).orElse(ItemStack.EMPTY);
+            if (j < this.items.size()) {
+                this.items.set(j, itemstack);
+            } else if (j >= 100 && j < this.armor.size() + 100) {
+                this.armor.set(j - 100, itemstack);
+            } else if (j >= 150 && j < this.offhand.size() + 150) {
+                this.offhand.set(j - 150, itemstack);
             }
         }
 
@@ -698,23 +690,6 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
         return this.armor.get(index);
     }
 
-    @Override
-    public void hurtArmor(DamageSource damagesource, float damage, int[] armorIndices) {
-        if (damage > 0.0F) {
-            damage /= 4.0F;
-            if (damage < 1.0F) {
-                damage = 1.0F;
-            }
-
-            for (int index : armorIndices) {
-                ItemStack itemstack = this.armor.get(index);
-                if ((!damagesource.isFire() || !itemstack.getItem().isFireResistant()) && itemstack.getItem() instanceof ArmorItem) {
-                    itemstack.hurtAndBreak((int) damage, this.player, localPlayer -> localPlayer.broadcastBreakEvent(EquipmentSlot.byTypeAndIndex(EquipmentSlot.Type.ARMOR, index)));
-                }
-            }
-        }
-    }
-
     @Override
     public void dropAll() {
         for (NonNullList<ItemStack> compartment : this.compartments) {
@@ -745,12 +720,12 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
 
     @Override
     public boolean contains(ItemStack itemstack) {
-        return contains(itemStack -> itemStack.isEmpty() && itemStack.sameItem(itemstack));
+        return contains(itemStack -> !itemStack.isEmpty() && ItemStack.isSameItemSameComponents(itemstack, itemStack));
     }
 
     @Override
-    public boolean contains(Tag<Item> tag) {
-        return contains(itemStack -> !itemStack.isEmpty() && itemStack.is(tag));
+    public boolean contains(TagKey<Item> tagKey) {
+        return contains(itemStack -> !itemStack.isEmpty() && itemStack.is(tagKey));
     }
 
     @Override

plugin/pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2021 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2022 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
-    <version>4.1.10</version>
+    <version>4.4.6</version>
   </parent>
 
   <artifactId>openinvplugincore</artifactId>
@@ -40,6 +40,10 @@
       <artifactId>spigot-api</artifactId>
       <groupId>org.spigotmc</groupId>
     </dependency>
+    <dependency>
+      <artifactId>planarwrappers</artifactId>
+      <groupId>com.github.jikoo</groupId>
+    </dependency>
   </dependencies>
 
   <build>
@@ -53,6 +57,31 @@
     <plugins>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
+        <configuration>
+          <filters>
+            <filter>
+              <!-- Always shade entirety of required modules. -->
+              <artifact>com.lishid:openinv*</artifact>
+              <includes>
+                <include>**</include>
+              </includes>
+            </filter>
+            <filter>
+              <artifact>*:*</artifact>
+              <!-- Don't warn about file conflicts that'll be clobbered anyway. -->
+              <excludes>
+                <exclude>META-INF/MANIFEST.MF</exclude>
+              </excludes>
+            </filter>
+          </filters>
+          <relocations>
+            <relocation>
+              <pattern>com.github.jikoo.planarwrappers</pattern>
+              <shadedPattern>com.github.jikoo.openinv.planarwrappers</shadedPattern>
+            </relocation>
+          </relocations>
+          <minimizeJar>true</minimizeJar>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

plugin/src/main/java/com/lishid/openinv/InternalAccessor.java

@@ -0,0 +1,275 @@
+/*
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv;
+
+import com.github.jikoo.planarwrappers.util.version.BukkitVersions;
+import com.github.jikoo.planarwrappers.util.version.Version;
+import com.lishid.openinv.internal.IAnySilentContainer;
+import com.lishid.openinv.internal.IPlayerDataManager;
+import com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialInventory;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.util.InventoryAccess;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Constructor;
+
+class InternalAccessor {
+
+    private final @NotNull Plugin plugin;
+    private final @Nullable String versionPackage;
+    private boolean supported = false;
+    private IPlayerDataManager playerDataManager;
+    private IAnySilentContainer anySilentContainer;
+
+    InternalAccessor(@NotNull Plugin plugin) {
+        this.plugin = plugin;
+        this.versionPackage = getVersionPackage();
+        checkSupported();
+    }
+
+    private void checkSupported() {
+        if (versionPackage == null) {
+            return;
+        }
+        try {
+            Class.forName("com.lishid.openinv.internal." + this.versionPackage + ".SpecialPlayerInventory");
+            Class.forName("com.lishid.openinv.internal." + this.versionPackage + ".SpecialEnderChest");
+            this.playerDataManager = this.createObject(IPlayerDataManager.class, "PlayerDataManager");
+            this.anySilentContainer = this.createObject(IAnySilentContainer.class, "AnySilentContainer");
+            this.supported = InventoryAccess.isUsable();
+        } catch (Exception ignored) {}
+    }
+
+    private @Nullable String getVersionPackage() {
+        if (BukkitVersions.MINECRAFT.lessThan(Version.of(1, 20, 4)) // Min supported version: 1.20.4
+                || BukkitVersions.MINECRAFT.equals(Version.of(1, 20, 5))) { // 1.20.5 not supported at all.
+            return null;
+        }
+        if (BukkitVersions.MINECRAFT.equals(Version.of(1, 20, 4))) { // 1.20.4
+            return "v1_20_R3";
+        }
+        if (BukkitVersions.MINECRAFT.equals(Version.of(1, 20, 6))) { // 1.20.6
+            return "v1_20_R4";
+        }
+        if (BukkitVersions.MINECRAFT.greaterThan(Version.of(1, 21))) {
+            return null;
+        }
+        // 1.21
+        return "v1_21_R1";
+    }
+
+    public String getReleasesLink() {
+        if (BukkitVersions.MINECRAFT.lessThan(Version.of(1, 4, 4))) { // Good luck.
+            return "https://dev.bukkit.org/projects/openinv/files?&sort=datecreated";
+        }
+        if (BukkitVersions.MINECRAFT.equals(Version.of(1, 8, 8))) { // 1.8.8
+            return "https://github.com/lishid/OpenInv/releases/tag/4.1.5";
+        }
+        if (BukkitVersions.MINECRAFT.lessThan(Version.of(1, 13))) { // 1.4.4+ had versioned packages.
+            return "https://github.com/lishid/OpenInv/releases/tag/4.0.0 (OpenInv-legacy)";
+        }
+        if (BukkitVersions.MINECRAFT.equals(Version.of(1, 13))) { // 1.13
+            return "https://github.com/lishid/OpenInv/releases/tag/4.0.0";
+        }
+        if (BukkitVersions.MINECRAFT.lessThan(Version.of(1, 14))) { // 1.13.1, 1.13.2
+            return "https://github.com/lishid/OpenInv/releases/tag/4.0.7";
+        }
+        if (BukkitVersions.MINECRAFT.equals(Version.of(1, 14))) { // 1.14 to 1.14.1 had no revision bump.
+            return "https://github.com/lishid/OpenInv/releases/tag/4.0.0";
+        }
+        if (BukkitVersions.MINECRAFT.equals(Version.of(1, 14, 1))) { // 1.14.1 to 1.14.2 had no revision bump.
+            return "https://github.com/lishid/OpenInv/releases/tag/4.0.1";
+        }
+        if (BukkitVersions.MINECRAFT.lessThan(Version.of(1, 15))) { // 1.14.2
+            return "https://github.com/lishid/OpenInv/releases/tag/4.1.1";
+        }
+        if (BukkitVersions.MINECRAFT.lessThanOrEqual(Version.of(1, 15, 1))) { // 1.15, 1.15.1
+            return "https://github.com/lishid/OpenInv/releases/tag/4.1.5";
+        }
+        if (BukkitVersions.MINECRAFT.lessThan(Version.of(1, 16))) { // 1.15.2
+            return "https://github.com/Jikoo/OpenInv/commit/502f661be39ee85d300851dd571f3da226f12345 (never released)";
+        }
+        if (BukkitVersions.MINECRAFT.lessThanOrEqual(Version.of(1, 16, 1))) { // 1.16, 1.16.1
+            return "https://github.com/lishid/OpenInv/releases/tag/4.1.4";
+        }
+        if (BukkitVersions.MINECRAFT.lessThanOrEqual(Version.of(1, 16, 3))) { // 1.16.2, 1.16.3
+            return "https://github.com/lishid/OpenInv/releases/tag/4.1.5";
+        }
+        if (BukkitVersions.MINECRAFT.lessThan(Version.of(1, 17))) { // 1.16.4, 1.16.5
+            return "https://github.com/Jikoo/OpenInv/releases/tag/4.1.8";
+        }
+        if (BukkitVersions.MINECRAFT.lessThanOrEqual(Version.of(1, 18, 1))) { // 1.17, 1.18, 1.18.1
+            return "https://github.com/Jikoo/OpenInv/releases/tag/4.1.10";
+        }
+        if (BukkitVersions.MINECRAFT.lessThan(Version.of(1, 19))) { // 1.18.2
+            return "https://github.com/Jikoo/OpenInv/releases/tag/4.3.0";
+        }
+        if (BukkitVersions.MINECRAFT.equals(Version.of(1, 19))) { // 1.19
+            return "https://github.com/Jikoo/OpenInv/releases/tag/4.2.0";
+        }
+        if (BukkitVersions.MINECRAFT.equals(Version.of(1, 19, 1))) { // 1.19.1
+            return "https://github.com/Jikoo/OpenInv/releases/tag/4.2.2";
+        }
+        if (BukkitVersions.MINECRAFT.lessThanOrEqual(Version.of(1, 19, 3))) { // 1.19.2, 1.19.3
+            return "https://github.com/Jikoo/OpenInv/releases/tag/4.3.0";
+        }
+        if (BukkitVersions.MINECRAFT.lessThan(Version.of(1, 20))) { // 1.19.4
+            return "https://github.com/Jikoo/OpenInv/releases/tag/4.4.3";
+        }
+        if (BukkitVersions.MINECRAFT.lessThanOrEqual(Version.of(1, 20, 1))) { // 1.20, 1.20.1
+            return "https://github.com/Jikoo/OpenInv/releases/tag/4.4.1";
+        }
+        if (BukkitVersions.MINECRAFT.lessThanOrEqual(Version.of(1, 20, 3))) { // 1.20.2, 1.20.3
+            return "https://github.com/Jikoo/OpenInv/releases/tag/4.4.3";
+        }
+        if (BukkitVersions.MINECRAFT.equals(Version.of(1, 20, 5))) { // 1.20.5 shouldn't be used.
+            return "https://github.com/Jikoo/OpenInv/releases";
+        }
+        return "https://github.com/Jikoo/OpenInv/releases";
+    }
+
+    private @NotNull <T> T createObject(
+            @NotNull Class<? extends T> assignableClass,
+            @NotNull String className,
+            @NotNull Object @NotNull ... params)
+            throws ClassCastException, ReflectiveOperationException {
+        // Fetch internal class if it exists.
+        Class<?> internalClass = Class.forName("com.lishid.openinv.internal." + this.versionPackage + "." + className);
+
+        // Quick return: no parameters, no need to fiddle about finding the correct constructor.
+        if (params.length == 0) {
+            return assignableClass.cast(internalClass.getConstructor().newInstance());
+        }
+
+        // Search constructors for one matching the given parameters
+        nextConstructor: for (Constructor<?> constructor : internalClass.getConstructors()) {
+            Class<?>[] requiredClasses = constructor.getParameterTypes();
+            if (requiredClasses.length != params.length) {
+                continue;
+            }
+            for (int i = 0; i < params.length; ++i) {
+                if (!requiredClasses[i].isAssignableFrom(params[i].getClass())) {
+                    continue nextConstructor;
+                }
+            }
+            return assignableClass.cast(constructor.newInstance(params));
+        }
+
+        StringBuilder builder = new StringBuilder("Found class ").append(internalClass.getName())
+                .append(" but cannot find any matching constructors for [");
+        for (Object object : params) {
+            builder.append(object.getClass().getName()).append(", ");
+        }
+        builder.delete(builder.length() - 2, builder.length());
+
+        String message = builder.append(']').toString();
+        this.plugin.getLogger().warning(message);
+
+        throw new NoSuchMethodException(message);
+    }
+
+    private @NotNull <T extends ISpecialInventory> T createSpecialInventory(
+            @NotNull Class<? extends T> assignableClass,
+            @NotNull String className,
+            @NotNull Player player,
+            boolean online) throws InstantiationException {
+        if (!this.supported) {
+            throw new IllegalStateException(String.format("Unsupported server version %s!", BukkitVersions.MINECRAFT));
+        }
+        try {
+            return this.createObject(assignableClass, className, player, online);
+        } catch (Exception original) {
+            InstantiationException exception = new InstantiationException(String.format("Unable to create a new %s", className));
+            exception.initCause(original.fillInStackTrace());
+            throw exception;
+        }
+    }
+
+    /**
+     * Creates an instance of the IAnySilentContainer implementation for the current server version.
+     *
+     * @return the IAnySilentContainer
+     * @throws IllegalStateException if server version is unsupported
+     */
+    public @NotNull IAnySilentContainer getAnySilentContainer() {
+        if (!this.supported) {
+            throw new IllegalStateException(String.format("Unsupported server version %s!", BukkitVersions.MINECRAFT));
+        }
+        return this.anySilentContainer;
+    }
+
+    /**
+     * Creates an instance of the IPlayerDataManager implementation for the current server version.
+     *
+     * @return the IPlayerDataManager
+     * @throws IllegalStateException if server version is unsupported
+     */
+    public @NotNull IPlayerDataManager getPlayerDataManager() {
+        if (!this.supported) {
+            throw new IllegalStateException(String.format("Unsupported server version %s!", BukkitVersions.MINECRAFT));
+        }
+        return this.playerDataManager;
+    }
+
+    /**
+     * Gets the server implementation version.
+     *
+     * @return the version
+     */
+    public @NotNull String getVersion() {
+        return BukkitVersions.MINECRAFT.toString();
+    }
+
+    /**
+     * Checks if the server implementation is supported.
+     *
+     * @return true if initialized for a supported server version
+     */
+    public boolean isSupported() {
+        return this.supported;
+    }
+
+    /**
+     * Creates an instance of the ISpecialEnderChest implementation for the given Player, or
+     * null if the current version is unsupported.
+     *
+     * @param player the Player
+     * @param online true if the Player is online
+     * @return the ISpecialEnderChest created
+     * @throws InstantiationException if the ISpecialEnderChest could not be instantiated
+     */
+    public ISpecialEnderChest newSpecialEnderChest(final Player player, final boolean online) throws InstantiationException {
+        return this.createSpecialInventory(ISpecialEnderChest.class, "SpecialEnderChest", player, online);
+    }
+
+    /**
+     * Creates an instance of the ISpecialPlayerInventory implementation for the given Player..
+     *
+     * @param player the Player
+     * @param online true if the Player is online
+     * @return the ISpecialPlayerInventory created
+     * @throws InstantiationException if the ISpecialPlayerInventory could not be instantiated
+     */
+    public ISpecialPlayerInventory newSpecialPlayerInventory(final Player player, final boolean online) throws InstantiationException {
+        return this.createSpecialInventory(ISpecialPlayerInventory.class, "SpecialPlayerInventory", player, online);
+    }
+
+}

plugin/src/main/java/com/lishid/openinv/InventoryListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,9 +14,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.listeners;
+package com.lishid.openinv;
 
-import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import com.lishid.openinv.util.InventoryAccess;
 import com.lishid.openinv.util.Permissions;
@@ -35,6 +35,7 @@ import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.inventory.InventoryDragEvent;
 import org.bukkit.event.inventory.InventoryInteractEvent;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -45,29 +46,34 @@ import org.jetbrains.annotations.Nullable;
  *
  * @author Jikoo
  */
-public class InventoryListener implements Listener {
-
-    private final OpenInv plugin;
-
-    public InventoryListener(final OpenInv plugin) {
-        this.plugin = plugin;
-    }
+record InventoryListener(OpenInv plugin) implements Listener {
 
     @EventHandler
-    public void onInventoryClose(@NotNull final InventoryCloseEvent event) {
-        if (!(event.getPlayer() instanceof Player)) {
+    private void onInventoryClose(@NotNull final InventoryCloseEvent event) {
+        if (!(event.getPlayer() instanceof Player player)) {
             return;
         }
 
-        Player player = (Player) event.getPlayer();
-
-        if (this.plugin.getPlayerSilentChestStatus(player)) {
+        InventoryHolder holder = event.getInventory().getHolder();
+        if (this.plugin.getSilentContainerStatus(player)
+                && holder != null
+                && this.plugin.getAnySilentContainer().isAnySilentContainer(holder)) {
             this.plugin.getAnySilentContainer().deactivateContainer(player);
         }
+
+        ISpecialInventory specialInventory = InventoryAccess.getEnderChest(event.getInventory());
+        if (specialInventory != null) {
+            this.plugin.handleCloseInventory(specialInventory);
+        } else {
+            specialInventory = InventoryAccess.getPlayerInventory(event.getInventory());
+            if (specialInventory != null) {
+                this.plugin.handleCloseInventory(specialInventory);
+            }
+        }
     }
 
     @EventHandler(priority = EventPriority.LOWEST)
-    public void onInventoryClick(@NotNull final InventoryClickEvent event) {
+    private void onInventoryClick(@NotNull final InventoryClickEvent event) {
         if (handleInventoryInteract(event)) {
             return;
         }
@@ -101,7 +107,7 @@ public class InventoryListener implements Listener {
     }
 
     @EventHandler(priority = EventPriority.LOWEST)
-    public void onInventoryDrag(@NotNull final InventoryDragEvent event) {
+    private void onInventoryDrag(@NotNull final InventoryDragEvent event) {
         if (handleInventoryInteract(event)) {
             return;
         }

plugin/src/main/java/com/lishid/openinv/OfflineHandler.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv;
+
+import com.lishid.openinv.internal.ISpecialInventory;
+import com.lishid.openinv.util.Permissions;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import org.jetbrains.annotations.NotNull;
+
+record OfflineHandler(
+        @NotNull BiFunction<Map<UUID, ? extends ISpecialInventory>, UUID, ISpecialInventory> fetch,
+        @NotNull Consumer<@NotNull ISpecialInventory> handle) {
+
+    static final OfflineHandler REMOVE_AND_CLOSE = new OfflineHandler(
+            Map::remove,
+            inventory -> OpenInv.ejectViewers(inventory, viewer -> true)
+    );
+
+    static final OfflineHandler REQUIRE_PERMISSIONS = new OfflineHandler(
+            Map::get,
+            inventory -> OpenInv.ejectViewers(inventory, viewer -> !Permissions.OPENOFFLINE.hasPermission(viewer))
+    );
+
+}

plugin/src/main/java/com/lishid/openinv/PlayerListener.java

@@ -14,9 +14,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.listeners;
+package com.lishid.openinv;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.util.Permissions;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event.Result;
@@ -28,32 +27,27 @@ import org.bukkit.event.player.PlayerChangedWorldEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.jetbrains.annotations.NotNull;
 
-public class PlayerListener implements Listener {
-
-    private final OpenInv plugin;
-
-    public PlayerListener(OpenInv plugin) {
-        this.plugin = plugin;
-    }
+record PlayerListener(OpenInv plugin) implements Listener {
 
     @EventHandler(priority = EventPriority.LOWEST)
-    public void onPlayerJoin(final PlayerJoinEvent event) {
+    private void onPlayerJoin(@NotNull PlayerJoinEvent event) {
         plugin.setPlayerOnline(event.getPlayer());
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerQuit(PlayerQuitEvent event) {
+    private void onPlayerQuit(@NotNull PlayerQuitEvent event) {
         plugin.setPlayerOffline(event.getPlayer());
     }
 
     @EventHandler
-    public void onWorldChange(PlayerChangedWorldEvent event) {
+    private void onWorldChange(@NotNull PlayerChangedWorldEvent event) {
         plugin.changeWorld(event.getPlayer());
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onPlayerInteract(PlayerInteractEvent event) {
+    private void onPlayerInteract(@NotNull PlayerInteractEvent event) {
 
         // Do not cancel 3rd party plugins' custom events
         if (!PlayerInteractEvent.class.equals(event.getClass())) {
@@ -67,14 +61,14 @@ public class PlayerListener implements Listener {
         }
 
         Player player = event.getPlayer();
-        boolean any = Permissions.ANYCHEST.hasPermission(player) && plugin.getPlayerAnyChestStatus(player);
+        boolean any = Permissions.ANYCHEST.hasPermission(player) && plugin.getAnyContainerStatus(player);
         boolean needsAny = plugin.getAnySilentContainer().isAnyContainerNeeded(event.getClickedBlock());
 
         if (!any && needsAny) {
             return;
         }
 
-        boolean silent = Permissions.SILENT.hasPermission(player) && plugin.getPlayerSilentChestStatus(player);
+        boolean silent = Permissions.SILENT.hasPermission(player) && plugin.getSilentContainerStatus(player);
 
         // If anycontainer or silentcontainer is active
         if (any || silent) {

plugin/src/main/java/com/lishid/openinv/commands/ContainerSettingCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@ package com.lishid.openinv.commands;
 
 import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.util.TabCompleter;
+import com.lishid.openinv.util.lang.Replacement;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.BiConsumer;
@@ -39,15 +40,14 @@ public class ContainerSettingCommand implements TabExecutor {
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (!(sender instanceof Player)) {
+        if (!(sender instanceof Player player)) {
             plugin.sendMessage(sender, "messages.error.consoleUnsupported");
             return true;
         }
 
-        Player player = (Player) sender;
         boolean any = command.getName().startsWith("any");
-        Predicate<Player> getSetting = any ? plugin::getPlayerAnyChestStatus : plugin::getPlayerSilentChestStatus;
-        BiConsumer<OfflinePlayer, Boolean> setSetting = any ? plugin::setPlayerAnyChestStatus : plugin::setPlayerSilentChestStatus;
+        Predicate<Player> getSetting = any ? plugin::getAnyContainerStatus : plugin::getSilentContainerStatus;
+        BiConsumer<OfflinePlayer, Boolean> setSetting = any ? plugin::setAnyContainerStatus : plugin::setSilentContainerStatus;
 
         if (args.length > 0) {
             args[0] = args[0].toLowerCase();
@@ -70,7 +70,11 @@ public class ContainerSettingCommand implements TabExecutor {
             onOff = String.valueOf(getSetting.test(player));
         }
 
-        plugin.sendMessage(sender, "messages.info.settingState","%setting%", any ? "AnyContainer" : "SilentContainer", "%state%", onOff);
+        plugin.sendMessage(
+                sender,
+                "messages.info.settingState",
+                new Replacement("%setting%", any ? "AnyContainer" : "SilentContainer"),
+                new Replacement("%state%", onOff));
 
         return true;
     }

plugin/src/main/java/com/lishid/openinv/commands/OpenInvCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,12 +20,15 @@ import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.util.Permissions;
 import com.lishid.openinv.util.TabCompleter;
+import com.lishid.openinv.util.lang.Replacement;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.StringJoiner;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.PluginCommand;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -43,32 +46,35 @@ public class OpenInvCommand implements TabExecutor {
 
     @Override
     public boolean onCommand(@NotNull final CommandSender sender, @NotNull final Command command, @NotNull final String label, @NotNull final String[] args) {
-        if (!(sender instanceof Player)) {
+        boolean openInv = command.getName().equals("openinv");
+
+        if (openInv && args.length > 0 && (args[0].equalsIgnoreCase("help") || args[0].equals("?"))) {
+            this.showHelp(sender);
+            return true;
+        }
+
+        if (!(sender instanceof Player player)) {
             plugin.sendMessage(sender, "messages.error.consoleUnsupported");
             return true;
         }
 
-        if (args.length > 0 && (args[0].equalsIgnoreCase("help") || args[0].equals("?"))) {
-            this.plugin.showHelp((Player) sender);
-            return true;
-        }
+        String noArgValue;
+        if (plugin.noArgsOpensSelf()) {
+            noArgValue = player.getUniqueId().toString();
+        } else {
+            // History management
+            noArgValue = (openInv ? this.openInvHistory : this.openEnderHistory).get(player);
 
-        final Player player = (Player) sender;
-        final boolean openinv = command.getName().equals("openinv");
-
-        // History management
-        String history = (openinv ? this.openInvHistory : this.openEnderHistory).get(player);
-
-        if (history == null || history.isEmpty()) {
-            history = player.getName();
-            (openinv ? this.openInvHistory : this.openEnderHistory).put(player, history);
+            if (noArgValue == null || noArgValue.isEmpty()) {
+                noArgValue = player.getUniqueId().toString();
+                (openInv ? this.openInvHistory : this.openEnderHistory).put(player, noArgValue);
+            }
         }
 
         final String name;
 
-        // Read from history if target is not named
         if (args.length < 1) {
-            name = history;
+            name = noArgValue;
         } else {
             name = args[0];
         }
@@ -89,7 +95,7 @@ public class OpenInvCommand implements TabExecutor {
                         if (!player.isOnline()) {
                             return;
                         }
-                        OpenInvCommand.this.openInventory(player, offlinePlayer, openinv);
+                        OpenInvCommand.this.openInventory(player, offlinePlayer, openInv);
                     }
                 }.runTask(OpenInvCommand.this.plugin);
 
@@ -99,12 +105,40 @@ public class OpenInvCommand implements TabExecutor {
         return true;
     }
 
+    private void showHelp(final CommandSender sender) {
+        // Get registered commands
+        for (String commandName : plugin.getDescription().getCommands().keySet()) {
+            PluginCommand command = plugin.getCommand(commandName);
+
+            // Ensure command is successfully registered and sender can use it
+            if (command == null  || !command.testPermissionSilent(sender)) {
+                continue;
+            }
+
+            // Send usage
+            sender.sendMessage(command.getUsage().replace("<command>", commandName));
+
+            List<String> aliases = command.getAliases();
+            if (!aliases.isEmpty()) {
+                // Assemble alias list
+                StringJoiner aliasJoiner = new StringJoiner(", ", "   (aliases: ", ")");
+                for (String alias : aliases) {
+                    aliasJoiner.add(alias);
+                }
+
+                // Send all aliases
+                sender.sendMessage(aliasJoiner.toString());
+            }
+
+        }
+    }
+
     private void openInventory(final Player player, final OfflinePlayer target, boolean openinv) {
         Player onlineTarget;
         boolean online = target.isOnline();
 
         if (!online) {
-            if (Permissions.OPENOFFLINE.hasPermission(player)) {
+            if (!plugin.disableOfflineAccess() && Permissions.OPENOFFLINE.hasPermission(player)) {
                 // Try loading the player's data
                 onlineTarget = this.plugin.loadPlayer(target);
             } else {
@@ -142,22 +176,28 @@ public class OpenInvCommand implements TabExecutor {
             // Protected check
             if (!Permissions.OVERRIDE.hasPermission(player)
                     && Permissions.EXEMPT.hasPermission(onlineTarget)) {
-                plugin.sendMessage(player, "messages.error.permissionExempt",
-                        "%target%", onlineTarget.getDisplayName());
+                plugin.sendMessage(
+                        player,
+                        "messages.error.permissionExempt",
+                        new Replacement("%target%", onlineTarget.getDisplayName()));
                 return;
             }
 
             // Crossworld check
             if (!Permissions.CROSSWORLD.hasPermission(player)
                     && !onlineTarget.getWorld().equals(player.getWorld())) {
-                plugin.sendMessage(player, "messages.error.permissionCrossWorld",
-                        "%target%", onlineTarget.getDisplayName());
+                plugin.sendMessage(
+                        player,
+                        "messages.error.permissionCrossWorld",
+                        new Replacement("%target%", onlineTarget.getDisplayName()));
                 return;
             }
         }
 
-        // Record the target
-        (openinv ? this.openInvHistory : this.openEnderHistory).put(player, this.plugin.getPlayerID(target));
+        if (!plugin.noArgsOpensSelf()) {
+            // Record the target
+            (openinv ? this.openInvHistory : this.openEnderHistory).put(player, target.getUniqueId().toString());
+        }
 
         // Create the inventory
         final ISpecialInventory inv;

plugin/src/main/java/com/lishid/openinv/commands/SearchContainerCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@ package com.lishid.openinv.commands;
 
 import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.util.TabCompleter;
+import com.lishid.openinv.util.lang.Replacement;
 import java.util.Collections;
 import java.util.List;
 import org.bukkit.Chunk;
@@ -44,7 +45,7 @@ public class SearchContainerCommand implements TabExecutor {
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (!(sender instanceof Player)) {
+        if (!(sender instanceof Player senderPlayer)) {
             plugin.sendMessage(sender, "messages.error.consoleUnsupported");
             return true;
         }
@@ -57,7 +58,10 @@ public class SearchContainerCommand implements TabExecutor {
         Material material = Material.getMaterial(args[0].toUpperCase());
 
         if (material == null) {
-            plugin.sendMessage(sender, "messages.error.invalidMaterial", "%target%", args[0]);
+            plugin.sendMessage(
+                    sender,
+                    "messages.error.invalidMaterial",
+                    new Replacement("%target%", args[0]));
             return false;
         }
 
@@ -72,7 +76,10 @@ public class SearchContainerCommand implements TabExecutor {
             }
         }
 
-        Player senderPlayer = (Player) sender;
+        // Clamp radius.
+        int configMax = plugin.getConfig().getInt("settings.command.searchcontainer.max-radius", 10);
+        radius = Math.max(0, Math.min(radius, configMax));
+
         World world = senderPlayer.getWorld();
         Chunk centerChunk = senderPlayer.getLocation().getChunk();
         StringBuilder locations = new StringBuilder();
@@ -84,10 +91,9 @@ public class SearchContainerCommand implements TabExecutor {
                 }
                 Chunk chunk = world.getChunkAt(centerChunk.getX() + dX, centerChunk.getZ() + dZ);
                 for (BlockState tileEntity : chunk.getTileEntities()) {
-                    if (!(tileEntity instanceof InventoryHolder)) {
+                    if (!(tileEntity instanceof InventoryHolder holder)) {
                         continue;
                     }
-                    InventoryHolder holder = (InventoryHolder) tileEntity;
                     if (!holder.getInventory().contains(material)) {
                         continue;
                     }
@@ -102,13 +108,18 @@ public class SearchContainerCommand implements TabExecutor {
         if (locations.length() > 0) {
             locations.delete(locations.length() - 2, locations.length());
         } else {
-            plugin.sendMessage(sender, "messages.info.container.noMatches",
-                    "%target%", material.name());
+            plugin.sendMessage(
+                    sender,
+                    "messages.info.container.noMatches",
+                    new Replacement("%target%", material.name()));
             return true;
         }
 
-        plugin.sendMessage(sender, "messages.info.container.matches",
-                "%target%", material.name(), "%detail%", locations.toString());
+        plugin.sendMessage(
+                sender,
+                "messages.info.container.matches",
+                new Replacement("%target%", material.name()),
+                new Replacement("%detail%", locations.toString()));
         return true;
     }
 

plugin/src/main/java/com/lishid/openinv/commands/SearchEnchantCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@ package com.lishid.openinv.commands;
 
 import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.util.TabCompleter;
+import com.lishid.openinv.util.lang.Replacement;
 import java.util.Collections;
 import java.util.List;
 import org.bukkit.Material;
@@ -114,20 +115,23 @@ public class SearchEnchantCommand implements TabExecutor {
             // Matches found, delete trailing comma and space
             players.delete(players.length() - 2, players.length());
         } else {
-            plugin.sendMessage(sender, "messages.info.player.noMatches",
-                    "%target%", (enchant != null ? enchant.getKey().toString() : "") + " >= " + level);
+            plugin.sendMessage(
+                    sender,
+                    "messages.info.player.noMatches",
+                    new Replacement("%target%", (enchant != null ? enchant.getKey().toString() : "") + " >= " + level));
             return true;
         }
 
-        plugin.sendMessage(sender, "messages.info.player.matches",
-                "%target%", (enchant != null ? enchant.getKey().toString() : "") + " >= " + level,
-                "%detail%", players.toString());
+        plugin.sendMessage(
+                sender,
+                "messages.info.player.matches",
+                new Replacement("%target%", (enchant != null ? enchant.getKey().toString() : "") + " >= " + level),
+                        new Replacement("%detail%", players.toString()));
         return true;
     }
 
     private boolean containsEnchantment(Inventory inventory, @Nullable Enchantment enchant, int minLevel) {
         for (ItemStack item : inventory.getContents()) {
-            //noinspection ConstantConditions // Spigot improperly annotated, should be ItemStack @NotNull []
             if (item == null || item.getType() == Material.AIR) {
                 continue;
             }

plugin/src/main/java/com/lishid/openinv/commands/SearchInvCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@ package com.lishid.openinv.commands;
 
 import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.util.TabCompleter;
+import com.lishid.openinv.util.lang.Replacement;
 import java.util.Collections;
 import java.util.List;
 import org.bukkit.Material;
@@ -46,7 +47,10 @@ public class SearchInvCommand implements TabExecutor {
         }
 
         if (material == null) {
-            plugin.sendMessage(sender, "messages.error.invalidMaterial", "%target%", args.length > 0 ? args[0] : "null");
+            plugin.sendMessage(
+                    sender,
+                    "messages.error.invalidMaterial",
+                    new Replacement("%target%", args.length > 0 ? args[0] : "null"));
             return false;
         }
 
@@ -56,7 +60,10 @@ public class SearchInvCommand implements TabExecutor {
             try {
                 count = Integer.parseInt(args[1]);
             } catch (NumberFormatException ex) {
-                plugin.sendMessage(sender, "messages.error.invalidNumber", "%target%", args[1]);
+                plugin.sendMessage(
+                        sender,
+                        "messages.error.invalidNumber",
+                        new Replacement("%target%", args[1]));
                 return false;
             }
         }
@@ -74,13 +81,18 @@ public class SearchInvCommand implements TabExecutor {
         if (players.length() > 0) {
             players.delete(players.length() - 2, players.length());
         } else {
-            plugin.sendMessage(sender, "messages.info.player.noMatches",
-                    "%target%", material.name());
+            plugin.sendMessage(
+                    sender,
+                    "messages.info.player.noMatches",
+                    new Replacement("%target%", material.name()));
             return true;
         }
 
-        plugin.sendMessage(sender, "messages.info.player.matches",
-                "%target%", material.name(), "%detail%", players.toString());
+        plugin.sendMessage(
+                sender,
+                "messages.info.player.matches",
+                new Replacement("%target%", material.name()),
+                new Replacement("%detail%", players.toString()));
         return true;
     }
 

plugin/src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

plugin/src/main/java/com/lishid/openinv/internal/OpenInventoryView.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
 package com.lishid.openinv.internal;
 
 import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.util.lang.Replacement;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
@@ -24,15 +25,21 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryView;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Objects;
+
 public class OpenInventoryView extends InventoryView {
 
-    private final Player player;
-    private final ISpecialInventory inventory;
-    private final String titleKey;
-    private final String titleDefaultSuffix;
+    private final @NotNull Player player;
+    private final @NotNull ISpecialInventory inventory;
+    private final @NotNull String titleKey;
+    private final @NotNull String titleDefaultSuffix;
     private String title;
 
-    public OpenInventoryView(Player player, ISpecialInventory inventory, String titleKey, String titleDefaultSuffix) {
+    public OpenInventoryView(
+            @NotNull Player player,
+            @NotNull ISpecialInventory inventory,
+            @NotNull String titleKey,
+            @NotNull String titleDefaultSuffix) {
         this.player = player;
         this.inventory = inventory;
         this.titleKey = titleKey;
@@ -62,22 +69,28 @@ public class OpenInventoryView extends InventoryView {
     @Override
     public @NotNull String getTitle() {
         if (title == null) {
-            HumanEntity owner = inventory.getPlayer();
-
-            String localTitle = OpenInv.getPlugin(OpenInv.class)
-                    .getLocalizedMessage(
-                            owner,
-                            titleKey,
-                            "%player%",
-                            owner.getName());
-            if (localTitle != null) {
-                title = localTitle;
-            } else  {
-                title = owner.getName() + titleDefaultSuffix;
-            }
+            title = getOriginalTitle();
         }
 
         return title;
     }
 
+    @NotNull
+    @Override
+    public String getOriginalTitle() {
+        HumanEntity owner = inventory.getPlayer();
+
+        String localTitle = OpenInv.getPlugin(OpenInv.class)
+            .getLocalizedMessage(
+                player,
+                titleKey,
+                new Replacement("%player%", owner.getName()));
+        return Objects.requireNonNullElseGet(localTitle, () -> owner.getName() + titleDefaultSuffix);
+    }
+
+    @Override
+    public void setTitle(@NotNull String title) {
+        this.title = title;
+    }
+
 }

plugin/src/main/java/com/lishid/openinv/listeners/PluginListener.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.listeners;
-
-import com.lishid.openinv.OpenInv;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.server.PluginDisableEvent;
-
-/**
- * Listener for plugin-related events.
- *
- * @author Jikoo
- */
-public class PluginListener implements Listener {
-
-    private final OpenInv plugin;
-
-    public PluginListener(OpenInv plugin) {
-        this.plugin = plugin;
-    }
-
-    @EventHandler
-    public void onPluginDisable(PluginDisableEvent event) {
-        plugin.releaseAllPlayers(event.getPlugin());
-    }
-
-}

plugin/src/main/java/com/lishid/openinv/util/Cache.java

@@ -1,187 +0,0 @@
-/*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.util;
-
-import com.google.common.collect.Multimap;
-import com.google.common.collect.TreeMultimap;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
-/**
- * A minimal thread-safe time-based cache implementation backed by a HashMap and TreeMultimap.
- *
- * @author Jikoo
- */
-public class Cache<K, V> {
-
-    private final Map<K, V> internal;
-    private final Multimap<Long, K> expiry;
-    private final long retention;
-    private final Predicate<V> inUseCheck;
-    private final Consumer<V> postRemoval;
-
-    /**
-     * Constructs a Cache with the specified retention duration, in use function, and post-removal function.
-     *
-     * @param retention duration after which keys are automatically invalidated if not in use
-     * @param inUseCheck Predicate used to check if a key is considered in use
-     * @param postRemoval Consumer used to perform any operations required when a key is invalidated
-     */
-    public Cache(final long retention, final Predicate<V> inUseCheck, final Consumer<V> postRemoval) {
-        this.internal = new HashMap<>();
-
-        this.expiry = TreeMultimap.create(Long::compareTo, (k1, k2) -> Objects.equals(k1, k2) ? 0 : 1);
-
-        this.retention = retention;
-        this.inUseCheck = inUseCheck;
-        this.postRemoval = postRemoval;
-    }
-
-    /**
-     * Set a key and value pair. Keys are unique. Using an existing key will cause the old value to
-     * be overwritten and the expiration timer to be reset.
-     *
-     * @param key key with which the specified value is to be associated
-     * @param value value to be associated with the specified key
-     */
-    public void put(final K key, final V value) {
-        // Invalidate key - runs lazy check and ensures value won't be cleaned up early
-        this.invalidate(key);
-
-        synchronized (this.internal) {
-            this.internal.put(key, value);
-            this.expiry.put(System.currentTimeMillis() + this.retention, key);
-        }
-    }
-
-    /**
-     * Returns the value to which the specified key is mapped, or null if no value is mapped for the key.
-     *
-     * @param key the key whose associated value is to be returned
-     * @return the value to which the specified key is mapped, or null if no value is mapped for the key
-     */
-    public V get(final K key) {
-        // Run lazy check to clean cache
-        this.lazyCheck();
-
-        synchronized (this.internal) {
-            return this.internal.get(key);
-        }
-    }
-
-    /**
-     * Returns true if the specified key is mapped to a value.
-     *
-     * @param key key to check if a mapping exists for
-     * @return true if a mapping exists for the specified key
-     */
-    public boolean containsKey(final K key) {
-        // Run lazy check to clean cache
-        this.lazyCheck();
-
-        synchronized (this.internal) {
-            return this.internal.containsKey(key);
-        }
-    }
-
-    /**
-     * Forcibly invalidates a key, even if it is considered to be in use.
-     *
-     * @param key key to invalidate
-     */
-    public void invalidate(final K key) {
-        // Run lazy check to clean cache
-        this.lazyCheck();
-
-        synchronized (this.internal) {
-            if (!this.internal.containsKey(key)) {
-                // Value either not present or cleaned by lazy check. Either way, we're good
-                return;
-            }
-
-            // Remove stored object
-            this.internal.remove(key);
-
-            // Remove expiration entry - prevents more work later, plus prevents issues with values invalidating early
-            for (Iterator<Map.Entry<Long, K>> iterator = this.expiry.entries().iterator(); iterator.hasNext();) {
-                if (key.equals(iterator.next().getValue())) {
-                    iterator.remove();
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Forcibly invalidates all keys, even if they are considered to be in use.
-     */
-    public void invalidateAll() {
-        synchronized (this.internal) {
-            for (V value : this.internal.values()) {
-                this.postRemoval.accept(value);
-            }
-            this.expiry.clear();
-            this.internal.clear();
-        }
-    }
-
-    /**
-     * Invalidate all expired keys that are not considered in use. If a key is expired but is
-     * considered in use by the provided Function, its expiration time is reset.
-     */
-    private void lazyCheck() {
-        long now = System.currentTimeMillis();
-        synchronized (this.internal) {
-            List<K> inUse = new ArrayList<>();
-            for (Iterator<Map.Entry<Long, K>> iterator = this.expiry.entries().iterator(); iterator
-                    .hasNext();) {
-                Map.Entry<Long, K> entry = iterator.next();
-
-                if (entry.getKey() > now) {
-                    break;
-                }
-
-                iterator.remove();
-
-                if (this.inUseCheck.test(this.internal.get(entry.getValue()))) {
-                    inUse.add(entry.getValue());
-                    continue;
-                }
-
-                V value = this.internal.remove(entry.getValue());
-
-                if (value == null) {
-                    continue;
-                }
-
-                this.postRemoval.accept(value);
-            }
-
-            long nextExpiry = now + this.retention;
-            for (K value : inUse) {
-                this.expiry.put(nextExpiry, value);
-            }
-        }
-    }
-
-}

plugin/src/main/java/com/lishid/openinv/util/ConfigUpdater.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,13 +25,7 @@ import java.util.Set;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.ConfigurationSection;
 
-public class ConfigUpdater {
-
-    private final OpenInv plugin;
-
-    public ConfigUpdater(OpenInv plugin) {
-        this.plugin = plugin;
-    }
+public record ConfigUpdater(OpenInv plugin) {
 
     public void checkForUpdates() {
         final int version = plugin.getConfig().getInt("config-version", 1);
@@ -60,6 +54,12 @@ public class ConfigUpdater {
             if (version < 4) {
                 updateConfig3To4();
             }
+            if (version < 5) {
+                updateConfig4To5();
+            }
+            if (version < 6) {
+                updateConfig5To6();
+            }
 
             plugin.getServer().getScheduler().runTask(plugin, () -> {
                 plugin.saveConfig();
@@ -68,6 +68,21 @@ public class ConfigUpdater {
         });
     }
 
+    private void updateConfig5To6() {
+        plugin.getServer().getScheduler().runTask(plugin, () -> {
+            plugin.getConfig().set("settings.command.open.no-args-opens-self", false);
+            plugin.getConfig().set("settings.command.searchcontainer.max-radius", 10);
+            plugin.getConfig().set("config-version", 6);
+        });
+    }
+
+    private void updateConfig4To5() {
+        plugin.getServer().getScheduler().runTask(plugin, () -> {
+            plugin.getConfig().set("settings.disable-offline-access", false);
+            plugin.getConfig().set("config-version", 5);
+        });
+    }
+
     private void updateConfig3To4() {
         plugin.getServer().getScheduler().runTask(plugin, () -> {
             plugin.getConfig().set("notify", null);
@@ -124,7 +139,7 @@ public class ConfigUpdater {
         for (String playerName : keys) {
             OfflinePlayer player = plugin.matchPlayer(playerName);
             if (player != null) {
-                toggles.put(plugin.getPlayerID(player), section.getBoolean(playerName + ".toggle", false));
+                toggles.put(player.getUniqueId().toString(), section.getBoolean(playerName + ".toggle", false));
             }
         }
 

plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java

@@ -1,226 +0,0 @@
-/*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.util;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.jetbrains.annotations.NotNull;
-
-public class InternalAccessor {
-
-    private final Plugin plugin;
-    private final String version;
-    private boolean supported = false;
-    private IPlayerDataManager playerDataManager;
-    private IAnySilentContainer anySilentContainer;
-
-    public InternalAccessor(final Plugin plugin) {
-        this.plugin = plugin;
-
-        String packageName = plugin.getServer().getClass().getPackage().getName();
-        this.version = packageName.substring(packageName.lastIndexOf('.') + 1);
-
-        try {
-            Class.forName("com.lishid.openinv.internal." + this.version + ".SpecialPlayerInventory");
-            Class.forName("com.lishid.openinv.internal." + this.version + ".SpecialEnderChest");
-            this.playerDataManager = this.createObject(IPlayerDataManager.class, "PlayerDataManager");
-            this.anySilentContainer = this.createObject(IAnySilentContainer.class, "AnySilentContainer");
-            this.supported = InventoryAccess.isUsable();
-        } catch (Exception ignored) {}
-    }
-
-    public String getReleasesLink() {
-        switch (version) {
-            case "1_4_5":
-            case "1_4_6":
-            case "v1_4_R1":
-            case "v1_5_R2":
-            case "v1_5_R3":
-            case "v1_6_R1":
-            case "v1_6_R2":
-            case "v1_6_R3":
-            case "v1_7_R1":
-            case "v1_7_R2":
-            case "v1_7_R3":
-            case "v1_7_R4":
-            case "v1_8_R1":
-            case "v1_8_R2":
-            case "v1_9_R1":
-            case "v1_9_R2":
-            case "v1_10_R1":
-            case "v1_11_R1":
-            case "v1_12_R1":
-                return "https://github.com/lishid/OpenInv/releases/tag/4.0.0 (OpenInv-legacy)";
-            case "v1_13_R1":
-                return "https://github.com/lishid/OpenInv/releases/tag/4.0.0";
-            case "v1_13_R2":
-                return "https://github.com/lishid/OpenInv/releases/tag/4.0.7";
-            case "v1_14_R1":
-                return "https://github.com/lishid/OpenInv/releases/tag/4.1.1";
-            case "v1_16_R1":
-                return "https://github.com/lishid/OpenInv/releases/tag/4.1.4";
-            case "v1_8_R3":
-            case "v1_15_R1":
-            case "v1_16_R2":
-                return "https://github.com/lishid/OpenInv/releases/tag/4.1.5";
-            case "v1_16_R3":
-                return "https://github.com/Jikoo/OpenInv/releases/tag/4.1.8";
-            case "v1_17_R1":
-            default:
-                return "https://github.com/Jikoo/OpenInv/releases";
-        }
-    }
-
-    private <T> T createObject(final Class<? extends T> assignableClass, final String className,
-            final Object... params) throws ClassCastException, ClassNotFoundException,
-            InstantiationException, IllegalAccessException, IllegalArgumentException,
-            InvocationTargetException, NoSuchMethodException, SecurityException {
-        // Fetch internal class if it exists.
-        Class<?> internalClass = Class.forName("com.lishid.openinv.internal." + this.version + "." + className);
-        if (!assignableClass.isAssignableFrom(internalClass)) {
-            String message = String.format("Found class %s but cannot cast to %s!", internalClass.getName(), assignableClass.getName());
-            this.plugin.getLogger().warning(message);
-            throw new IllegalStateException(message);
-        }
-
-        // Quick return: no parameters, no need to fiddle about finding the correct constructor.
-        if (params.length == 0) {
-            return assignableClass.cast(internalClass.getConstructor().newInstance());
-        }
-
-        // Search constructors for one matching the given parameters
-        nextConstructor: for (Constructor<?> constructor : internalClass.getConstructors()) {
-            Class<?>[] requiredClasses = constructor.getParameterTypes();
-            if (requiredClasses.length != params.length) {
-                continue;
-            }
-            for (int i = 0; i < params.length; ++i) {
-                if (!requiredClasses[i].isAssignableFrom(params[i].getClass())) {
-                    continue nextConstructor;
-                }
-            }
-            return assignableClass.cast(constructor.newInstance(params));
-        }
-
-        StringBuilder builder = new StringBuilder("Found class ").append(internalClass.getName())
-                .append(" but cannot find any matching constructors for [");
-        for (Object object : params) {
-            builder.append(object.getClass().getName()).append(", ");
-        }
-        builder.delete(builder.length() - 2, builder.length());
-
-        String message = builder.append(']').toString();
-        this.plugin.getLogger().warning(message);
-
-        throw new IllegalArgumentException(message);
-    }
-
-    private <T extends ISpecialInventory> T createSpecialInventory(
-            @NotNull Class<? extends T> assignableClass,
-            @NotNull String className,
-            @NotNull Player player,
-            boolean online) throws InstantiationException {
-        if (!this.supported) {
-            throw new IllegalStateException(String.format("Unsupported server version %s!", this.version));
-        }
-        try {
-            return this.createObject(assignableClass, className, player, online);
-        } catch (Exception original) {
-            InstantiationException exception = new InstantiationException(String.format("Unable to create a new %s", className));
-            exception.initCause(original.fillInStackTrace());
-            throw exception;
-        }
-    }
-
-    /**
-     * Creates an instance of the IAnySilentContainer implementation for the current server version.
-     *
-     * @return the IAnySilentContainer
-     * @throws IllegalStateException if server version is unsupported
-     */
-    public IAnySilentContainer getAnySilentContainer() {
-        if (!this.supported) {
-            throw new IllegalStateException(String.format("Unsupported server version %s!", this.version));
-        }
-        return this.anySilentContainer;
-    }
-
-    /**
-     * Creates an instance of the IPlayerDataManager implementation for the current server version.
-     *
-     * @return the IPlayerDataManager
-     * @throws IllegalStateException if server version is unsupported
-     */
-    public IPlayerDataManager getPlayerDataManager() {
-        if (!this.supported) {
-            throw new IllegalStateException(String.format("Unsupported server version %s!", this.version));
-        }
-        return this.playerDataManager;
-    }
-
-    /**
-     * Gets the server implementation version. If not initialized, returns the string "null"
-     * instead.
-     *
-     * @return the version, or "null"
-     */
-    public String getVersion() {
-        return this.version != null ? this.version : "null";
-    }
-
-    /**
-     * Checks if the server implementation is supported.
-     *
-     * @return true if initialized for a supported server version
-     */
-    public boolean isSupported() {
-        return this.supported;
-    }
-
-    /**
-     * Creates an instance of the ISpecialEnderChest implementation for the given Player, or
-     * null if the current version is unsupported.
-     *
-     * @param player the Player
-     * @param online true if the Player is online
-     * @return the ISpecialEnderChest created
-     * @throws InstantiationException if the ISpecialEnderChest could not be instantiated
-     */
-    public ISpecialEnderChest newSpecialEnderChest(final Player player, final boolean online) throws InstantiationException {
-        return this.createSpecialInventory(ISpecialEnderChest.class, "SpecialEnderChest", player, online);
-    }
-
-    /**
-     * Creates an instance of the ISpecialPlayerInventory implementation for the given Player..
-     *
-     * @param player the Player
-     * @param online true if the Player is online
-     * @return the ISpecialPlayerInventory created
-     * @throws InstantiationException if the ISpecialPlayerInventory could not be instantiated
-     */
-    public ISpecialPlayerInventory newSpecialPlayerInventory(final Player player, final boolean online) throws InstantiationException {
-        return this.createSpecialInventory(ISpecialPlayerInventory.class, "SpecialPlayerInventory", player, online);
-    }
-
-}

plugin/src/main/java/com/lishid/openinv/util/LanguageManager.java

@@ -1,170 +0,0 @@
-/*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.util;
-
-import com.lishid.openinv.OpenInv;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import org.bukkit.ChatColor;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * A simple language manager supporting both custom and bundled languages.
- *
- * @author Jikoo
- */
-public class LanguageManager {
-
-	private final OpenInv plugin;
-	private final String defaultLocale;
-	private final Map<String, YamlConfiguration> locales;
-
-	public LanguageManager(@NotNull OpenInv plugin, @NotNull String defaultLocale) {
-		this.plugin = plugin;
-		this.defaultLocale = defaultLocale;
-		this.locales = new HashMap<>();
-		getOrLoadLocale(defaultLocale);
-	}
-
-	private YamlConfiguration getOrLoadLocale(@NotNull String locale) {
-		YamlConfiguration loaded = locales.get(locale);
-		if (loaded != null) {
-			return loaded;
-		}
-
-		InputStream resourceStream = plugin.getResource(locale + ".yml");
-		YamlConfiguration localeConfigDefaults;
-		if (resourceStream == null) {
-			localeConfigDefaults = new YamlConfiguration();
-		} else {
-			try (BufferedReader reader = new BufferedReader(new InputStreamReader(resourceStream))) {
-				localeConfigDefaults = YamlConfiguration.loadConfiguration(reader);
-			} catch (IOException e) {
-				plugin.getLogger().log(Level.WARNING, "[LanguageManager] Unable to load resource " + locale + ".yml", e);
-				localeConfigDefaults = new YamlConfiguration();
-			}
-		}
-
-		File file = new File(plugin.getDataFolder(), locale + ".yml");
-		YamlConfiguration localeConfig;
-
-		if (!file.exists()) {
-			localeConfig = localeConfigDefaults;
-			try {
-				localeConfigDefaults.save(file);
-			} catch (IOException e) {
-				plugin.getLogger().log(Level.WARNING, "[LanguageManager] Unable to save resource " + locale + ".yml", e);
-			}
-		} else {
-			localeConfig = YamlConfiguration.loadConfiguration(file);
-
-			// Add new language keys
-			List<String> newKeys = new ArrayList<>();
-			for (String key : localeConfigDefaults.getKeys(true)) {
-				if (localeConfigDefaults.isConfigurationSection(key)) {
-					continue;
-				}
-
-				if (localeConfig.isSet(key)) {
-					continue;
-				}
-
-				localeConfig.set(key, localeConfigDefaults.get(key));
-				newKeys.add(key);
-			}
-
-			if (!newKeys.isEmpty()) {
-				plugin.getLogger().info("[LanguageManager] Added new language keys: " + String.join(", ", newKeys));
-				try {
-					localeConfig.save(file);
-				} catch (IOException e) {
-					plugin.getLogger().log(Level.WARNING, "[LanguageManager] Unable to save resource " + locale + ".yml", e);
-				}
-			}
-		}
-
-		if (!locale.equals(defaultLocale)) {
-			localeConfigDefaults = locales.get(defaultLocale);
-
-			// Check for missing keys
-			List<String> newKeys = new ArrayList<>();
-			for (String key : localeConfigDefaults.getKeys(true)) {
-				if (localeConfigDefaults.isConfigurationSection(key)) {
-					continue;
-				}
-
-				if (localeConfig.isSet(key)) {
-					continue;
-				}
-
-				newKeys.add(key);
-			}
-
-			if (!newKeys.isEmpty()) {
-				plugin.getLogger().info("[LanguageManager] Missing translations from " + locale + ".yml: " + String.join(", ", newKeys));
-			}
-
-			// Fall through to default locale
-			localeConfig.setDefaults(localeConfigDefaults);
-		}
-
-		locales.put(locale, localeConfig);
-		return localeConfig;
-	}
-
-	@Nullable
-	public String getValue(@NotNull String key, @Nullable String locale) {
-		String value = getOrLoadLocale(locale == null ? defaultLocale : locale.toLowerCase()).getString(key);
-		if (value == null || value.isEmpty()) {
-			return null;
-		}
-
-		value = ChatColor.translateAlternateColorCodes('&', value);
-
-		return value;
-	}
-
-	@Nullable
-	public String getValue(@NotNull String key, @Nullable String locale, @NotNull String... replacements) {
-		if (replacements.length % 2 != 0) {
-			plugin.getLogger().log(Level.WARNING, "[LanguageManager] Replacement data is uneven", new Exception());
-		}
-
-		String value = getValue(key, locale);
-
-		if (value == null) {
-			return null;
-		}
-
-		for (int i = 0; i < replacements.length; i += 2) {
-			value = value.replace(replacements[i], replacements[i + 1]);
-		}
-
-		return value;
-	}
-
-}

plugin/src/main/java/com/lishid/openinv/util/Permissions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
 package com.lishid.openinv.util;
 
 import org.bukkit.permissions.Permissible;
+import org.jetbrains.annotations.NotNull;
 
 public enum Permissions {
 
@@ -50,7 +51,7 @@ public enum Permissions {
         this.uninheritable = uninheritable;
     }
 
-    public boolean hasPermission(Permissible permissible) {
+    public boolean hasPermission(@NotNull Permissible permissible) {
 
         boolean hasPermission = permissible.hasPermission(permission);
         if (uninheritable || hasPermission || permissible.isPermissionSet(permission)) {

plugin/src/main/java/com/lishid/openinv/util/lang/LanguageManager.java

@@ -0,0 +1,218 @@
+/*
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.util.lang;
+
+import com.lishid.openinv.OpenInv;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+import java.util.logging.Level;
+import org.bukkit.ChatColor;
+import org.bukkit.configuration.Configuration;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A simple language manager supporting both custom and bundled languages.
+ *
+ * @author Jikoo
+ */
+public class LanguageManager {
+
+    private final OpenInv plugin;
+    private final String defaultLocale;
+    private final Map<String, YamlConfiguration> locales;
+
+    public LanguageManager(@NotNull OpenInv plugin, @NotNull String defaultLocale) {
+        this.plugin = plugin;
+        this.defaultLocale = defaultLocale;
+        this.locales = new HashMap<>();
+        getOrLoadLocale(defaultLocale);
+    }
+
+    private @NotNull YamlConfiguration getOrLoadLocale(@NotNull String locale) {
+        YamlConfiguration loaded = locales.get(locale);
+        if (loaded != null) {
+            return loaded;
+        }
+
+        File file = new File(plugin.getDataFolder(), locale + ".yml");
+
+        // Load locale config from disk and bundled locale defaults.
+        YamlConfiguration localeConfig = loadLocale(locale, file);
+
+        // If the locale is not the default locale, also handle any missing translations from the default locale.
+        if (!locale.equals(defaultLocale)) {
+            addTranslationFallthrough(locale, localeConfig, file);
+
+            if (plugin.getConfig().getBoolean("settings.secret.warn-about-guess-section", true)
+                    && localeConfig.isConfigurationSection("guess")) {
+                // Warn that guess section exists. This should run once per language per server restart
+                // when accessed by a user to hint to server owners that they can make UX improvements.
+                plugin.getLogger().info(() -> "[LanguageManager] Missing translations from " + locale + ".yml! Check the guess section!");
+            }
+        }
+
+        locales.put(locale, localeConfig);
+        return localeConfig;
+    }
+
+    private @NotNull YamlConfiguration loadLocale(
+            @NotNull String locale,
+            @NotNull File file) {
+        // Load defaults from the plugin's bundled resources.
+        InputStream resourceStream = plugin.getResource("locale/" + locale + ".yml");
+        YamlConfiguration localeConfigDefaults;
+        if (resourceStream == null) {
+            localeConfigDefaults = new YamlConfiguration();
+        } else {
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(resourceStream, StandardCharsets.UTF_8))) {
+                localeConfigDefaults = YamlConfiguration.loadConfiguration(reader);
+            } catch (IOException e) {
+                plugin.getLogger().log(Level.WARNING, e, () -> "[LanguageManager] Unable to load resource " + locale + ".yml");
+                localeConfigDefaults = new YamlConfiguration();
+            }
+        }
+
+        if (!file.exists()) {
+            // If the file does not exist on disk, save bundled defaults.
+            try {
+                localeConfigDefaults.save(file);
+            } catch (IOException e) {
+                plugin.getLogger().log(Level.WARNING, e, () -> "[LanguageManager] Unable to save resource " + locale + ".yml");
+            }
+            // Return loaded bundled locale.
+            return localeConfigDefaults;
+        }
+
+        // If the file does exist on disk, load it.
+        YamlConfiguration localeConfig = YamlConfiguration.loadConfiguration(file);
+        // Check for missing translations from the bundled file.
+        List<String> newKeys = getMissingKeys(localeConfigDefaults, localeConfig::isSet);
+
+        if (newKeys.isEmpty()) {
+            return localeConfig;
+        }
+
+        // Get guess section for missing keys.
+        ConfigurationSection guess = localeConfig.getConfigurationSection("guess");
+
+        for (String newKey : newKeys) {
+            // Set all missing keys to defaults.
+            localeConfig.set(newKey, localeConfigDefaults.get(newKey));
+
+            // Delete relevant guess keys in case this is a new translation.
+            if (guess != null) {
+                guess.set(newKey, null);
+            }
+        }
+
+        // If guess section is empty, delete it.
+        if (guess != null && guess.getKeys(false).isEmpty()) {
+            localeConfig.set("guess", null);
+        }
+
+        plugin.getLogger().info(() -> "[LanguageManager] Added new translation keys to " + locale + ".yml: " + String.join(", ", newKeys));
+
+        // Write new keys to disk.
+        try {
+            localeConfig.save(file);
+        } catch (IOException e) {
+            plugin.getLogger().log(Level.WARNING, e, () -> "[LanguageManager] Unable to save resource " + locale + ".yml");
+        }
+
+        return localeConfig;
+    }
+
+    private void addTranslationFallthrough(
+            @NotNull String locale,
+            @NotNull YamlConfiguration localeConfig,
+            @NotNull File file) {
+        YamlConfiguration defaultLocaleConfig = locales.get(defaultLocale);
+
+        // Get missing keys. Keys that already have a guess value are not new and don't need to trigger another write.
+        List<String> missingKeys = getMissingKeys(
+                defaultLocaleConfig,
+                key -> localeConfig.isSet(key) || localeConfig.isSet("guess." + key));
+
+        if (!missingKeys.isEmpty()) {
+            // Set up guess section for missing keys.
+            for (String key : missingKeys) {
+                localeConfig.set("guess." + key, defaultLocaleConfig.get(key));
+            }
+
+            // Write modified guess section to disk.
+            try {
+                localeConfig.save(file);
+            } catch (IOException e) {
+                plugin.getLogger().log(Level.WARNING, e, () -> "[LanguageManager] Unable to save resource " + locale + ".yml");
+            }
+        }
+
+        // Fall through to default locale.
+        localeConfig.setDefaults(defaultLocaleConfig);
+    }
+
+    private @NotNull List<String> getMissingKeys(
+            @NotNull Configuration configurationDefault,
+            @NotNull Predicate<String> nodeSetPredicate) {
+        List<String> missingKeys = new ArrayList<>();
+        for (String key : configurationDefault.getKeys(true)) {
+            if (!configurationDefault.isConfigurationSection(key) && !nodeSetPredicate.test(key)) {
+                // Missing keys are non-section keys that fail the predicate.
+                missingKeys.add(key);
+            }
+        }
+        return missingKeys;
+    }
+
+    public @Nullable String getValue(@NotNull String key, @Nullable String locale) {
+        String value = getOrLoadLocale(locale == null ? defaultLocale : locale.toLowerCase()).getString(key);
+        if (value == null || value.isEmpty()) {
+            return null;
+        }
+
+        value = ChatColor.translateAlternateColorCodes('&', value);
+
+        return value;
+    }
+
+    public @Nullable String getValue(@NotNull String key, @Nullable String locale, Replacement @NotNull ... replacements) {
+        String value = getValue(key, locale);
+
+        if (value == null) {
+            return null;
+        }
+
+        for (Replacement replacement : replacements) {
+            value = value.replace(replacement.placeholder(), replacement.value());
+        }
+
+        return value;
+    }
+
+}

plugin/src/main/java/com/lishid/openinv/util/lang/Replacement.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.util.lang;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A data holder for string replacement in translations.
+ *
+ * @param placeholder the placeholder to be replaced
+ * @param value the value to insert
+ */
+public record Replacement(@NotNull String placeholder, @NotNull String value) {
+
+}

plugin/src/main/resources/config.yml

@@ -1,4 +1,10 @@
-config-version: 4
+config-version: 6
 settings:
+  command:
+    open:
+      no-args-opens-self: false
+    searchcontainer:
+      max-radius: 10
+  disable-offline-access: false
   disable-saving: false
   locale: 'en_us'

pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2022 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2023 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -21,14 +21,15 @@
   <artifactId>openinvparent</artifactId>
   <name>OpenInv</name>
   <url>http://dev.bukkit.org/bukkit-plugins/openinv/</url>
-  <version>4.1.10</version>
+  <version>4.4.6</version>
 
   <packaging>pom</packaging>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.release>17</maven.compiler.release>
     <!-- Silence IDE warning - property is declared in individual internal modules. -->
     <spigot.version>unknown</spigot.version>
   </properties>
@@ -39,9 +40,9 @@
       <modules>
         <module>api</module>
         <module>plugin</module>
-        <module>internal/v1_17_R1</module>
-        <module>internal/v1_18_R1</module>
-        <module>internal/v1_18_R2</module>
+        <module>internal/v1_20_R3</module>
+        <module>internal/v1_20_R4</module>
+        <module>internal/v1_21_R1</module>
         <module>assembly</module>
       </modules>
     </profile>
@@ -64,6 +65,10 @@
       <id>spigot-repo</id>
       <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
     </repository>
+    <repository>
+      <id>jitpack.io</id>
+      <url>https://jitpack.io</url>
+    </repository>
   </repositories>
 
   <dependencyManagement>
@@ -72,25 +77,36 @@
         <artifactId>annotations</artifactId>
         <groupId>org.jetbrains</groupId>
         <scope>provided</scope>
-        <version>21.0.1</version>
+        <version>24.1.0</version>
       </dependency>
       <dependency>
         <artifactId>spigot-api</artifactId>
         <groupId>org.spigotmc</groupId>
         <scope>provided</scope>
-        <version>1.16.5-R0.1-SNAPSHOT</version>
+        <version>1.20.4-R0.1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <artifactId>openinvapi</artifactId>
         <groupId>com.lishid</groupId>
         <scope>compile</scope>
-        <version>4.1.10</version>
+        <version>4.4.6</version>
       </dependency>
       <dependency>
         <artifactId>openinvplugincore</artifactId>
         <groupId>com.lishid</groupId>
         <scope>compile</scope>
-        <version>4.1.10</version>
+        <version>4.4.6</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.lishid</groupId>
+            <artifactId>openinvapi</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <artifactId>planarwrappers</artifactId>
+        <groupId>com.github.jikoo</groupId>
+        <version>3.2.3</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -98,6 +114,16 @@
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <!--
+            ~ This plugin is used in scripts to determine if NMS dependencies need to be installed. This must be
+            ~ declared so that we don't run into MDEP-204; the default SuperPOM declares version 2.8.0.
+            -->
+          <artifactId>maven-dependency-plugin</artifactId>
+          <groupId>org.apache.maven.plugins</groupId>
+          <version>3.6.1</version>
+        </plugin>
+
         <plugin>
           <artifactId>maven-shade-plugin</artifactId>
           <configuration>
@@ -128,25 +154,25 @@
             </execution>
           </executions>
           <groupId>org.apache.maven.plugins</groupId>
-          <version>3.2.4</version>
+          <version>3.6.0</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
           <groupId>org.apache.maven.plugins</groupId>
-          <version>3.8.1</version>
+          <version>3.13.0</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
           <groupId>org.apache.maven.plugins</groupId>
-          <version>3.3.0</version>
+          <version>3.7.1</version>
         </plugin>
 
         <plugin>
           <groupId>net.md-5</groupId>
           <artifactId>specialsource-maven-plugin</artifactId>
-          <version>1.2.2</version>
+          <version>2.0.3</version>
           <executions>
             <execution>
               <phase>package</phase>

scripts/generate_changelog.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2011-2021 lishid. All rights reserved.
+# Copyright (C) 2011-2023 lishid. All rights reserved.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@ function get_minecraft_versions() {
 
   for version in "${versions[@]}"; do
     # Append comma if variable is set, then append version
-    minecraft_versions="${minecraft_versions:+${minecraft_versions},}${version%%-R*}"
+    minecraft_versions="${minecraft_versions:+${minecraft_versions}, }${version%%-R*}"
   done
 
   echo "${minecraft_versions}"

scripts/install_spigot_dependencies.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2011-2021 lishid. All rights reserved.
+# Copyright (C) 2011-2022 lishid. All rights reserved.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -34,9 +34,7 @@ readarray -t versions <<< "$(. ./scripts/get_spigot_versions.sh)"
 echo Found Spigot dependencies: "${versions[@]}"
 
 # Install dependencies aside from Spigot prior to running in offline mode.
-# Note that the default SuperPOM declares maven-dependency-plugin 2.8.0.
-# Unfortunately, we run into MDEP-204 and require a version >= 3.1.2.
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.2.0:go-offline -DexcludeArtifactIds=spigot
+mvn dependency:go-offline -DexcludeArtifactIds=spigot
 
 for version in "${versions[@]}"; do
   set -e