Update dependencies, use more descriptive record

Progress on tab completion
Complete type, amount, and enchant options - Still missing player and chunk bucket completion Update to Java 16 for main plugin - Min supported version 1.16 requires Java 16 Determine uniqueness based on identifier for pseudojson
2021-11-28 20:18:01 -05:00 · 2021-11-27 16:23:22 -05:00 · 2021-11-27 13:56:31 -05:00 · 2021-11-27 07:09:00 -05:00 · 2021-11-23 13:00:42 -05:00 · 2021-11-23 12:45:40 -05:00
103 changed files with 7462 additions and 5152 deletions
@@ -0,0 +1,77 @@
+name: OpenInv CI
+
+on:
+  push:
+  pull_request_target:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+
+      - name: Set Up Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '17'
+
+      # 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.
+      - name: Install Spigot Dependencies
+        run: . scripts/install_spigot_dependencies.sh
+
+      - name: Build With Maven
+        run: mvn -e clean package -am -P all
+
+      # Upload artifacts
+      - name: Upload Distributable Jar
+        id: upload-final
+        uses: actions/upload-artifact@v2
+        with:
+          name: dist
+          path: ./target/OpenInv.jar
+      - name: Upload API Jar
+        id: upload-api
+        uses: actions/upload-artifact@v2
+        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
@@ -0,0 +1,37 @@
+name: Release to CurseForge
+
+on:
+  release:
+    types: [ released ]
+
+jobs:
+  curseforge_release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Fetch Github Release Asset
+        uses: dsaltares/fetch-gh-release-asset@0.0.5
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          version: ${{ github.event.release.id }}
+          file: OpenInv.jar
+
+      - name: Set CurseForge Variables
+        run: . scripts/set_curseforge_env.sh "${{ github.event.release.body }}"
+
+      - name: Create CurseForge Release
+        uses: itsmeow/curseforge-upload@v3
+        with:
+          token: ${{ secrets.CURSEFORGE_TOKEN }}
+          project_id: 31432
+          game_endpoint: minecraft
+          file_path: ./OpenInv.jar
+          display_name: "${{ github.event.release.name }}"
+          game_versions: "${{ env.CURSEFORGE_MINECRAFT_VERSIONS }}"
+          release_type: release
+          changelog_type: markdown
+          changelog: "${{ env.CURSEFORGE_CHANGELOG }}"
@@ -1,11 +1,10 @@
 **/.settings
-**/.gitignore
 **/.project
 **/.classpath
-**/.idea
+**/.idea/
 **.iml
-**/target
-**/bin
-**/out
-**dependency-reduced-pom.xml
-**pom.xml.versionsBackup
+**/target/
+**/bin/
+**/out/
+**/dependency-reduced-pom.xml
+**/pom.xml.versionsBackup
@@ -15,48 +15,7 @@ OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) whi
 - **AnyContainer**: Open containers, even if blocked by ocelots or blocks.

 ## Commands
-<table width=100%>
-  <tr>
-    <th width=175px>Command</th>
-    <th>Aliases</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>/openinv [player]</td>
-    <td>oi, inv, open</td>
-    <td>Open a player's inventory. If unspecified, will select last player opened or own if none opened previously.</td>
-  </tr>
-  <tr>
-    <td>/openender [player]</td>
-    <td>oe</td>
-    <td>Open a player's ender chest. If unspecified, will select last player opened or own if none opened previously.</td>
-  </tr>
-  <tr>
-    <td>/searchinv &ltitem&gt [minAmount]</td>
-    <td>si</td>
-    <td>Lists all online players that have a certain item in their inventory.</td>
-  </tr>
-  <tr>
-    <td>/searchender &ltitem&gt [minAmount]</td>
-    <td>se</td>
-    <td>Lists all online players that have a certain item in their ender chest.</td>
-  </tr>
-  <tr>
-    <td>/searchenchant &lt[enchantment] [MinLevel]&gt</td>
-    <td>searchenchants</td>
-    <td>Lists all online players with a specific enchantment.</td>
-  </tr>
-  <tr>
-    <td>/anycontainer [check]</td>
-    <td>ac, anychest</td>
-    <td>Check or toggle the AnyContainer function, allowing opening blocked containers.</td>
-  </tr>
-  <tr>
-    <td>/silentcontainer [check]</td>
-    <td>sc, silentchest</td>
-    <td>Check or toggle the SilentContainer function, allowing opening containers silently.</td>
-  </tr>
-</table>
+See [the wiki](https://github.com/Jikoo/OpenInv/wiki/Commands).

 ## Permissions
 <table>
@@ -80,6 +39,14 @@ OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) whi
    <td>OpenInv.editinv</td>
    <td>Required to make changes to open inventories.</td>
  </tr>
+  <tr>
+      <td>OpenInv.openonline</td>
+      <td>Allows users to open online players' inventories. For compatibility reasons this is granted by the nodes OpenInv.openinv and OpenInv.openender.</td>
+  </tr>
+  <tr>
+      <td>OpenInv.openoffline</td>
+      <td>Allows users to open offline players' inventories. For compatibility reasons this is granted by the nodes OpenInv.openinv and OpenInv.openender.</td>
+  </tr>
  <tr>
    <td>OpenInv.openender</td>
    <td>Required to use /openender.</td>
@@ -128,11 +95,46 @@ OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) whi
    <td>OpenInv.silent.default</td>
    <td>Cause SilentContainer to be enabled by default.</td>
  </tr>
+  <tr>
+    <td>OpenInv.spectate</td>
+    <td>Allows users in spectate gamemode to edit inventories.</td>
+  </tr>
 </table>

 ## For Developers
-To compile, the relevant Craftbukkit/Spigot jars must be installed in your local repository using the install plugin.
-Ex: `mvn install:install-file -Dpackaging=jar -Dfile=spigot-1.8-R0.1-SNAPSHOT.jar -DgroupId=org.spigotmc -DartifactId=spigot -Dversion=1.8-R0.1-SNAPSHOT`
+
+### As a Dependency
+The OpenInv API is available via [JitPack](https://jitpack.io/).
+```xml
+  <repositories>
+    <repository>
+      <id>jitpack.io</id>
+      <url>https://jitpack.io</url>
+    </repository>
+  </repositories>
+```
+```xml
+  <dependencies>
+    <dependency>
+      <groupId>com.github.jikoo.OpenInv</groupId>
+      <artifactId>openinvapi</artifactId>
+      <version>${openinv.version}</version>
+    </dependency>
+  </dependencies>
+```
+
+### Compilation
+To compile, the relevant Spigot jars must be installed in your local repository using the `install` plugin:
+```shell
+mvn install:install-file -Dpackaging=jar -Dfile=spigot-1.8-R0.1-SNAPSHOT.jar \
+    -DgroupId=org.spigotmc -DartifactId=spigot -Dversion=1.8-R0.1-SNAPSHOT
+```
+Note that BuildTools automatically installs produced files. If you use BuildTools to compile Spigot locally, you don't need to install it manually.  
+If you want to use Paper as a dependency, you can install it by executing PaperClip with the property `paperclip.install` set to true:
+```shell
+wget -O paperclip.jar https://papermc.io/api/v1/paper/1.16.5/latest/download
+java -jar -Dpaperclip.install=true paperclip.jar
+```

 To compile for a single version, specify the NMS revision you are targeting: `mvn -pl <NMS module> -am clean install`

@@ -141,20 +143,3 @@ To compile for a set of versions, you'll need to use a profile. The only provide
 For more information, check out the [official Maven guide](http://maven.apache.org/guides/introduction/introduction-to-profiles.html).

 The final file is `target/OpenInv.jar`
-
-## License
-```
-Copyright (C) 2011-2019 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/>.
-```
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
+  ~ 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
@@ -19,9 +19,9 @@
  <modelVersion>4.0.0</modelVersion>

  <parent>
-    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.1.0</version>
+    <groupId>com.lishid</groupId>
+    <version>4.1.9-SNAPSHOT</version>
  </parent>

  <artifactId>openinvapi</artifactId>
@@ -29,15 +29,12 @@

  <dependencies>
    <dependency>
-      <groupId>org.jetbrains</groupId>
      <artifactId>annotations</artifactId>
-      <version>17.0.0</version>
+      <groupId>org.jetbrains</groupId>
    </dependency>
    <dependency>
-      <groupId>org.spigotmc</groupId>
      <artifactId>spigot-api</artifactId>
-      <version>1.8.8-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
+      <groupId>org.spigotmc</groupId>
    </dependency>
  </dependencies>

@@ -45,11 +42,6 @@
    <plugins>
      <plugin>
        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
      </plugin>
    </plugins>
  </build>
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -24,6 +24,7 @@ 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;
@@ -153,10 +154,7 @@ public interface IOpenInv {
        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().warning("Trace:");
-            for (StackTraceElement element : new Throwable().fillInStackTrace().getStackTrace()) {
-                this.getLogger().warning(element.toString());
-            }
+            this.getLogger().log(Level.WARNING, new Throwable("Current stack trace"), () -> "Current stack trace");
        }

        OfflinePlayer player;
@@ -172,11 +170,6 @@ public interface IOpenInv {
            // Not a UUID
        }

-        // Ensure name is valid if server is in online mode to avoid unnecessary searching
-        if (Bukkit.getServer().getOnlineMode() && !name.matches("[a-zA-Z0-9_]{3,16}")) {
-            return null;
-        }
-
        player = Bukkit.getServer().getPlayerExact(name);

        if (player != null) {
@@ -232,16 +225,24 @@ public interface IOpenInv {
     * 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.
     */
-    boolean notifyAnyChest();
+    @Deprecated
+    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.
     */
-    boolean notifySilentChest();
+    @Deprecated
+    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
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -16,8 +16,18 @@

 package com.lishid.openinv.internal;

+import org.bukkit.Material;
+import org.bukkit.block.Barrel;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+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.type.Chest;
+import org.bukkit.entity.Cat;
 import org.bukkit.entity.Player;
+import org.bukkit.util.BoundingBox;
 import org.jetbrains.annotations.NotNull;

 public interface IAnySilentContainer {
@@ -41,14 +51,92 @@ public interface IAnySilentContainer {
     */
    void deactivateContainer(@NotNull Player player);

+    /**
+     * @deprecated use {@link #isAnyContainerNeeded(Block)}
+     * @param player the player opening the container
+     * @param block the block
+     * @return true if the container is blocked
+     */
+    @Deprecated
+    default boolean isAnyContainerNeeded(@NotNull Player player, @NotNull Block block) {
+        return isAnyContainerNeeded(block);
+    }
+
    /**
     * Checks if the container at the given coordinates is blocked.
     *
-     * @param player the Player opening the container
     * @param block  the Block
     * @return true if the container is blocked
     */
-    boolean isAnyContainerNeeded(@NotNull Player player, @NotNull Block block);
+    default boolean isAnyContainerNeeded(@NotNull Block block) {
+        BlockState blockState = block.getState();
+
+        // Barrels do not require AnyContainer.
+        if (blockState instanceof Barrel) {
+            return false;
+        }
+
+        // Enderchests require a non-occluding block on top to open.
+        if (blockState instanceof EnderChest) {
+            return block.getRelative(0, 1, 0).getType().isOccluding();
+        }
+
+        // Shulker boxes require 1/2 a block clear in the direction they open.
+        if (blockState instanceof ShulkerBox) {
+            if (isShulkerBlocked((ShulkerBox) blockState)) {
+                return true;
+            }
+        }
+
+        if (!(blockState instanceof org.bukkit.block.Chest)) {
+            return false;
+        }
+
+        if (isChestBlocked(block)) {
+            return true;
+        }
+
+        BlockData blockData = block.getBlockData();
+        if (!(blockData instanceof 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);
+
+        if (relative.getType() != block.getType()) {
+            return false;
+        }
+
+        BlockData relativeData = relative.getBlockData();
+        if (!(relativeData instanceof Chest)) {
+            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;
+        }
+
+        return isChestBlocked(relative);
+    }
+
+    boolean isShulkerBlocked(ShulkerBox block);
+
+    /**
+     * Determine whether or not a chest is blocked.
+     *
+     * @param chest the chest block
+     * @return true if the chest block cannot be opened under ordinary circumstances
+     */
+    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;
+    }

    /**
     * Checks if the given block is a container which can be unblocked or silenced.
@@ -56,6 +144,14 @@ public interface IAnySilentContainer {
     * @param block the BlockState
     * @return true if the Block is a supported container
     */
-    boolean isAnySilentContainer(@NotNull Block block);
+    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;
+    }

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -16,6 +16,7 @@

 package com.lishid.openinv.internal;

+import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.jetbrains.annotations.NotNull;
@@ -48,4 +49,11 @@ public interface ISpecialInventory {
     */
    boolean isInUse();

+    /**
+     * Gets the Player associated with this ISpecialInventory.
+     *
+     * @return the HumanEntity
+     */
+    @NotNull HumanEntity getPlayer();
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -18,8 +18,8 @@ package com.lishid.openinv.util;

 import com.lishid.openinv.internal.IInventoryAccess;
 import com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import org.bukkit.Bukkit;
 import org.bukkit.inventory.Inventory;
@@ -33,92 +33,63 @@ public class InventoryAccess implements IInventoryAccess {

    static {
        String packageName = Bukkit.getServer().getClass().getPackage().getName();
-        String version = packageName.substring(packageName.lastIndexOf('.') + 1);
        try {
-            craftInventory = Class.forName("org.bukkit.craftbukkit." + version + ".inventory.CraftInventory");
+            craftInventory = Class.forName(packageName + ".inventory.CraftInventory");
        } catch (ClassNotFoundException ignored) {}
        try {
            getInventory = craftInventory.getDeclaredMethod("getInventory");
        } catch (NoSuchMethodException ignored) {}
    }

+    /**
+     * @deprecated use {@link #isUsable()}
+     */
+    @Deprecated
    public static boolean isUseable() {
+        return isUsable();
+    }
+
+    public static boolean isUsable() {
        return craftInventory != null && getInventory != null;
    }

    public static boolean isPlayerInventory(@NotNull Inventory inventory) {
-        if (craftInventory.isAssignableFrom(inventory.getClass())) {
-            try {
-                return getInventory.invoke(inventory) instanceof ISpecialPlayerInventory;
-            } catch (ReflectiveOperationException ignored) {}
-        }
-        return grabFieldOfTypeFromObject(ISpecialPlayerInventory.class, inventory) != null;
+        return getPlayerInventory(inventory) != null;
    }

-    public static ISpecialPlayerInventory getPlayerInventory(@NotNull Inventory inventory) {
-        Object inv = null;
-        if (craftInventory.isAssignableFrom(inventory.getClass())) {
-            try {
-                inv = getInventory.invoke(inventory);
-            } catch (ReflectiveOperationException ignored) {}
-        }
-
-        if (inv == null) {
-            inv = grabFieldOfTypeFromObject(ISpecialPlayerInventory.class, inventory);
-        }
-
-        if (inv instanceof ISpecialPlayerInventory) {
-            return (ISpecialPlayerInventory) inv;
-        }
-
-        return null;
+    public static @Nullable ISpecialPlayerInventory getPlayerInventory(@NotNull Inventory inventory) {
+        return getSpecialInventory(ISpecialPlayerInventory.class, inventory);
    }

    public static boolean isEnderChest(@NotNull Inventory inventory) {
-        if (craftInventory.isAssignableFrom(inventory.getClass())) {
-            try {
-                return getInventory.invoke(inventory) instanceof ISpecialEnderChest;
-            } catch (ReflectiveOperationException ignored) {}
-        }
-        return grabFieldOfTypeFromObject(ISpecialEnderChest.class, inventory) != null;
+        return getEnderChest(inventory) != null;
    }

-    public static ISpecialEnderChest getEnderChest(@NotNull Inventory inventory) {
-        Object inv = null;
-        if (craftInventory.isAssignableFrom(inventory.getClass())) {
+    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())) {
            try {
                inv = getInventory.invoke(inventory);
+                if (expected.isInstance(inv)) {
+                    return expected.cast(inv);
+                }
            } catch (ReflectiveOperationException ignored) {}
        }

-        if (inv == null) {
-            inv = grabFieldOfTypeFromObject(ISpecialEnderChest.class, inventory);
-        }
+        // Use reflection to find the IInventory
+        inv = ReflectionHelper.grabObjectByType(inventory, expected);

-        if (inv instanceof ISpecialEnderChest) {
-            return (ISpecialEnderChest) inv;
+        if (expected.isInstance(inv)) {
+            return expected.cast(inv);
        }

        return null;
    }

-    private static <T> T grabFieldOfTypeFromObject(final Class<T> type, final Object object) {
-        // Use reflection to find the IInventory
-        Class<?> clazz = object.getClass();
-        T result = null;
-        for (Field f : clazz.getDeclaredFields()) {
-            f.setAccessible(true);
-            if (type.isAssignableFrom(f.getDeclaringClass())) {
-                try {
-                    result = type.cast(f.get(object));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return result;
-    }
-
    @Deprecated
    @Override
    public @Nullable ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
@@ -142,4 +113,5 @@ public class InventoryAccess implements IInventoryAccess {
    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
        return isPlayerInventory(inventory);
    }
+
 }
@@ -0,0 +1,75 @@
+/*
+ * 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 java.lang.reflect.Field;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A utility for making reflection easier.
+ */
+public final class ReflectionHelper {
+
+    private ReflectionHelper() {}
+
+    /**
+     * Grab an {@link Object} stored in a {@link Field} of another {@code Object}.
+     *
+     * <p>This casts the field to the correct class. Any issues will result in a {@code null} return value.
+     *
+     * @param fieldType the {@link Class} of {@code Object} stored in the {@code Field}
+     * @param holder the containing {@code Object}
+     * @param <T> the type of stored {@code Object}
+     * @return the first matching {@code Object} or {@code null} if none match
+     */
+    public static <T> @Nullable T grabObjectByType(final Object holder, final Class<T> fieldType) {
+        Field field = grabFieldByType(holder.getClass(), fieldType);
+
+        if (field != null) {
+            try {
+                return fieldType.cast(field.get(holder));
+            } catch (IllegalAccessException ignored) {
+                // Ignore issues obtaining field
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Grab a {@link Field} of an {@link Object}
+     *
+     * @param fieldType the {@link Class} of the object
+     * @param holderType the containing {@code Class}
+     * @return the first matching object or {@code null} if none match
+     */
+    public static @Nullable Field grabFieldByType(Class<?> holderType, Class<?> fieldType) {
+        for (Field field : holderType.getDeclaredFields()) {
+            field.setAccessible(true);
+            if (fieldType.isAssignableFrom(field.getType())) {
+                return field;
+            }
+        }
+
+        if (holderType.getSuperclass() != null) {
+            return grabFieldByType(fieldType, holderType.getSuperclass());
+        }
+
+        return null;
+    }
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
+  ~ 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
@@ -21,11 +21,12 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.1.1-SNAPSHOT</version>
+    <version>4.1.9-SNAPSHOT</version>
  </parent>

  <artifactId>openinvassembly</artifactId>
  <name>OpenInvAssembly</name>
+  <packaging>pom</packaging>

  <build>
    <directory>../target</directory>
@@ -34,7 +35,6 @@
    <plugins>
      <plugin>
        <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.2.0</version>
        <executions>
          <execution>
            <id>reactor-uberjar</id>
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
+  ~ 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
@@ -14,9 +14,9 @@
  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
  -->

-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">

  <id>reactor-uberjar</id>

@@ -34,8 +34,18 @@
      <binaries>
        <outputDirectory>/</outputDirectory>
        <unpack>true</unpack>
-        <!-- unpackOptions must be present or build breaks. -->
-        <unpackOptions/>
+        <unpackOptions>
+          <excludes>
+            <!--
+              - Exclude existing meta - assembly will write its own manifest, and the rest is maven
+              - details that end users don't need. Ignoring it saves around 7KB after compression
+              - with a single internal module present.
+             -->
+            <exclude>META-INF/**</exclude>
+          </excludes>
+        </unpackOptions>
+        <!-- Exclude dependencies - shade plugin will handle their inclusion as necessary in individual jars. -->
+        <includeDependencies>false</includeDependencies>
      </binaries>

    </moduleSet>
@@ -1,44 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2020 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/>.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.lishid</groupId>
-    <artifactId>openinvparent</artifactId>
-    <version>4.1.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>openinvinternal</artifactId>
-  <name>OpenInvInternal</name>
-
-  <packaging>pom</packaging>
-
-  <profiles>
-
-    <profile>
-      <id>all</id>
-      <modules>
-        <module>v1_8_R3</module>
-        <module>v1_14_R1</module>
-        <module>v1_15_R1</module>
-      </modules>
-    </profile>
-
-  </profiles>
-
-</project>
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (C) 2011-2020 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/>.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
-    <version>4.1.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>openinvadapter1_14_R1</artifactId>
-  <name>OpenInvAdapter1_14_R1</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
-      <version>1.14.3-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugincore</artifactId>
-      <version>4.1.1-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.2</version>
-        <configuration>
-          <minimizeJar>true</minimizeJar>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
@@ -1,360 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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_14_R1;
-
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.IAnySilentContainer;
-import java.lang.reflect.Field;
-import net.minecraft.server.v1_14_R1.Block;
-import net.minecraft.server.v1_14_R1.BlockBarrel;
-import net.minecraft.server.v1_14_R1.BlockChest;
-import net.minecraft.server.v1_14_R1.BlockChestTrapped;
-import net.minecraft.server.v1_14_R1.BlockEnderChest;
-import net.minecraft.server.v1_14_R1.BlockPosition;
-import net.minecraft.server.v1_14_R1.BlockPropertyChestType;
-import net.minecraft.server.v1_14_R1.BlockShulkerBox;
-import net.minecraft.server.v1_14_R1.ChatMessage;
-import net.minecraft.server.v1_14_R1.Container;
-import net.minecraft.server.v1_14_R1.ContainerChest;
-import net.minecraft.server.v1_14_R1.Containers;
-import net.minecraft.server.v1_14_R1.EntityHuman;
-import net.minecraft.server.v1_14_R1.EntityPlayer;
-import net.minecraft.server.v1_14_R1.EnumChatFormat;
-import net.minecraft.server.v1_14_R1.EnumGamemode;
-import net.minecraft.server.v1_14_R1.IBlockData;
-import net.minecraft.server.v1_14_R1.IChatBaseComponent;
-import net.minecraft.server.v1_14_R1.ITileInventory;
-import net.minecraft.server.v1_14_R1.InventoryEnderChest;
-import net.minecraft.server.v1_14_R1.InventoryLargeChest;
-import net.minecraft.server.v1_14_R1.PlayerInteractManager;
-import net.minecraft.server.v1_14_R1.PlayerInventory;
-import net.minecraft.server.v1_14_R1.TileEntity;
-import net.minecraft.server.v1_14_R1.TileEntityChest;
-import net.minecraft.server.v1_14_R1.TileEntityEnderChest;
-import net.minecraft.server.v1_14_R1.TileEntityLootable;
-import net.minecraft.server.v1_14_R1.TileInventory;
-import net.minecraft.server.v1_14_R1.World;
-import org.bukkit.Material;
-import org.bukkit.Statistic;
-import org.bukkit.block.Barrel;
-import org.bukkit.block.BlockFace;
-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.InventoryView;
-import org.bukkit.util.BoundingBox;
-import org.jetbrains.annotations.NotNull;
-
-public class AnySilentContainer implements IAnySilentContainer {
-
-    private Field playerInteractManagerGamemode;
-
-    public AnySilentContainer() {
-        try {
-            this.playerInteractManagerGamemode = PlayerInteractManager.class.getDeclaredField("gamemode");
-            this.playerInteractManagerGamemode.setAccessible(true);
-        } catch (NoSuchFieldException | SecurityException e) {
-            System.err.println("[OpenInv] Unable to directly write player gamemode! SilentChest will fail.");
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public boolean isAnySilentContainer(@NotNull final org.bukkit.block.Block bukkitBlock) {
-        if (bukkitBlock.getType() == Material.ENDER_CHEST) {
-            return true;
-        }
-        BlockState state = bukkitBlock.getState();
-        return state instanceof org.bukkit.block.Chest
-                || state instanceof org.bukkit.block.ShulkerBox
-                || state instanceof org.bukkit.block.Barrel;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(@NotNull final Player p, @NotNull final org.bukkit.block.Block block) {
-        BlockState blockState = block.getState();
-
-        // Barrels do not require AnyContainer.
-        if (blockState instanceof Barrel) {
-            return false;
-        }
-
-        // Enderchests require a non-occluding block on top to open.
-        if (blockState instanceof EnderChest) {
-            return block.getRelative(0, 1, 0).getType().isOccluding();
-        }
-
-        // Shulker boxes require 1/2 a block clear in the direction they open.
-        if (blockState instanceof ShulkerBox) {
-            BoundingBox boundingBox = block.getBoundingBox();
-            if (boundingBox.getVolume() > 1) {
-                // Shulker box is already open.
-                return false;
-            }
-
-            BlockData blockData = block.getBlockData();
-            if (!(blockData instanceof Directional)) {
-                // Shouldn't be possible. Just in case, demand AnyChest.
-                return true;
-            }
-
-            Directional directional = (Directional) blockData;
-            BlockFace face = directional.getFacing();
-            boundingBox.shift(face.getDirection());
-            // Return whether or not bounding boxes overlap.
-            return block.getRelative(face, 1).getBoundingBox().overlaps(boundingBox);
-        }
-
-        if (!(blockState instanceof org.bukkit.block.Chest)) {
-            return false;
-        }
-
-        if (isBlockedChest(block)) {
-            return true;
-        }
-
-        BlockData blockData = block.getBlockData();
-        if (!(blockData instanceof 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);
-
-        if (relative.getType() != block.getType()) {
-            return false;
-        }
-
-        BlockData relativeData = relative.getBlockData();
-        if (!(relativeData instanceof Chest)) {
-            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;
-        }
-
-        return isBlockedChest(relative);
-    }
-
-    private boolean isBlockedChest(org.bukkit.block.Block block) {
-        org.bukkit.block.Block relative = block.getRelative(0, 1, 0);
-        return relative.getType().isOccluding()
-                || block.getWorld().getNearbyEntities(BoundingBox.of(relative), entity -> entity instanceof Cat).size() > 0;
-    }
-
-    @Override
-    public boolean activateContainer(@NotNull final Player bukkitPlayer, final boolean silentchest,
-                                     @NotNull final org.bukkit.block.Block bukkitBlock) {
-
-        // Silent ender chest is API-only
-        if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        final World world = player.world;
-        final BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        final TileEntity tile = world.getTileEntity(blockPosition);
-
-        if (tile == null) {
-            return false;
-        }
-
-        if (tile instanceof TileEntityEnderChest) {
-            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
-            InventoryEnderChest enderChest = player.getEnderChest();
-            enderChest.a((TileEntityEnderChest) tile);
-            player.openContainer(new TileInventory((containerCounter, playerInventory, ignored) -> {
-                Containers<?> containers;
-                int rows = enderChest.getSize() / 9;
-                switch (rows) {
-                    case 1:
-                        containers = Containers.GENERIC_9X1;
-                        break;
-                    case 2:
-                        containers = Containers.GENERIC_9X2;
-                        break;
-                    case 3:
-                    default:
-                        containers = Containers.GENERIC_9X3;
-                        break;
-                    case 4:
-                        containers = Containers.GENERIC_9X4;
-                        break;
-                    case 5:
-                        containers = Containers.GENERIC_9X5;
-                        break;
-                    case 6:
-                        containers = Containers.GENERIC_9X6;
-                        break;
-                }
-                return new ContainerChest(containers, containerCounter, playerInventory, enderChest, rows);
-            }, BlockEnderChest.d));
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        if (!(tile instanceof ITileInventory)) {
-            return false;
-        }
-
-        ITileInventory tileInventory = (ITileInventory) tile;
-        IBlockData blockData = world.getType(blockPosition);
-        Block block = blockData.getBlock();
-
-        if (block instanceof BlockChest) {
-
-            BlockPropertyChestType chestType = blockData.get(BlockChest.b);
-
-            if (chestType != BlockPropertyChestType.SINGLE) {
-
-                BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.j(blockData));
-                IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
-
-                if (adjacentBlockData.getBlock() == block) {
-
-                    BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.b);
-
-                    if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
-                            && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
-
-                        TileEntity adjacentTile = world.getTileEntity(adjacentBlockPosition);
-
-                        if (adjacentTile instanceof TileEntityChest && tileInventory instanceof  TileEntityChest) {
-                            TileEntityChest rightChest = chestType == BlockPropertyChestType.RIGHT ? ((TileEntityChest) tileInventory) : (TileEntityChest) adjacentTile;
-                            TileEntityChest leftChest = chestType == BlockPropertyChestType.RIGHT ? (TileEntityChest) adjacentTile : ((TileEntityChest) tileInventory);
-
-                            if (rightChest.lootTable != null || leftChest.lootTable != null) {
-                                player.a(new ChatMessage("Loot not generated! Please disable /silentcontainer.").a(EnumChatFormat.RED), true);
-                                return false;
-                            }
-
-                            tileInventory = new ITileInventory() {
-                                public Container createMenu(int containerCounter, PlayerInventory playerInventory, EntityHuman entityHuman) {
-                                    leftChest.d(playerInventory.player);
-                                    rightChest.d(playerInventory.player);
-                                    return ContainerChest.b(containerCounter, playerInventory, new InventoryLargeChest(rightChest, leftChest));
-                                }
-
-                                public IChatBaseComponent getScoreboardDisplayName() {
-                                    return new ChatMessage("container.chestDouble");
-                                }
-                            };
-                        }
-                    }
-                }
-            }
-
-            if (block instanceof BlockChestTrapped) {
-                bukkitPlayer.incrementStatistic(Statistic.TRAPPED_CHEST_TRIGGERED);
-            } else {
-                bukkitPlayer.incrementStatistic(Statistic.CHEST_OPENED);
-            }
-        }
-
-        if (block instanceof BlockShulkerBox) {
-            bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED);
-        }
-
-        if (block instanceof BlockBarrel) {
-            bukkitPlayer.incrementStatistic(Statistic.OPEN_BARREL);
-        }
-
-        // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
-        if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
-            player.openContainer(tileInventory);
-            return true;
-        }
-
-        // SilentChest requires access to setting players' gamemode directly.
-        if (this.playerInteractManagerGamemode == null) {
-            return false;
-        }
-
-        if (tile instanceof TileEntityLootable) {
-            TileEntityLootable lootable = (TileEntityLootable) tile;
-            if (lootable.lootTable != null) {
-                OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
-                return false;
-            }
-        }
-
-        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
-        this.forceGameMode(player, EnumGamemode.SPECTATOR);
-        player.openContainer(tileInventory);
-        this.forceGameMode(player, gamemode);
-        return true;
-    }
-
-    @Override
-    public void deactivateContainer(@NotNull final Player bukkitPlayer) {
-        if (this.playerInteractManagerGamemode == null) {
-            return;
-        }
-
-        InventoryView view = bukkitPlayer.getOpenInventory();
-        switch (view.getType()) {
-            case CHEST:
-            case ENDER_CHEST:
-            case SHULKER_BOX:
-            case BARREL:
-            break;
-        default:
-            return;
-        }
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
-        this.forceGameMode(player, EnumGamemode.SPECTATOR);
-        player.activeContainer.b(player);
-        player.activeContainer.a(player, false);
-        player.activeContainer.transferTo(player.defaultContainer, player.getBukkitEntity());
-        player.activeContainer = player.defaultContainer;
-        this.forceGameMode(player, gamemode);
-    }
-
-    private void forceGameMode(final EntityPlayer player, final EnumGamemode gameMode) {
-        if (this.playerInteractManagerGamemode == null) {
-            // No need to warn repeatedly, error on startup and lack of function should be enough.
-            return;
-        }
-        try {
-            if (!this.playerInteractManagerGamemode.isAccessible()) {
-                // Just in case, ensure accessible.
-                this.playerInteractManagerGamemode.setAccessible(true);
-            }
-            this.playerInteractManagerGamemode.set(player.playerInteractManager, gameMode);
-        } catch (IllegalArgumentException | IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-}
@@ -1,206 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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_14_R1;
-
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.mojang.authlib.GameProfile;
-import net.minecraft.server.v1_14_R1.ChatComponentText;
-import net.minecraft.server.v1_14_R1.ChatMessageType;
-import net.minecraft.server.v1_14_R1.Container;
-import net.minecraft.server.v1_14_R1.Containers;
-import net.minecraft.server.v1_14_R1.DimensionManager;
-import net.minecraft.server.v1_14_R1.EntityHuman;
-import net.minecraft.server.v1_14_R1.EntityPlayer;
-import net.minecraft.server.v1_14_R1.MinecraftServer;
-import net.minecraft.server.v1_14_R1.PacketPlayOutChat;
-import net.minecraft.server.v1_14_R1.PacketPlayOutOpenWindow;
-import net.minecraft.server.v1_14_R1.PlayerInteractManager;
-import net.minecraft.server.v1_14_R1.PlayerInventory;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory;
-import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftContainer;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    @NotNull
-    public static EntityPlayer getHandle(final Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        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");
-        }
-
-        return nmsPlayer;
-    }
-
-    @Override
-    public Player loadPlayer(@NotNull final OfflinePlayer offline) {
-        // Ensure player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        // Create a profile and entity to load the player data
-        GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(DimensionManager.OVERWORLD), profile,
-                new PlayerInteractManager(server.getWorldServer(DimensionManager.OVERWORLD)));
-
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
-    }
-
-    @Nullable
-	@Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-
-        EntityPlayer nmsPlayer = getHandle(player);
-
-        if (nmsPlayer.playerConnection == null) {
-            return null;
-        }
-
-        String title;
-        if (inventory instanceof SpecialEnderChest) {
-            HumanEntity owner = (HumanEntity) ((SpecialEnderChest) inventory).getBukkitOwner();
-            title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.enderchest");
-            if (title == null) {
-                title = "%player%'s Ender Chest";
-            }
-            //noinspection ConstantConditions - owner name can be null if loaded by UUID
-            title = title.replace("%player%", owner.getName() != null ? owner.getName() : owner.getUniqueId().toString());
-        } else if (inventory instanceof SpecialPlayerInventory) {
-            EntityHuman owner = ((PlayerInventory) inventory).player;
-            title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.player");
-            if (title == null) {
-                title = "%player%'s Inventory";
-            }
-            title = title.replace("%player%", owner.getName() != null ? owner.getName() : owner.getUniqueID().toString());
-        } else {
-            return player.openInventory(inventory.getBukkitInventory());
-        }
-
-        String finalTitle = title;
-        Container container = new CraftContainer(new InventoryView() {
-            @Override
-            public @NotNull Inventory getTopInventory() {
-                return inventory.getBukkitInventory();
-            }
-            @Override
-            public @NotNull Inventory getBottomInventory() {
-                return player.getInventory();
-            }
-            @Override
-            public @NotNull HumanEntity getPlayer() {
-                return player;
-            }
-            @Override
-            public @NotNull InventoryType getType() {
-                return inventory.getBukkitInventory().getType();
-            }
-            @Override
-            public @NotNull String getTitle() {
-                return finalTitle;
-            }
-        }, nmsPlayer, nmsPlayer.nextContainerCounter()) {
-            @Override
-            public Containers<?> getType() {
-                switch (inventory.getBukkitInventory().getSize()) {
-                    case 9:
-                        return Containers.GENERIC_9X1;
-                    case 18:
-                        return Containers.GENERIC_9X2;
-                    case 27:
-                    default:
-                        return Containers.GENERIC_9X3;
-                    case 36:
-                        return Containers.GENERIC_9X4;
-                    case 41: // PLAYER
-                    case 45:
-                        return Containers.GENERIC_9X5;
-                    case 54:
-                        return Containers.GENERIC_9X6;
-                }
-            }
-        };
-
-        container.setTitle(new ChatComponentText(title));
-        container = CraftEventFactory.callInventoryOpenEvent(nmsPlayer, container);
-
-        if (container == null) {
-            return null;
-        }
-
-        nmsPlayer.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, container.getType(),
-                new ChatComponentText(container.getBukkitView().getTitle())));
-        nmsPlayer.activeContainer = container;
-        container.addSlotListener(nmsPlayer);
-
-        return container.getBukkitView();
-
-    }
-
-    @Override
-    public void sendSystemMessage(@NotNull Player player, @NotNull String message) {
-        int newline = message.indexOf('\n');
-        if (newline != -1) {
-            // No newlines in action bar chat.
-            message = message.substring(0, newline);
-        }
-
-        if (message.isEmpty()) {
-            return;
-        }
-
-        EntityPlayer nmsPlayer = getHandle(player);
-
-        // For action bar chat, color codes are still supported but JSON text color is not allowed. Do not convert text.
-        if (nmsPlayer.playerConnection != null) {
-            nmsPlayer.playerConnection.sendPacket(new PacketPlayOutChat(new ChatComponentText(message), ChatMessageType.GAME_INFO));
-        }
-    }
-
-}
@@ -1,255 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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_14_R1;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.util.List;
-import net.minecraft.server.v1_14_R1.AutoRecipeStackManager;
-import net.minecraft.server.v1_14_R1.ContainerUtil;
-import net.minecraft.server.v1_14_R1.EntityHuman;
-import net.minecraft.server.v1_14_R1.EntityPlayer;
-import net.minecraft.server.v1_14_R1.IInventoryListener;
-import net.minecraft.server.v1_14_R1.InventoryEnderChest;
-import net.minecraft.server.v1_14_R1.ItemStack;
-import net.minecraft.server.v1_14_R1.NonNullList;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-
-public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEnderChest {
-
-    private final CraftInventory inventory;
-    private EntityPlayer owner;
-    private NonNullList<ItemStack> items;
-    private boolean playerOnline;
-
-    public SpecialEnderChest(final Player player, final Boolean online) {
-        super(PlayerDataManager.getHandle(player));
-        this.inventory = new CraftInventory(this);
-        this.owner = PlayerDataManager.getHandle(player);
-        this.playerOnline = online;
-        this.items = this.owner.getEnderChest().items;
-    }
-
-    @Override
-    public @NotNull CraftInventory getBukkitInventory() {
-        return inventory;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        this.playerOnline = false;
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull final Player player) {
-        if (!this.playerOnline) {
-            try {
-                this.owner = PlayerDataManager.getHandle(player);
-                InventoryEnderChest enderChest = owner.getEnderChest();
-                for (int i = 0; i < enderChest.getSize(); ++i) {
-                    enderChest.setItem(i, this.items.get(i));
-                }
-                this.items = enderChest.items;
-            } catch (Exception ignored) {}
-            this.playerOnline = true;
-        }
-    }
-
-    @Override
-    public void update() {
-        this.owner.getEnderChest().update();
-    }
-
-    @Override
-    public List<ItemStack> getContents() {
-        return this.items;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        this.owner.getEnderChest().onOpen(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        this.owner.getEnderChest().onClose(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return this.owner.getEnderChest().getViewers();
-    }
-
-    @Override
-    public void setMaxStackSize(int i) {
-        this.owner.getEnderChest().setMaxStackSize(i);
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner.getEnderChest().getOwner();
-    }
-
-    @Override
-    public Location getLocation() {
-        return null;
-    }
-
-    @Override
-    public void a(IInventoryListener iinventorylistener) {
-        this.owner.getEnderChest().a(iinventorylistener);
-    }
-
-    @Override
-    public void b(IInventoryListener iinventorylistener) {
-        this.owner.getEnderChest().b(iinventorylistener);
-    }
-
-    @Override
-    public ItemStack getItem(int i) {
-        return i >= 0 && i < this.items.size() ? this.items.get(i) : ItemStack.a;
-    }
-
-    @Override
-    public ItemStack splitStack(int i, int j) {
-        ItemStack itemstack = ContainerUtil.a(this.items, i, j);
-        if (!itemstack.isEmpty()) {
-            this.update();
-        }
-
-        return itemstack;
-    }
-
-    @Override
-    public ItemStack a(ItemStack itemstack) {
-        ItemStack itemstack1 = itemstack.cloneItemStack();
-
-        for (int i = 0; i < this.getSize(); ++i) {
-            ItemStack itemstack2 = this.getItem(i);
-            if (itemstack2.isEmpty()) {
-                this.setItem(i, itemstack1);
-                this.update();
-                return ItemStack.a;
-            }
-
-            if (ItemStack.c(itemstack2, itemstack1)) {
-                int j = Math.min(this.getMaxStackSize(), itemstack2.getMaxStackSize());
-                int k = Math.min(itemstack1.getCount(), j - itemstack2.getCount());
-                if (k > 0) {
-                    itemstack2.add(k);
-                    itemstack1.subtract(k);
-                    if (itemstack1.isEmpty()) {
-                        this.update();
-                        return ItemStack.a;
-                    }
-                }
-            }
-        }
-
-        if (itemstack1.getCount() != itemstack.getCount()) {
-            this.update();
-        }
-
-        return itemstack1;
-    }
-
-    @Override
-    public ItemStack splitWithoutUpdate(int i) {
-        ItemStack itemstack = this.items.get(i);
-        if (itemstack.isEmpty()) {
-            return ItemStack.a;
-        } else {
-            this.items.set(i, ItemStack.a);
-            return itemstack;
-        }
-    }
-
-    @Override
-    public void setItem(int i, ItemStack itemstack) {
-        this.items.set(i, itemstack);
-        if (!itemstack.isEmpty() && itemstack.getCount() > this.getMaxStackSize()) {
-            itemstack.setCount(this.getMaxStackSize());
-        }
-
-        this.update();
-    }
-
-    @Override
-    public int getSize() {
-        return this.owner.getEnderChest().getSize();
-    }
-
-    @Override
-    public boolean isNotEmpty() {
-
-        for (ItemStack itemstack : this.items) {
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return 64;
-    }
-
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen(EntityHuman entityhuman) {
-    }
-
-    @Override
-    public void closeContainer(EntityHuman entityhuman) {
-    }
-
-    @Override
-    public boolean b(int i, ItemStack itemstack) {
-        return true;
-    }
-
-    @Override
-    public void clear() {
-        this.items.clear();
-    }
-
-    @Override
-    public void a(AutoRecipeStackManager autorecipestackmanager) {
-
-        for (ItemStack itemstack : this.items) {
-            autorecipestackmanager.b(itemstack);
-        }
-
-    }
-
-}
@@ -1,759 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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_14_R1;
-
-import com.google.common.collect.ImmutableList;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import net.minecraft.server.v1_14_R1.AutoRecipeStackManager;
-import net.minecraft.server.v1_14_R1.ChatMessage;
-import net.minecraft.server.v1_14_R1.ContainerUtil;
-import net.minecraft.server.v1_14_R1.CrashReport;
-import net.minecraft.server.v1_14_R1.CrashReportSystemDetails;
-import net.minecraft.server.v1_14_R1.EntityHuman;
-import net.minecraft.server.v1_14_R1.EntityPlayer;
-import net.minecraft.server.v1_14_R1.EnumItemSlot;
-import net.minecraft.server.v1_14_R1.IBlockData;
-import net.minecraft.server.v1_14_R1.IChatBaseComponent;
-import net.minecraft.server.v1_14_R1.Item;
-import net.minecraft.server.v1_14_R1.ItemArmor;
-import net.minecraft.server.v1_14_R1.ItemStack;
-import net.minecraft.server.v1_14_R1.NBTTagCompound;
-import net.minecraft.server.v1_14_R1.NBTTagList;
-import net.minecraft.server.v1_14_R1.NonNullList;
-import net.minecraft.server.v1_14_R1.PacketPlayOutSetSlot;
-import net.minecraft.server.v1_14_R1.PlayerInventory;
-import net.minecraft.server.v1_14_R1.ReportedException;
-import net.minecraft.server.v1_14_R1.World;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-
-    private final CraftInventory inventory;
-    private boolean playerOnline;
-    private EntityHuman player;
-    private NonNullList<ItemStack> items, armor, extraSlots;
-    private List<NonNullList<ItemStack>> f;
-
-    public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
-        this.inventory = new CraftInventory(this);
-        this.playerOnline = online;
-        this.player = super.player;
-        this.items = this.player.inventory.items;
-        this.armor = this.player.inventory.armor;
-        this.extraSlots = this.player.inventory.extraSlots;
-        this.f = ImmutableList.of(this.items, this.armor, this.extraSlots);
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull final Player player) {
-        if (!this.playerOnline) {
-            EntityPlayer entityPlayer = PlayerDataManager.getHandle(player);
-            entityPlayer.inventory.transaction.addAll(this.transaction);
-            this.player = entityPlayer;
-            for (int i = 0; i < getSize(); ++i) {
-                this.player.inventory.setItem(i, getRawItem(i));
-            }
-            this.player.inventory.itemInHandIndex = this.itemInHandIndex;
-            this.items = this.player.inventory.items;
-            this.armor = this.player.inventory.armor;
-            this.extraSlots = this.player.inventory.extraSlots;
-            this.f = ImmutableList.of(this.items, this.armor, this.extraSlots);
-            this.playerOnline = true;
-        }
-    }
-
-    @Override
-    public boolean a(final EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public @NotNull CraftInventory getBukkitInventory() {
-        return this.inventory;
-    }
-
-    @Override
-    public ItemStack getItem(int i) {
-        List<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            return ItemStack.a;
-        }
-
-        return list.get(i);
-    }
-
-    private ItemStack getRawItem(int i) {
-        NonNullList<ItemStack> list = null;
-        for (NonNullList<ItemStack> next : this.f) {
-            if (i < next.size()) {
-                list = next;
-                break;
-            }
-            i -= next.size();
-        }
-
-        return list == null ? ItemStack.a : list.get(i);
-    }
-
-    @Override
-    public IChatBaseComponent getDisplayName() {
-        return new ChatMessage(this.player.getName());
-    }
-
-    @Override
-    public boolean hasCustomName() {
-        return false;
-    }
-
-    private int getReversedArmorSlotNum(final int i) {
-        if (i == 0) {
-            return 3;
-        }
-        if (i == 1) {
-            return 2;
-        }
-        if (i == 2) {
-            return 1;
-        }
-        if (i == 3) {
-            return 0;
-        }
-        return i;
-    }
-
-    private int getReversedItemSlotNum(final int i) {
-        if (i >= 27) {
-            return i - 27;
-        }
-        return i + 9;
-    }
-
-    @Override
-    public int getSize() {
-        return 45;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
-    @Override
-    public void setItem(int i, final ItemStack itemstack) {
-        List<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            this.player.drop(itemstack, true);
-            return;
-        }
-
-        list.set(i, itemstack);
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        this.playerOnline = false;
-    }
-
-    @Override
-    public ItemStack splitStack(int i, final int j) {
-        List<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            return ItemStack.a;
-        }
-
-        return list.get(i).isEmpty() ? ItemStack.a : ContainerUtil.a(list, i, j);
-    }
-
-    @Override
-    public ItemStack splitWithoutUpdate(int i) {
-        List<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            return ItemStack.a;
-        }
-
-        if (!list.get(i).isEmpty()) {
-            ItemStack itemstack = list.get(i);
-
-            list.set(i, ItemStack.a);
-            return itemstack;
-        }
-
-        return ItemStack.a;
-    }
-
-    @Override
-    public List<ItemStack> getContents() {
-        return this.f.stream().flatMap(List::stream).collect(Collectors.toList());
-    }
-
-    @Override
-    public List<ItemStack> getArmorContents() {
-        return this.armor;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        this.transaction.add(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        this.transaction.remove(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return this.transaction;
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.player.getBukkitEntity();
-    }
-
-    @Override
-    public Location getLocation() {
-        return this.player.getBukkitEntity().getLocation();
-    }
-
-    @Override
-    public ItemStack getItemInHand() {
-        return d(this.itemInHandIndex) ? this.items.get(this.itemInHandIndex) : ItemStack.a;
-    }
-
-    private boolean a(ItemStack itemstack, ItemStack itemstack1) {
-        return !itemstack.isEmpty() && this.b(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize();
-    }
-
-    private boolean b(ItemStack itemstack, ItemStack itemstack1) {
-        return itemstack.getItem() == itemstack1.getItem() && ItemStack.equals(itemstack, itemstack1);
-    }
-
-    @Override
-    public int canHold(ItemStack itemstack) {
-        int remains = itemstack.getCount();
-
-        for (int i = 0; i < this.items.size(); ++i) {
-            ItemStack itemstack1 = this.getItem(i);
-            if (itemstack1.isEmpty()) {
-                return itemstack.getCount();
-            }
-
-            if (!this.a(itemstack, itemstack1)) {
-                remains -= (itemstack1.getMaxStackSize() < this.getMaxStackSize() ? itemstack1.getMaxStackSize() : this.getMaxStackSize()) - itemstack1.getCount();
-            }
-
-            if (remains <= 0) {
-                return itemstack.getCount();
-            }
-        }
-
-        return itemstack.getCount() - remains;
-    }
-
-    @Override
-    public int getFirstEmptySlotIndex() {
-        for (int i = 0; i < this.items.size(); ++i) {
-            if (this.items.get(i).isEmpty()) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public void c(int i) {
-        this.itemInHandIndex = this.i();
-        ItemStack itemstack = this.items.get(this.itemInHandIndex);
-        this.items.set(this.itemInHandIndex, this.items.get(i));
-        this.items.set(i, itemstack);
-    }
-
-    @Override
-    public int c(ItemStack itemstack) {
-        for (int i = 0; i < this.items.size(); ++i) {
-            ItemStack itemstack1 = this.items.get(i);
-            if (!this.items.get(i).isEmpty() && this.b(itemstack, this.items.get(i)) && !this.items.get(i).f() && !itemstack1.hasEnchantments() && !itemstack1.hasName()) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public int i() {
-        int i;
-        int j;
-        for (j = 0; j < 9; ++j) {
-            i = (this.itemInHandIndex + j) % 9;
-            if (this.items.get(i).isEmpty()) {
-                return i;
-            }
-        }
-
-        for (j = 0; j < 9; ++j) {
-            i = (this.itemInHandIndex + j) % 9;
-            if (!this.items.get(i).hasEnchantments()) {
-                return i;
-            }
-        }
-
-        return this.itemInHandIndex;
-    }
-
-    @Override
-    public int a(Predicate<ItemStack> predicate, int i) {
-        int j = 0;
-
-        int k;
-        for (k = 0; k < this.getSize(); ++k) {
-            ItemStack itemstack = this.getItem(k);
-            if (!itemstack.isEmpty() && predicate.test(itemstack)) {
-                int l = i <= 0 ? itemstack.getCount() : Math.min(i - j, itemstack.getCount());
-                j += l;
-                if (i != 0) {
-                    itemstack.subtract(l);
-                    if (itemstack.isEmpty()) {
-                        this.setItem(k, ItemStack.a);
-                    }
-
-                    if (i > 0 && j >= i) {
-                        return j;
-                    }
-                }
-            }
-        }
-
-        if (!this.getCarried().isEmpty() && predicate.test(this.getCarried())) {
-            k = i <= 0 ? this.getCarried().getCount() : Math.min(i - j, this.getCarried().getCount());
-            j += k;
-            if (i != 0) {
-                this.getCarried().subtract(k);
-                if (this.getCarried().isEmpty()) {
-                    this.setCarried(ItemStack.a);
-                }
-
-                if (i > 0 && j >= i) {
-                    return j;
-                }
-            }
-        }
-
-        return j;
-    }
-
-    private int i(ItemStack itemstack) {
-        int i = this.firstPartial(itemstack);
-        if (i == -1) {
-            i = this.getFirstEmptySlotIndex();
-        }
-
-        return i == -1 ? itemstack.getCount() : this.d(i, itemstack);
-    }
-
-    private int d(int i, ItemStack itemstack) {
-        Item item = itemstack.getItem();
-        int j = itemstack.getCount();
-        ItemStack itemstack1 = this.getItem(i);
-        if (itemstack1.isEmpty()) {
-            itemstack1 = new ItemStack(item, 0);
-            if (itemstack.hasTag()) {
-                itemstack1.setTag(itemstack.getTag().clone());
-            }
-
-            this.setItem(i, itemstack1);
-        }
-
-        int k = j;
-        if (j > itemstack1.getMaxStackSize() - itemstack1.getCount()) {
-            k = itemstack1.getMaxStackSize() - itemstack1.getCount();
-        }
-
-        if (k > this.getMaxStackSize() - itemstack1.getCount()) {
-            k = this.getMaxStackSize() - itemstack1.getCount();
-        }
-
-        if (k == 0) {
-            return j;
-        } else {
-            j -= k;
-            itemstack1.add(k);
-            itemstack1.d(5);
-            return j;
-        }
-    }
-
-    @Override
-    public int firstPartial(ItemStack itemstack) {
-        if (this.a(this.getItem(this.itemInHandIndex), itemstack)) {
-            return this.itemInHandIndex;
-        } else if (this.a(this.getItem(40), itemstack)) {
-            return 40;
-        } else {
-            for (int i = 0; i < this.items.size(); ++i) {
-                if (this.a(this.items.get(i), itemstack)) {
-                    return i;
-                }
-            }
-
-            return -1;
-        }
-    }
-
-    @Override
-    public void j() {
-
-        for (List<ItemStack> itemStacks : this.f) {
-            for (int i = 0; i < itemStacks.size(); ++i) {
-                if (!itemStacks.get(i).isEmpty()) {
-                    itemStacks.get(i).a(this.player.world, this.player, i, this.itemInHandIndex == i);
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public boolean pickup(ItemStack itemstack) {
-        return this.c(-1, itemstack);
-    }
-
-    @Override
-    public boolean c(int i, ItemStack itemstack) {
-        if (itemstack.isEmpty()) {
-            return false;
-        } else {
-            try {
-                if (itemstack.f()) {
-                    if (i == -1) {
-                        i = this.getFirstEmptySlotIndex();
-                    }
-
-                    if (i >= 0) {
-                        this.items.set(i, itemstack.cloneItemStack());
-                        this.items.get(i).d(5);
-                        itemstack.setCount(0);
-                        return true;
-                    } else if (this.player.abilities.canInstantlyBuild) {
-                        itemstack.setCount(0);
-                        return true;
-                    } else {
-                        return false;
-                    }
-                } else {
-                    int j;
-                    do {
-                        j = itemstack.getCount();
-                        if (i == -1) {
-                            itemstack.setCount(this.i(itemstack));
-                        } else {
-                            itemstack.setCount(this.d(i, itemstack));
-                        }
-                    } while(!itemstack.isEmpty() && itemstack.getCount() < j);
-
-                    if (itemstack.getCount() == j && this.player.abilities.canInstantlyBuild) {
-                        itemstack.setCount(0);
-                        return true;
-                    } else {
-                        return itemstack.getCount() < j;
-                    }
-                }
-            } catch (Throwable var6) {
-                CrashReport crashreport = CrashReport.a(var6, "Adding item to inventory");
-                CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Item being added");
-                crashreportsystemdetails.a("Item ID", Item.getId(itemstack.getItem()));
-                crashreportsystemdetails.a("Item data", itemstack.getDamage());
-                crashreportsystemdetails.a("Item name", () -> itemstack.getName().getString());
-                throw new ReportedException(crashreport);
-            }
-        }
-    }
-
-    @Override
-    public void a(World world, ItemStack itemstack) {
-        if (!world.isClientSide) {
-            while(!itemstack.isEmpty()) {
-                int i = this.firstPartial(itemstack);
-                if (i == -1) {
-                    i = this.getFirstEmptySlotIndex();
-                }
-
-                if (i == -1) {
-                    this.player.drop(itemstack, false);
-                    break;
-                }
-
-                int j = itemstack.getMaxStackSize() - this.getItem(i).getCount();
-                if (this.c(i, itemstack.cloneAndSubtract(j))) {
-                    ((EntityPlayer)this.player).playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, i, this.getItem(i)));
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public void f(ItemStack itemstack) {
-
-        for (List<ItemStack> list : this.f) {
-            for (int i = 0; i < list.size(); ++i) {
-                if (list.get(i) == itemstack) {
-                    list.set(i, ItemStack.a);
-                    break;
-                }
-            }
-        }
-    }
-
-    @Override
-    public float a(IBlockData iblockdata) {
-        return this.items.get(this.itemInHandIndex).a(iblockdata);
-    }
-
-    @Override
-    public NBTTagList a(NBTTagList nbttaglist) {
-        NBTTagCompound nbttagcompound;
-        int i;
-        for (i = 0; i < this.items.size(); ++i) {
-            if (!this.items.get(i).isEmpty()) {
-                nbttagcompound = new NBTTagCompound();
-                nbttagcompound.setByte("Slot", (byte) i);
-                this.items.get(i).save(nbttagcompound);
-                nbttaglist.add(nbttagcompound);
-            }
-        }
-
-        for (i = 0; i < this.armor.size(); ++i) {
-            if (!this.armor.get(i).isEmpty()) {
-                nbttagcompound = new NBTTagCompound();
-                nbttagcompound.setByte("Slot", (byte) (i + 100));
-                this.armor.get(i).save(nbttagcompound);
-                nbttaglist.add(nbttagcompound);
-            }
-        }
-
-        for (i = 0; i < this.extraSlots.size(); ++i) {
-            if (!this.extraSlots.get(i).isEmpty()) {
-                nbttagcompound = new NBTTagCompound();
-                nbttagcompound.setByte("Slot", (byte) (i + 150));
-                this.extraSlots.get(i).save(nbttagcompound);
-                nbttaglist.add(nbttagcompound);
-            }
-        }
-
-        return nbttaglist;
-    }
-
-    @Override
-    public void b(NBTTagList nbttaglist) {
-        this.items.clear();
-        this.armor.clear();
-        this.extraSlots.clear();
-
-        for(int i = 0; i < nbttaglist.size(); ++i) {
-            NBTTagCompound nbttagcompound = nbttaglist.getCompound(i);
-            int j = nbttagcompound.getByte("Slot") & 255;
-            ItemStack itemstack = ItemStack.a(nbttagcompound);
-            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.extraSlots.size() + 150) {
-                    this.extraSlots.set(j - 150, itemstack);
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public boolean isNotEmpty() {
-        Iterator iterator = this.items.iterator();
-
-        ItemStack itemstack;
-        while (iterator.hasNext()) {
-            itemstack = (ItemStack)iterator.next();
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        iterator = this.armor.iterator();
-
-        while (iterator.hasNext()) {
-            itemstack = (ItemStack)iterator.next();
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        iterator = this.extraSlots.iterator();
-
-        while (iterator.hasNext()) {
-            itemstack = (ItemStack)iterator.next();
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    @Nullable
-    @Override
-    public IChatBaseComponent getCustomName() {
-        return null;
-    }
-
-    @Override
-    public boolean b(IBlockData iblockdata) {
-        return this.getItem(this.itemInHandIndex).b(iblockdata);
-    }
-
-    @Override
-    public void a(float f) {
-        if (f > 0.0F) {
-            f /= 4.0F;
-            if (f < 1.0F) {
-                f = 1.0F;
-            }
-
-            for (int i = 0; i < this.armor.size(); ++i) {
-                ItemStack itemstack = this.armor.get(0);
-                int index = i;
-                if (itemstack.getItem() instanceof ItemArmor) {
-                    itemstack.damage((int) f, this.player, (entityhuman) -> entityhuman.c(EnumItemSlot.a(EnumItemSlot.Function.ARMOR, index)));
-                }
-            }
-        }
-    }
-
-    @Override
-    public void dropContents() {
-        for (List<ItemStack> itemStacks : this.f) {
-            for (int i = 0; i < itemStacks.size(); ++i) {
-                ItemStack itemstack = itemStacks.get(i);
-                if (!itemstack.isEmpty()) {
-                    itemStacks.set(i, ItemStack.a);
-                    this.player.a(itemstack, true, false);
-                }
-            }
-        }
-    }
-
-    @Override
-    public boolean h(ItemStack itemstack) {
-        return this.f.stream().flatMap(List::stream).anyMatch(itemStack1 -> !itemStack1.isEmpty() && itemStack1.doMaterialsMatch(itemstack));
-    }
-
-    @Override
-    public void a(PlayerInventory playerinventory) {
-        for (int i = 0; i < playerinventory.getSize(); ++i) {
-            this.setItem(i, playerinventory.getItem(i));
-        }
-
-        this.itemInHandIndex = playerinventory.itemInHandIndex;
-    }
-
-    @Override
-    public void clear() {
-        this.f.forEach(List::clear);
-    }
-
-    @Override
-    public void a(AutoRecipeStackManager autorecipestackmanager) {
-        for (ItemStack itemstack : this.items) {
-            autorecipestackmanager.a(itemstack);
-        }
-    }
-
-}
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (C) 2011-2020 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/>.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
-    <version>4.1.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>openinvadapter1_15_R1</artifactId>
-  <name>OpenInvAdapter1_15_R1</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
-      <version>1.15.1-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugincore</artifactId>
-      <version>4.1.1-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.2</version>
-        <configuration>
-          <minimizeJar>true</minimizeJar>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
@@ -1,360 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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_15_R1;
-
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.IAnySilentContainer;
-import java.lang.reflect.Field;
-import net.minecraft.server.v1_15_R1.Block;
-import net.minecraft.server.v1_15_R1.BlockBarrel;
-import net.minecraft.server.v1_15_R1.BlockChest;
-import net.minecraft.server.v1_15_R1.BlockChestTrapped;
-import net.minecraft.server.v1_15_R1.BlockEnderChest;
-import net.minecraft.server.v1_15_R1.BlockPosition;
-import net.minecraft.server.v1_15_R1.BlockPropertyChestType;
-import net.minecraft.server.v1_15_R1.BlockShulkerBox;
-import net.minecraft.server.v1_15_R1.ChatMessage;
-import net.minecraft.server.v1_15_R1.Container;
-import net.minecraft.server.v1_15_R1.ContainerChest;
-import net.minecraft.server.v1_15_R1.Containers;
-import net.minecraft.server.v1_15_R1.EntityHuman;
-import net.minecraft.server.v1_15_R1.EntityPlayer;
-import net.minecraft.server.v1_15_R1.EnumChatFormat;
-import net.minecraft.server.v1_15_R1.EnumGamemode;
-import net.minecraft.server.v1_15_R1.IBlockData;
-import net.minecraft.server.v1_15_R1.IChatBaseComponent;
-import net.minecraft.server.v1_15_R1.ITileInventory;
-import net.minecraft.server.v1_15_R1.InventoryEnderChest;
-import net.minecraft.server.v1_15_R1.InventoryLargeChest;
-import net.minecraft.server.v1_15_R1.PlayerInteractManager;
-import net.minecraft.server.v1_15_R1.PlayerInventory;
-import net.minecraft.server.v1_15_R1.TileEntity;
-import net.minecraft.server.v1_15_R1.TileEntityChest;
-import net.minecraft.server.v1_15_R1.TileEntityEnderChest;
-import net.minecraft.server.v1_15_R1.TileEntityLootable;
-import net.minecraft.server.v1_15_R1.TileInventory;
-import net.minecraft.server.v1_15_R1.World;
-import org.bukkit.Material;
-import org.bukkit.Statistic;
-import org.bukkit.block.Barrel;
-import org.bukkit.block.BlockFace;
-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.InventoryView;
-import org.bukkit.util.BoundingBox;
-import org.jetbrains.annotations.NotNull;
-
-public class AnySilentContainer implements IAnySilentContainer {
-
-    private Field playerInteractManagerGamemode;
-
-    public AnySilentContainer() {
-        try {
-            this.playerInteractManagerGamemode = PlayerInteractManager.class.getDeclaredField("gamemode");
-            this.playerInteractManagerGamemode.setAccessible(true);
-        } catch (NoSuchFieldException | SecurityException e) {
-            System.err.println("[OpenInv] Unable to directly write player gamemode! SilentChest will fail.");
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public boolean isAnySilentContainer(@NotNull final org.bukkit.block.Block bukkitBlock) {
-        if (bukkitBlock.getType() == Material.ENDER_CHEST) {
-            return true;
-        }
-        BlockState state = bukkitBlock.getState();
-        return state instanceof org.bukkit.block.Chest
-                || state instanceof org.bukkit.block.ShulkerBox
-                || state instanceof org.bukkit.block.Barrel;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(@NotNull final Player p, @NotNull final org.bukkit.block.Block block) {
-        BlockState blockState = block.getState();
-
-        // Barrels do not require AnyContainer.
-        if (blockState instanceof Barrel) {
-            return false;
-        }
-
-        // Enderchests require a non-occluding block on top to open.
-        if (blockState instanceof EnderChest) {
-            return block.getRelative(0, 1, 0).getType().isOccluding();
-        }
-
-        // Shulker boxes require 1/2 a block clear in the direction they open.
-        if (blockState instanceof ShulkerBox) {
-            BoundingBox boundingBox = block.getBoundingBox();
-            if (boundingBox.getVolume() > 1) {
-                // Shulker box is already open.
-                return false;
-            }
-
-            BlockData blockData = block.getBlockData();
-            if (!(blockData instanceof Directional)) {
-                // Shouldn't be possible. Just in case, demand AnyChest.
-                return true;
-            }
-
-            Directional directional = (Directional) blockData;
-            BlockFace face = directional.getFacing();
-            boundingBox.shift(face.getDirection());
-            // Return whether or not bounding boxes overlap.
-            return block.getRelative(face, 1).getBoundingBox().overlaps(boundingBox);
-        }
-
-        if (!(blockState instanceof org.bukkit.block.Chest)) {
-            return false;
-        }
-
-        if (isBlockedChest(block)) {
-            return true;
-        }
-
-        BlockData blockData = block.getBlockData();
-        if (!(blockData instanceof 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);
-
-        if (relative.getType() != block.getType()) {
-            return false;
-        }
-
-        BlockData relativeData = relative.getBlockData();
-        if (!(relativeData instanceof Chest)) {
-            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;
-        }
-
-        return isBlockedChest(relative);
-    }
-
-    private boolean isBlockedChest(org.bukkit.block.Block block) {
-        org.bukkit.block.Block relative = block.getRelative(0, 1, 0);
-        return relative.getType().isOccluding()
-                || block.getWorld().getNearbyEntities(BoundingBox.of(relative), entity -> entity instanceof Cat).size() > 0;
-    }
-
-    @Override
-    public boolean activateContainer(@NotNull final Player bukkitPlayer, final boolean silentchest,
-                                     @NotNull final org.bukkit.block.Block bukkitBlock) {
-
-        // Silent ender chest is API-only
-        if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        final World world = player.world;
-        final BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        final TileEntity tile = world.getTileEntity(blockPosition);
-
-        if (tile == null) {
-            return false;
-        }
-
-        if (tile instanceof TileEntityEnderChest) {
-            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
-            InventoryEnderChest enderChest = player.getEnderChest();
-            enderChest.a((TileEntityEnderChest) tile);
-            player.openContainer(new TileInventory((containerCounter, playerInventory, ignored) -> {
-                Containers containers;
-                int rows = enderChest.getSize() / 9;
-                switch (rows) {
-                    case 1:
-                        containers = Containers.GENERIC_9X1;
-                        break;
-                    case 2:
-                        containers = Containers.GENERIC_9X2;
-                        break;
-                    case 3:
-                    default:
-                        containers = Containers.GENERIC_9X3;
-                        break;
-                    case 4:
-                        containers = Containers.GENERIC_9X4;
-                        break;
-                    case 5:
-                        containers = Containers.GENERIC_9X5;
-                        break;
-                    case 6:
-                        containers = Containers.GENERIC_9X6;
-                        break;
-                }
-                return new ContainerChest(containers, containerCounter, playerInventory, enderChest, rows);
-            }, BlockEnderChest.e));
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        if (!(tile instanceof ITileInventory)) {
-            return false;
-        }
-
-        ITileInventory tileInventory = (ITileInventory) tile;
-        IBlockData blockData = world.getType(blockPosition);
-        Block block = blockData.getBlock();
-
-        if (block instanceof BlockChest) {
-
-            BlockPropertyChestType chestType = blockData.get(BlockChest.c);
-
-            if (chestType != BlockPropertyChestType.SINGLE) {
-
-                BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.i(blockData));
-                IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
-
-                if (adjacentBlockData.getBlock() == block) {
-
-                    BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.c);
-
-                    if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
-                            && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
-
-                        TileEntity adjacentTile = world.getTileEntity(adjacentBlockPosition);
-
-                        if (adjacentTile instanceof TileEntityChest && tileInventory instanceof  TileEntityChest) {
-                            TileEntityChest rightChest = chestType == BlockPropertyChestType.RIGHT ? ((TileEntityChest) tileInventory) : (TileEntityChest) adjacentTile;
-                            TileEntityChest leftChest = chestType == BlockPropertyChestType.RIGHT ? (TileEntityChest) adjacentTile : ((TileEntityChest) tileInventory);
-
-                            if (rightChest.lootTable != null || leftChest.lootTable != null) {
-                                player.a(new ChatMessage("Loot not generated! Please disable /silentcontainer.").a(EnumChatFormat.RED), true);
-                                return false;
-                            }
-
-                            tileInventory = new ITileInventory() {
-                                public Container createMenu(int containerCounter, PlayerInventory playerInventory, EntityHuman entityHuman) {
-                                    leftChest.d(playerInventory.player);
-                                    rightChest.d(playerInventory.player);
-                                    return ContainerChest.b(containerCounter, playerInventory, new InventoryLargeChest(rightChest, leftChest));
-                                }
-
-                                public IChatBaseComponent getScoreboardDisplayName() {
-                                    return new ChatMessage("container.chestDouble");
-                                }
-                            };
-                        }
-                    }
-                }
-            }
-
-            if (block instanceof BlockChestTrapped) {
-                bukkitPlayer.incrementStatistic(Statistic.TRAPPED_CHEST_TRIGGERED);
-            } else {
-                bukkitPlayer.incrementStatistic(Statistic.CHEST_OPENED);
-            }
-        }
-
-        if (block instanceof BlockShulkerBox) {
-            bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED);
-        }
-
-        if (block instanceof BlockBarrel) {
-            bukkitPlayer.incrementStatistic(Statistic.OPEN_BARREL);
-        }
-
-        // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
-        if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
-            player.openContainer(tileInventory);
-            return true;
-        }
-
-        // SilentChest requires access to setting players' gamemode directly.
-        if (this.playerInteractManagerGamemode == null) {
-            return false;
-        }
-
-        if (tile instanceof TileEntityLootable) {
-            TileEntityLootable lootable = (TileEntityLootable) tile;
-            if (lootable.lootTable != null) {
-                OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
-                return false;
-            }
-        }
-
-        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
-        this.forceGameMode(player, EnumGamemode.SPECTATOR);
-        player.openContainer(tileInventory);
-        this.forceGameMode(player, gamemode);
-        return true;
-    }
-
-    @Override
-    public void deactivateContainer(@NotNull final Player bukkitPlayer) {
-        if (this.playerInteractManagerGamemode == null) {
-            return;
-        }
-
-        InventoryView view = bukkitPlayer.getOpenInventory();
-        switch (view.getType()) {
-            case CHEST:
-            case ENDER_CHEST:
-            case SHULKER_BOX:
-            case BARREL:
-            break;
-        default:
-            return;
-        }
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
-        this.forceGameMode(player, EnumGamemode.SPECTATOR);
-        player.activeContainer.b(player);
-        player.activeContainer.a(player, false);
-        player.activeContainer.transferTo(player.defaultContainer, player.getBukkitEntity());
-        player.activeContainer = player.defaultContainer;
-        this.forceGameMode(player, gamemode);
-    }
-
-    private void forceGameMode(final EntityPlayer player, final EnumGamemode gameMode) {
-        if (this.playerInteractManagerGamemode == null) {
-            // No need to warn repeatedly, error on startup and lack of function should be enough.
-            return;
-        }
-        try {
-            if (!this.playerInteractManagerGamemode.isAccessible()) {
-                // Just in case, ensure accessible.
-                this.playerInteractManagerGamemode.setAccessible(true);
-            }
-            this.playerInteractManagerGamemode.set(player.playerInteractManager, gameMode);
-        } catch (IllegalArgumentException | IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-}
@@ -1,207 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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_15_R1;
-
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.mojang.authlib.GameProfile;
-import net.minecraft.server.v1_15_R1.ChatComponentText;
-import net.minecraft.server.v1_15_R1.ChatMessageType;
-import net.minecraft.server.v1_15_R1.Container;
-import net.minecraft.server.v1_15_R1.Containers;
-import net.minecraft.server.v1_15_R1.DimensionManager;
-import net.minecraft.server.v1_15_R1.EntityHuman;
-import net.minecraft.server.v1_15_R1.EntityPlayer;
-import net.minecraft.server.v1_15_R1.MinecraftServer;
-import net.minecraft.server.v1_15_R1.PacketPlayOutChat;
-import net.minecraft.server.v1_15_R1.PacketPlayOutOpenWindow;
-import net.minecraft.server.v1_15_R1.PlayerInteractManager;
-import net.minecraft.server.v1_15_R1.PlayerInventory;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_15_R1.event.CraftEventFactory;
-import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftContainer;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    @NotNull
-    public static EntityPlayer getHandle(final Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        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");
-        }
-
-        return nmsPlayer;
-    }
-
-    @Nullable
-    @Override
-    public Player loadPlayer(@NotNull final OfflinePlayer offline) {
-        // Ensure player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        // Create a profile and entity to load the player data
-        GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(DimensionManager.OVERWORLD), profile,
-                new PlayerInteractManager(server.getWorldServer(DimensionManager.OVERWORLD)));
-
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
-    }
-
-    @Nullable
-	@Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-
-        EntityPlayer nmsPlayer = getHandle(player);
-
-        if (nmsPlayer.playerConnection == null) {
-            return null;
-        }
-
-        String title;
-        if (inventory instanceof SpecialEnderChest) {
-            HumanEntity owner = (HumanEntity) ((SpecialEnderChest) inventory).getBukkitOwner();
-            title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.enderchest");
-            if (title == null) {
-                title = "%player%'s Ender Chest";
-            }
-            //noinspection ConstantConditions - owner name can be null if loaded by UUID
-            title = title.replace("%player%", owner.getName() != null ? owner.getName() : owner.getUniqueId().toString());
-        } else if (inventory instanceof SpecialPlayerInventory) {
-            EntityHuman owner = ((PlayerInventory) inventory).player;
-            title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.player");
-            if (title == null) {
-                title = "%player%'s Inventory";
-            }
-            title = title.replace("%player%", owner.getName() != null ? owner.getName() : owner.getUniqueID().toString());
-        } else {
-            return player.openInventory(inventory.getBukkitInventory());
-        }
-
-        String finalTitle = title;
-        Container container = new CraftContainer(new InventoryView() {
-            @Override
-            public @NotNull Inventory getTopInventory() {
-                return inventory.getBukkitInventory();
-            }
-            @Override
-            public @NotNull Inventory getBottomInventory() {
-                return player.getInventory();
-            }
-            @Override
-            public @NotNull HumanEntity getPlayer() {
-                return player;
-            }
-            @Override
-            public @NotNull InventoryType getType() {
-                return inventory.getBukkitInventory().getType();
-            }
-            @Override
-            public @NotNull String getTitle() {
-                return finalTitle;
-            }
-        }, nmsPlayer, nmsPlayer.nextContainerCounter()) {
-            @Override
-            public Containers<?> getType() {
-                switch (inventory.getBukkitInventory().getSize()) {
-                    case 9:
-                        return Containers.GENERIC_9X1;
-                    case 18:
-                        return Containers.GENERIC_9X2;
-                    case 27:
-                    default:
-                        return Containers.GENERIC_9X3;
-                    case 36:
-                        return Containers.GENERIC_9X4;
-                    case 41: // PLAYER
-                    case 45:
-                        return Containers.GENERIC_9X5;
-                    case 54:
-                        return Containers.GENERIC_9X6;
-                }
-            }
-        };
-
-        container.setTitle(new ChatComponentText(title));
-        container = CraftEventFactory.callInventoryOpenEvent(nmsPlayer, container);
-
-        if (container == null) {
-            return null;
-        }
-
-        nmsPlayer.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, container.getType(),
-                new ChatComponentText(container.getBukkitView().getTitle())));
-        nmsPlayer.activeContainer = container;
-        container.addSlotListener(nmsPlayer);
-
-        return container.getBukkitView();
-
-    }
-
-    @Override
-    public void sendSystemMessage(@NotNull Player player, @NotNull String message) {
-        int newline = message.indexOf('\n');
-        if (newline != -1) {
-            // No newlines in action bar chat.
-            message = message.substring(0, newline);
-        }
-
-        if (message.isEmpty()) {
-            return;
-        }
-
-        EntityPlayer nmsPlayer = getHandle(player);
-
-        // For action bar chat, color codes are still supported but JSON text color is not allowed. Do not convert text.
-        if (nmsPlayer.playerConnection != null) {
-            nmsPlayer.playerConnection.sendPacket(new PacketPlayOutChat(new ChatComponentText(message), ChatMessageType.GAME_INFO));
-        }
-    }
-
-}
@@ -1,255 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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_15_R1;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.util.List;
-import net.minecraft.server.v1_15_R1.AutoRecipeStackManager;
-import net.minecraft.server.v1_15_R1.ContainerUtil;
-import net.minecraft.server.v1_15_R1.EntityHuman;
-import net.minecraft.server.v1_15_R1.EntityPlayer;
-import net.minecraft.server.v1_15_R1.IInventoryListener;
-import net.minecraft.server.v1_15_R1.InventoryEnderChest;
-import net.minecraft.server.v1_15_R1.ItemStack;
-import net.minecraft.server.v1_15_R1.NonNullList;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-
-public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEnderChest {
-
-    private final CraftInventory inventory;
-    private EntityPlayer owner;
-    private NonNullList<ItemStack> items;
-    private boolean playerOnline;
-
-    public SpecialEnderChest(final Player player, final Boolean online) {
-        super(PlayerDataManager.getHandle(player));
-        this.inventory = new CraftInventory(this);
-        this.owner = PlayerDataManager.getHandle(player);
-        this.playerOnline = online;
-        this.items = this.owner.getEnderChest().items;
-    }
-
-    @Override
-    public @NotNull CraftInventory getBukkitInventory() {
-        return inventory;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        this.playerOnline = false;
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull final Player player) {
-        if (!this.playerOnline) {
-            try {
-                this.owner = PlayerDataManager.getHandle(player);
-                InventoryEnderChest enderChest = owner.getEnderChest();
-                for (int i = 0; i < enderChest.getSize(); ++i) {
-                    enderChest.setItem(i, this.items.get(i));
-                }
-                this.items = enderChest.items;
-            } catch (Exception ignored) {}
-            this.playerOnline = true;
-        }
-    }
-
-    @Override
-    public void update() {
-        this.owner.getEnderChest().update();
-    }
-
-    @Override
-    public List<ItemStack> getContents() {
-        return this.items;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        this.owner.getEnderChest().onOpen(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        this.owner.getEnderChest().onClose(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return this.owner.getEnderChest().getViewers();
-    }
-
-    @Override
-    public void setMaxStackSize(int i) {
-        this.owner.getEnderChest().setMaxStackSize(i);
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner.getEnderChest().getOwner();
-    }
-
-    @Override
-    public Location getLocation() {
-        return null;
-    }
-
-    @Override
-    public void a(IInventoryListener iinventorylistener) {
-        this.owner.getEnderChest().a(iinventorylistener);
-    }
-
-    @Override
-    public void b(IInventoryListener iinventorylistener) {
-        this.owner.getEnderChest().b(iinventorylistener);
-    }
-
-    @Override
-    public ItemStack getItem(int i) {
-        return i >= 0 && i < this.items.size() ? this.items.get(i) : ItemStack.a;
-    }
-
-    @Override
-    public ItemStack splitStack(int i, int j) {
-        ItemStack itemstack = ContainerUtil.a(this.items, i, j);
-        if (!itemstack.isEmpty()) {
-            this.update();
-        }
-
-        return itemstack;
-    }
-
-    @Override
-    public ItemStack a(ItemStack itemstack) {
-        ItemStack itemstack1 = itemstack.cloneItemStack();
-
-        for (int i = 0; i < this.getSize(); ++i) {
-            ItemStack itemstack2 = this.getItem(i);
-            if (itemstack2.isEmpty()) {
-                this.setItem(i, itemstack1);
-                this.update();
-                return ItemStack.a;
-            }
-
-            if (ItemStack.c(itemstack2, itemstack1)) {
-                int j = Math.min(this.getMaxStackSize(), itemstack2.getMaxStackSize());
-                int k = Math.min(itemstack1.getCount(), j - itemstack2.getCount());
-                if (k > 0) {
-                    itemstack2.add(k);
-                    itemstack1.subtract(k);
-                    if (itemstack1.isEmpty()) {
-                        this.update();
-                        return ItemStack.a;
-                    }
-                }
-            }
-        }
-
-        if (itemstack1.getCount() != itemstack.getCount()) {
-            this.update();
-        }
-
-        return itemstack1;
-    }
-
-    @Override
-    public ItemStack splitWithoutUpdate(int i) {
-        ItemStack itemstack = this.items.get(i);
-        if (itemstack.isEmpty()) {
-            return ItemStack.a;
-        } else {
-            this.items.set(i, ItemStack.a);
-            return itemstack;
-        }
-    }
-
-    @Override
-    public void setItem(int i, ItemStack itemstack) {
-        this.items.set(i, itemstack);
-        if (!itemstack.isEmpty() && itemstack.getCount() > this.getMaxStackSize()) {
-            itemstack.setCount(this.getMaxStackSize());
-        }
-
-        this.update();
-    }
-
-    @Override
-    public int getSize() {
-        return this.owner.getEnderChest().getSize();
-    }
-
-    @Override
-    public boolean isNotEmpty() {
-
-        for (ItemStack itemstack : this.items) {
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return 64;
-    }
-
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen(EntityHuman entityhuman) {
-    }
-
-    @Override
-    public void closeContainer(EntityHuman entityhuman) {
-    }
-
-    @Override
-    public boolean b(int i, ItemStack itemstack) {
-        return true;
-    }
-
-    @Override
-    public void clear() {
-        this.items.clear();
-    }
-
-    @Override
-    public void a(AutoRecipeStackManager autorecipestackmanager) {
-
-        for (ItemStack itemstack : this.items) {
-            autorecipestackmanager.b(itemstack);
-        }
-
-    }
-
-}
@@ -1,759 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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_15_R1;
-
-import com.google.common.collect.ImmutableList;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import net.minecraft.server.v1_15_R1.AutoRecipeStackManager;
-import net.minecraft.server.v1_15_R1.ChatMessage;
-import net.minecraft.server.v1_15_R1.ContainerUtil;
-import net.minecraft.server.v1_15_R1.CrashReport;
-import net.minecraft.server.v1_15_R1.CrashReportSystemDetails;
-import net.minecraft.server.v1_15_R1.EntityHuman;
-import net.minecraft.server.v1_15_R1.EntityPlayer;
-import net.minecraft.server.v1_15_R1.EnumItemSlot;
-import net.minecraft.server.v1_15_R1.IBlockData;
-import net.minecraft.server.v1_15_R1.IChatBaseComponent;
-import net.minecraft.server.v1_15_R1.Item;
-import net.minecraft.server.v1_15_R1.ItemArmor;
-import net.minecraft.server.v1_15_R1.ItemStack;
-import net.minecraft.server.v1_15_R1.NBTTagCompound;
-import net.minecraft.server.v1_15_R1.NBTTagList;
-import net.minecraft.server.v1_15_R1.NonNullList;
-import net.minecraft.server.v1_15_R1.PacketPlayOutSetSlot;
-import net.minecraft.server.v1_15_R1.PlayerInventory;
-import net.minecraft.server.v1_15_R1.ReportedException;
-import net.minecraft.server.v1_15_R1.World;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-
-    private final CraftInventory inventory;
-    private boolean playerOnline;
-    private EntityHuman player;
-    private NonNullList<ItemStack> items, armor, extraSlots;
-    private List<NonNullList<ItemStack>> f;
-
-    public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
-        this.inventory = new CraftInventory(this);
-        this.playerOnline = online;
-        this.player = super.player;
-        this.items = this.player.inventory.items;
-        this.armor = this.player.inventory.armor;
-        this.extraSlots = this.player.inventory.extraSlots;
-        this.f = ImmutableList.of(this.items, this.armor, this.extraSlots);
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull final Player player) {
-        if (!this.playerOnline) {
-            EntityPlayer entityPlayer = PlayerDataManager.getHandle(player);
-            entityPlayer.inventory.transaction.addAll(this.transaction);
-            this.player = entityPlayer;
-            for (int i = 0; i < getSize(); ++i) {
-                this.player.inventory.setItem(i, getRawItem(i));
-            }
-            this.player.inventory.itemInHandIndex = this.itemInHandIndex;
-            this.items = this.player.inventory.items;
-            this.armor = this.player.inventory.armor;
-            this.extraSlots = this.player.inventory.extraSlots;
-            this.f = ImmutableList.of(this.items, this.armor, this.extraSlots);
-            this.playerOnline = true;
-        }
-    }
-
-    @Override
-    public boolean a(final EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public @NotNull CraftInventory getBukkitInventory() {
-        return this.inventory;
-    }
-
-    @Override
-    public ItemStack getItem(int i) {
-        List<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            return ItemStack.a;
-        }
-
-        return list.get(i);
-    }
-
-    private ItemStack getRawItem(int i) {
-        NonNullList<ItemStack> list = null;
-        for (NonNullList<ItemStack> next : this.f) {
-            if (i < next.size()) {
-                list = next;
-                break;
-            }
-            i -= next.size();
-        }
-
-        return list == null ? ItemStack.a : list.get(i);
-    }
-
-    @Override
-    public IChatBaseComponent getDisplayName() {
-        return new ChatMessage(this.player.getName());
-    }
-
-    @Override
-    public boolean hasCustomName() {
-        return false;
-    }
-
-    private int getReversedArmorSlotNum(final int i) {
-        if (i == 0) {
-            return 3;
-        }
-        if (i == 1) {
-            return 2;
-        }
-        if (i == 2) {
-            return 1;
-        }
-        if (i == 3) {
-            return 0;
-        }
-        return i;
-    }
-
-    private int getReversedItemSlotNum(final int i) {
-        if (i >= 27) {
-            return i - 27;
-        }
-        return i + 9;
-    }
-
-    @Override
-    public int getSize() {
-        return 45;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
-    @Override
-    public void setItem(int i, final ItemStack itemstack) {
-        List<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            this.player.drop(itemstack, true);
-            return;
-        }
-
-        list.set(i, itemstack);
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        this.playerOnline = false;
-    }
-
-    @Override
-    public ItemStack splitStack(int i, final int j) {
-        List<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            return ItemStack.a;
-        }
-
-        return list.get(i).isEmpty() ? ItemStack.a : ContainerUtil.a(list, i, j);
-    }
-
-    @Override
-    public ItemStack splitWithoutUpdate(int i) {
-        List<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            return ItemStack.a;
-        }
-
-        if (!list.get(i).isEmpty()) {
-            ItemStack itemstack = list.get(i);
-
-            list.set(i, ItemStack.a);
-            return itemstack;
-        }
-
-        return ItemStack.a;
-    }
-
-    @Override
-    public List<ItemStack> getContents() {
-        return this.f.stream().flatMap(List::stream).collect(Collectors.toList());
-    }
-
-    @Override
-    public List<ItemStack> getArmorContents() {
-        return this.armor;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        this.transaction.add(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        this.transaction.remove(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return this.transaction;
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.player.getBukkitEntity();
-    }
-
-    @Override
-    public Location getLocation() {
-        return this.player.getBukkitEntity().getLocation();
-    }
-
-    @Override
-    public ItemStack getItemInHand() {
-        return d(this.itemInHandIndex) ? this.items.get(this.itemInHandIndex) : ItemStack.a;
-    }
-
-    private boolean a(ItemStack itemstack, ItemStack itemstack1) {
-        return !itemstack.isEmpty() && this.b(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize();
-    }
-
-    private boolean b(ItemStack itemstack, ItemStack itemstack1) {
-        return itemstack.getItem() == itemstack1.getItem() && ItemStack.equals(itemstack, itemstack1);
-    }
-
-    @Override
-    public int canHold(ItemStack itemstack) {
-        int remains = itemstack.getCount();
-
-        for (int i = 0; i < this.items.size(); ++i) {
-            ItemStack itemstack1 = this.getItem(i);
-            if (itemstack1.isEmpty()) {
-                return itemstack.getCount();
-            }
-
-            if (!this.a(itemstack, itemstack1)) {
-                remains -= (itemstack1.getMaxStackSize() < this.getMaxStackSize() ? itemstack1.getMaxStackSize() : this.getMaxStackSize()) - itemstack1.getCount();
-            }
-
-            if (remains <= 0) {
-                return itemstack.getCount();
-            }
-        }
-
-        return itemstack.getCount() - remains;
-    }
-
-    @Override
-    public int getFirstEmptySlotIndex() {
-        for (int i = 0; i < this.items.size(); ++i) {
-            if (this.items.get(i).isEmpty()) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public void c(int i) {
-        this.itemInHandIndex = this.i();
-        ItemStack itemstack = this.items.get(this.itemInHandIndex);
-        this.items.set(this.itemInHandIndex, this.items.get(i));
-        this.items.set(i, itemstack);
-    }
-
-    @Override
-    public int c(ItemStack itemstack) {
-        for (int i = 0; i < this.items.size(); ++i) {
-            ItemStack itemstack1 = this.items.get(i);
-            if (!this.items.get(i).isEmpty() && this.b(itemstack, this.items.get(i)) && !this.items.get(i).f() && !itemstack1.hasEnchantments() && !itemstack1.hasName()) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public int i() {
-        int i;
-        int j;
-        for (j = 0; j < 9; ++j) {
-            i = (this.itemInHandIndex + j) % 9;
-            if (this.items.get(i).isEmpty()) {
-                return i;
-            }
-        }
-
-        for (j = 0; j < 9; ++j) {
-            i = (this.itemInHandIndex + j) % 9;
-            if (!this.items.get(i).hasEnchantments()) {
-                return i;
-            }
-        }
-
-        return this.itemInHandIndex;
-    }
-
-    @Override
-    public int a(Predicate<ItemStack> predicate, int i) {
-        int j = 0;
-
-        int k;
-        for (k = 0; k < this.getSize(); ++k) {
-            ItemStack itemstack = this.getItem(k);
-            if (!itemstack.isEmpty() && predicate.test(itemstack)) {
-                int l = i <= 0 ? itemstack.getCount() : Math.min(i - j, itemstack.getCount());
-                j += l;
-                if (i != 0) {
-                    itemstack.subtract(l);
-                    if (itemstack.isEmpty()) {
-                        this.setItem(k, ItemStack.a);
-                    }
-
-                    if (i > 0 && j >= i) {
-                        return j;
-                    }
-                }
-            }
-        }
-
-        if (!this.getCarried().isEmpty() && predicate.test(this.getCarried())) {
-            k = i <= 0 ? this.getCarried().getCount() : Math.min(i - j, this.getCarried().getCount());
-            j += k;
-            if (i != 0) {
-                this.getCarried().subtract(k);
-                if (this.getCarried().isEmpty()) {
-                    this.setCarried(ItemStack.a);
-                }
-
-                if (i > 0 && j >= i) {
-                    return j;
-                }
-            }
-        }
-
-        return j;
-    }
-
-    private int i(ItemStack itemstack) {
-        int i = this.firstPartial(itemstack);
-        if (i == -1) {
-            i = this.getFirstEmptySlotIndex();
-        }
-
-        return i == -1 ? itemstack.getCount() : this.d(i, itemstack);
-    }
-
-    private int d(int i, ItemStack itemstack) {
-        Item item = itemstack.getItem();
-        int j = itemstack.getCount();
-        ItemStack itemstack1 = this.getItem(i);
-        if (itemstack1.isEmpty()) {
-            itemstack1 = new ItemStack(item, 0);
-            if (itemstack.hasTag()) {
-                itemstack1.setTag(itemstack.getTag().clone());
-            }
-
-            this.setItem(i, itemstack1);
-        }
-
-        int k = j;
-        if (j > itemstack1.getMaxStackSize() - itemstack1.getCount()) {
-            k = itemstack1.getMaxStackSize() - itemstack1.getCount();
-        }
-
-        if (k > this.getMaxStackSize() - itemstack1.getCount()) {
-            k = this.getMaxStackSize() - itemstack1.getCount();
-        }
-
-        if (k == 0) {
-            return j;
-        } else {
-            j -= k;
-            itemstack1.add(k);
-            itemstack1.d(5);
-            return j;
-        }
-    }
-
-    @Override
-    public int firstPartial(ItemStack itemstack) {
-        if (this.a(this.getItem(this.itemInHandIndex), itemstack)) {
-            return this.itemInHandIndex;
-        } else if (this.a(this.getItem(40), itemstack)) {
-            return 40;
-        } else {
-            for (int i = 0; i < this.items.size(); ++i) {
-                if (this.a(this.items.get(i), itemstack)) {
-                    return i;
-                }
-            }
-
-            return -1;
-        }
-    }
-
-    @Override
-    public void j() {
-
-        for (List<ItemStack> itemStacks : this.f) {
-            for (int i = 0; i < itemStacks.size(); ++i) {
-                if (!itemStacks.get(i).isEmpty()) {
-                    itemStacks.get(i).a(this.player.world, this.player, i, this.itemInHandIndex == i);
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public boolean pickup(ItemStack itemstack) {
-        return this.c(-1, itemstack);
-    }
-
-    @Override
-    public boolean c(int i, ItemStack itemstack) {
-        if (itemstack.isEmpty()) {
-            return false;
-        } else {
-            try {
-                if (itemstack.f()) {
-                    if (i == -1) {
-                        i = this.getFirstEmptySlotIndex();
-                    }
-
-                    if (i >= 0) {
-                        this.items.set(i, itemstack.cloneItemStack());
-                        this.items.get(i).d(5);
-                        itemstack.setCount(0);
-                        return true;
-                    } else if (this.player.abilities.canInstantlyBuild) {
-                        itemstack.setCount(0);
-                        return true;
-                    } else {
-                        return false;
-                    }
-                } else {
-                    int j;
-                    do {
-                        j = itemstack.getCount();
-                        if (i == -1) {
-                            itemstack.setCount(this.i(itemstack));
-                        } else {
-                            itemstack.setCount(this.d(i, itemstack));
-                        }
-                    } while(!itemstack.isEmpty() && itemstack.getCount() < j);
-
-                    if (itemstack.getCount() == j && this.player.abilities.canInstantlyBuild) {
-                        itemstack.setCount(0);
-                        return true;
-                    } else {
-                        return itemstack.getCount() < j;
-                    }
-                }
-            } catch (Throwable var6) {
-                CrashReport crashreport = CrashReport.a(var6, "Adding item to inventory");
-                CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Item being added");
-                crashreportsystemdetails.a("Item ID", Item.getId(itemstack.getItem()));
-                crashreportsystemdetails.a("Item data", itemstack.getDamage());
-                crashreportsystemdetails.a("Item name", () -> itemstack.getName().getString());
-                throw new ReportedException(crashreport);
-            }
-        }
-    }
-
-    @Override
-    public void a(World world, ItemStack itemstack) {
-        if (!world.isClientSide) {
-            while(!itemstack.isEmpty()) {
-                int i = this.firstPartial(itemstack);
-                if (i == -1) {
-                    i = this.getFirstEmptySlotIndex();
-                }
-
-                if (i == -1) {
-                    this.player.drop(itemstack, false);
-                    break;
-                }
-
-                int j = itemstack.getMaxStackSize() - this.getItem(i).getCount();
-                if (this.c(i, itemstack.cloneAndSubtract(j))) {
-                    ((EntityPlayer)this.player).playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, i, this.getItem(i)));
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public void f(ItemStack itemstack) {
-
-        for (List<ItemStack> list : this.f) {
-            for (int i = 0; i < list.size(); ++i) {
-                if (list.get(i) == itemstack) {
-                    list.set(i, ItemStack.a);
-                    break;
-                }
-            }
-        }
-    }
-
-    @Override
-    public float a(IBlockData iblockdata) {
-        return this.items.get(this.itemInHandIndex).a(iblockdata);
-    }
-
-    @Override
-    public NBTTagList a(NBTTagList nbttaglist) {
-        NBTTagCompound nbttagcompound;
-        int i;
-        for (i = 0; i < this.items.size(); ++i) {
-            if (!this.items.get(i).isEmpty()) {
-                nbttagcompound = new NBTTagCompound();
-                nbttagcompound.setByte("Slot", (byte) i);
-                this.items.get(i).save(nbttagcompound);
-                nbttaglist.add(nbttagcompound);
-            }
-        }
-
-        for (i = 0; i < this.armor.size(); ++i) {
-            if (!this.armor.get(i).isEmpty()) {
-                nbttagcompound = new NBTTagCompound();
-                nbttagcompound.setByte("Slot", (byte) (i + 100));
-                this.armor.get(i).save(nbttagcompound);
-                nbttaglist.add(nbttagcompound);
-            }
-        }
-
-        for (i = 0; i < this.extraSlots.size(); ++i) {
-            if (!this.extraSlots.get(i).isEmpty()) {
-                nbttagcompound = new NBTTagCompound();
-                nbttagcompound.setByte("Slot", (byte) (i + 150));
-                this.extraSlots.get(i).save(nbttagcompound);
-                nbttaglist.add(nbttagcompound);
-            }
-        }
-
-        return nbttaglist;
-    }
-
-    @Override
-    public void b(NBTTagList nbttaglist) {
-        this.items.clear();
-        this.armor.clear();
-        this.extraSlots.clear();
-
-        for(int i = 0; i < nbttaglist.size(); ++i) {
-            NBTTagCompound nbttagcompound = nbttaglist.getCompound(i);
-            int j = nbttagcompound.getByte("Slot") & 255;
-            ItemStack itemstack = ItemStack.a(nbttagcompound);
-            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.extraSlots.size() + 150) {
-                    this.extraSlots.set(j - 150, itemstack);
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public boolean isNotEmpty() {
-        Iterator iterator = this.items.iterator();
-
-        ItemStack itemstack;
-        while (iterator.hasNext()) {
-            itemstack = (ItemStack)iterator.next();
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        iterator = this.armor.iterator();
-
-        while (iterator.hasNext()) {
-            itemstack = (ItemStack)iterator.next();
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        iterator = this.extraSlots.iterator();
-
-        while (iterator.hasNext()) {
-            itemstack = (ItemStack)iterator.next();
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    @Nullable
-    @Override
-    public IChatBaseComponent getCustomName() {
-        return null;
-    }
-
-    @Override
-    public boolean b(IBlockData iblockdata) {
-        return this.getItem(this.itemInHandIndex).canDestroySpecialBlock(iblockdata);
-    }
-
-    @Override
-    public void a(float f) {
-        if (f > 0.0F) {
-            f /= 4.0F;
-            if (f < 1.0F) {
-                f = 1.0F;
-            }
-
-            for (int i = 0; i < this.armor.size(); ++i) {
-                ItemStack itemstack = this.armor.get(0);
-                int index = i;
-                if (itemstack.getItem() instanceof ItemArmor) {
-                    itemstack.damage((int) f, this.player, (entityhuman) -> entityhuman.c(EnumItemSlot.a(EnumItemSlot.Function.ARMOR, index)));
-                }
-            }
-        }
-    }
-
-    @Override
-    public void dropContents() {
-        for (List<ItemStack> itemStacks : this.f) {
-            for (int i = 0; i < itemStacks.size(); ++i) {
-                ItemStack itemstack = itemStacks.get(i);
-                if (!itemstack.isEmpty()) {
-                    itemStacks.set(i, ItemStack.a);
-                    this.player.a(itemstack, true, false);
-                }
-            }
-        }
-    }
-
-    @Override
-    public boolean h(ItemStack itemstack) {
-        return this.f.stream().flatMap(List::stream).anyMatch(itemStack1 -> !itemStack1.isEmpty() && itemStack1.doMaterialsMatch(itemstack));
-    }
-
-    @Override
-    public void a(PlayerInventory playerinventory) {
-        for (int i = 0; i < playerinventory.getSize(); ++i) {
-            this.setItem(i, playerinventory.getItem(i));
-        }
-
-        this.itemInHandIndex = playerinventory.itemInHandIndex;
-    }
-
-    @Override
-    public void clear() {
-        this.f.forEach(List::clear);
-    }
-
-    @Override
-    public void a(AutoRecipeStackManager autorecipestackmanager) {
-        for (ItemStack itemstack : this.items) {
-            autorecipestackmanager.a(itemstack);
-        }
-    }
-
-}
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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/>.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>openinvparent</artifactId>
+    <groupId>com.lishid</groupId>
+    <relativePath>../../pom.xml</relativePath>
+    <version>4.1.9-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvadapter1_17_R1</artifactId>
+  <name>OpenInvAdapter1_17_R1</name>
+
+  <properties>
+    <maven.compiler.source>16</maven.compiler.source>
+    <maven.compiler.target>16</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <artifactId>spigot</artifactId>
+      <groupId>org.spigotmc</groupId>
+      <scope>provided</scope>
+      <version>1.17.1-R0.1-SNAPSHOT</version>
+      <classifier>remapped-mojang</classifier>
+    </dependency>
+    <dependency>
+      <artifactId>openinvapi</artifactId>
+      <groupId>com.lishid</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>openinvplugincore</artifactId>
+      <groupId>com.lishid</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>annotations</artifactId>
+      <groupId>org.jetbrains</groupId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <configuration>
+          <minimizeJar>true</minimizeJar>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>net.md-5</groupId>
+        <artifactId>specialsource-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>remap</goal>
+            </goals>
+            <id>remap-obf</id>
+            <configuration>
+              <srgIn>org.spigotmc:minecraft-server:1.17.1-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
+              <reverse>true</reverse>
+              <remappedDependencies>org.spigotmc:spigot:1.17.1-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
+              <remappedArtifactAttached>true</remappedArtifactAttached>
+              <remappedClassifierName>remapped-obf</remappedClassifierName>
+            </configuration>
+          </execution>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>remap</goal>
+            </goals>
+            <id>remap-spigot</id>
+            <configuration>
+              <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
+              <srgIn>org.spigotmc:minecraft-server:1.17.1-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
+              <remappedDependencies>org.spigotmc:spigot:1.17.1-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
@@ -0,0 +1,277 @@
+/*
+ * 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 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.TextComponent;
+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;
+import net.minecraft.world.inventory.ChestMenu;
+import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.inventory.PlayerEnderChestContainer;
+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.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;
+
+public class AnySilentContainer implements IAnySilentContainer {
+
+    private @Nullable Field serverPlayerGameModeGameType;
+
+    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) {
+                Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger();
+                logger.warning("ServerPlayerGameMode#gameModeForPlayer's obfuscated name has changed!");
+                logger.warning("Please report this at https://github.com/Jikoo/OpenInv/issues");
+                logger.warning("Attempting to fall through using reflection. Please verify that SilentContainer does not fail.");
+                // N.B. gameModeForPlayer is (for now) declared before previousGameModeForPlayer so silent shouldn't break.
+                this.serverPlayerGameModeGameType = ReflectionHelper.grabFieldByType(ServerPlayerGameMode.class, GameType.class);
+            }
+        } 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);
+        }
+    }
+
+    @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,
+            final boolean silentchest,
+            @NotNull final org.bukkit.block.Block bukkitBlock) {
+
+        // Silent ender chest is API-only
+        if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) {
+            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
+            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
+            return true;
+        }
+
+        ServerPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
+
+        final ServerLevel level = player.getLevel();
+        final BlockPos blockPos = new BlockPos(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
+        final BlockEntity blockEntity = level.getBlockEntity(blockPos);
+
+        if (blockEntity == null) {
+            return false;
+        }
+
+        if (blockEntity instanceof EnderChestBlockEntity enderChestTile) {
+            // Anychest ender chest. See net.minecraft.world.level.block.BlockEnderChest
+            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 TextComponent("container.enderchest")));
+            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
+            return true;
+        }
+
+        if (!(blockEntity instanceof MenuProvider menuProvider)) {
+            return false;
+        }
+
+        BlockState blockState = level.getBlockState(blockPos);
+        Block block = blockState.getBlock();
+
+        if (block instanceof ChestBlock chestBlock) {
+
+            // boolean flag: check if chest is blocked
+            Optional<MenuProvider> menuOptional = chestBlock.combine(blockState, level, blockPos, false).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));
+                        }
+
+                        @Override
+                        public Optional<MenuProvider> acceptSingle(ChestBlockEntity localChest) {
+                            return Optional.of(localChest);
+                        }
+
+                        @Override
+                        public Optional<MenuProvider> acceptNone() {
+                            return Optional.empty();
+                        }
+                    });
+
+            if (menuOptional.isEmpty()) {
+                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 {
+                bukkitPlayer.incrementStatistic(Statistic.CHEST_OPENED);
+            }
+        }
+
+        if (block instanceof ShulkerBoxBlock) {
+            bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED);
+        }
+
+        if (block instanceof BarrelBlock) {
+            bukkitPlayer.incrementStatistic(Statistic.OPEN_BARREL);
+        }
+
+        // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
+        if (!silentchest || player.gameMode.getGameModeForPlayer() == GameType.SPECTATOR) {
+            player.openMenu(menuProvider);
+            return true;
+        }
+
+        // SilentChest requires access to setting players' game mode directly.
+        if (this.serverPlayerGameModeGameType == null) {
+            return false;
+        }
+
+        if (blockEntity instanceof RandomizableContainerBlockEntity lootable) {
+            if (lootable.lootTable != null) {
+                OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
+                return false;
+            }
+        }
+
+        GameType gameType = player.gameMode.getGameModeForPlayer();
+        this.forceGameType(player, GameType.SPECTATOR);
+        player.openMenu(menuProvider);
+        this.forceGameType(player, gameType);
+        return true;
+    }
+
+    @Override
+    public void deactivateContainer(@NotNull final Player bukkitPlayer) {
+        if (this.serverPlayerGameModeGameType == null) {
+            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.
+        // Regular game mode set calls GameModeChangeEvent and is cancellable.
+        GameType gameType = player.gameMode.getGameModeForPlayer();
+        this.forceGameType(player, GameType.SPECTATOR);
+
+        // Close container - note that this is very different from ServerPlayer#closeContainer!
+        // Triggering event must not be re-called or we'll enter an infinite loop.
+        player.doCloseContainer();
+
+        // Revert forced game mode.
+        this.forceGameType(player, gameType);
+    }
+
+    private void forceGameType(final ServerPlayer player, final GameType gameMode) {
+        if (this.serverPlayerGameModeGameType == null) {
+            // No need to warn repeatedly, error on startup and lack of function should be enough.
+            return;
+        }
+        try {
+            this.serverPlayerGameModeGameType.setAccessible(true);
+            this.serverPlayerGameModeGameType.set(player.gameMode, gameMode);
+        } catch (IllegalArgumentException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+}
@@ -0,0 +1,74 @@
+/*
+ * 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());
+        }
+    }
+
+}
@@ -0,0 +1,230 @@
+/*
+ * 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 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 net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.level.Level;
+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.entity.Player;
+import org.bukkit.inventory.InventoryView;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class PlayerDataManager implements IPlayerDataManager {
+
+    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.log(java.util.logging.Level.WARNING, e.getMessage(), e);
+            bukkitEntity = null;
+        }
+    }
+
+    public static @NotNull ServerPlayer getHandle(final Player player) {
+        if (player instanceof CraftPlayer) {
+            return ((CraftPlayer) player).getHandle();
+        }
+
+        Server server = player.getServer();
+        ServerPlayer nmsPlayer = null;
+
+        if (server instanceof CraftServer) {
+            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getUniqueId());
+        }
+
+        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");
+        }
+
+        return nmsPlayer;
+    }
+
+    @Override
+    public @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline) {
+        // Ensure player has data
+        if (!offline.hasPlayedBefore()) {
+            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);
+
+        if (worldServer == null) {
+            return null;
+        }
+
+        ServerPlayer entity = new ServerPlayer(server, worldServer, profile);
+
+        try {
+            injectPlayer(entity);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+        // Get the bukkit entity
+        Player target = entity.getBukkitEntity();
+        if (target != null) {
+            // Load data
+            target.loadData();
+        }
+        // Return the entity
+        return target;
+    }
+
+    void injectPlayer(ServerPlayer player) throws IllegalAccessException {
+        if (bukkitEntity == null) {
+            return;
+        }
+
+        bukkitEntity.setAccessible(true);
+
+        bukkitEntity.set(player, new OpenPlayer(player.server.server, player));
+    }
+
+    @NotNull
+    @Override
+    public Player inject(@NotNull Player player) {
+        try {
+            ServerPlayer nmsPlayer = getHandle(player);
+            injectPlayer(nmsPlayer);
+            return nmsPlayer.getBukkitEntity();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+            return player;
+        }
+    }
+
+    @Nullable
+    @Override
+    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
+
+        ServerPlayer nmsPlayer = getHandle(player);
+
+        if (nmsPlayer.connection == null) {
+            return null;
+        }
+
+        InventoryView view = getView(player, inventory);
+
+        if (view == null) {
+            return player.openInventory(inventory.getBukkitInventory());
+        }
+
+        AbstractContainerMenu container = new CraftContainer(view, nmsPlayer, nmsPlayer.nextContainerCounter()) {
+            @Override
+            public MenuType<?> getType() {
+                return getContainers(inventory.getBukkitInventory().getSize());
+            }
+        };
+
+        container.setTitle(new TextComponent(view.getTitle()));
+        container = CraftEventFactory.callInventoryOpenEvent(nmsPlayer, container);
+
+        if (container == null) {
+            return null;
+        }
+
+        nmsPlayer.connection.send(new ClientboundOpenScreenPacket(container.containerId, container.getType(),
+                new TextComponent(container.getBukkitView().getTitle())));
+        nmsPlayer.containerMenu = container;
+        nmsPlayer.initMenu(container);
+
+        return container.getBukkitView();
+
+    }
+
+    private @Nullable InventoryView getView(Player player, ISpecialInventory inventory) {
+        if (inventory instanceof SpecialEnderChest) {
+            return new OpenInventoryView(player, inventory, "container.enderchest", "'s Ender Chest");
+        } else if (inventory instanceof SpecialPlayerInventory) {
+            return new OpenInventoryView(player, inventory, "container.player", "'s Inventory");
+        } else {
+            return null;
+        }
+    }
+
+    static @NotNull MenuType<?> getContainers(int inventorySize) {
+
+        return switch (inventorySize) {
+            case 9 -> MenuType.GENERIC_9x1;
+            case 18 -> MenuType.GENERIC_9x2;
+            case 36 -> MenuType.GENERIC_9x4; // PLAYER
+            case 41, 45 -> MenuType.GENERIC_9x5;
+            case 54 -> MenuType.GENERIC_9x6;
+            default -> MenuType.GENERIC_9x3; // Default 27-slot inventory
+        };
+    }
+
+    @Override
+    public int convertToPlayerSlot(InventoryView view, int rawSlot) {
+        int topSize = view.getTopInventory().getSize();
+        if (topSize <= rawSlot) {
+            // Slot is not inside special inventory, use Bukkit logic.
+            return view.convertSlot(rawSlot);
+        }
+
+        // Main inventory, slots 0-26 -> 9-35
+        if (rawSlot < 27) {
+            return rawSlot + 9;
+        }
+        // Hotbar, slots 27-35 -> 0-8
+        if (rawSlot < 36) {
+            return rawSlot - 27;
+        }
+        // Armor, slots 36-39 -> 39-36
+        if (rawSlot < 40) {
+            return 36 + (39 - rawSlot);
+        }
+        // Off hand
+        if (rawSlot == 40) {
+            return 40;
+        }
+        // Drop slots, "out of inventory"
+        return -1;
+    }
+
+}
@@ -0,0 +1,344 @@
+/*
+ * 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 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;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.ContainerHelper;
+import net.minecraft.world.ContainerListener;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.player.StackedContents;
+import net.minecraft.world.inventory.PlayerEnderChestContainer;
+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.entity.HumanEntity;
+import org.bukkit.inventory.InventoryHolder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpecialEnderChest {
+
+    private final CraftInventory inventory;
+    private ServerPlayer owner;
+    private NonNullList<ItemStack> items;
+    private boolean playerOnline;
+
+    public SpecialEnderChest(final org.bukkit.entity.Player player, final Boolean online) {
+        super(PlayerDataManager.getHandle(player));
+        this.inventory = new CraftInventory(this);
+        this.owner = PlayerDataManager.getHandle(player);
+        this.playerOnline = online;
+        this.items = this.owner.getEnderChestInventory().items;
+    }
+
+    @Override
+    public @NotNull CraftInventory getBukkitInventory() {
+        return inventory;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        this.playerOnline = false;
+    }
+
+    @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;
+        }
+    }
+
+    @Override
+    public @NotNull org.bukkit.entity.Player getPlayer() {
+        return owner.getBukkitEntity();
+    }
+
+    @Override
+    public void setChanged() {
+        this.owner.getEnderChestInventory().setChanged();
+    }
+
+    @Override
+    public List<ItemStack> getContents() {
+        return this.items;
+    }
+
+    @Override
+    public void onOpen(CraftHumanEntity who) {
+        this.owner.getEnderChestInventory().onOpen(who);
+    }
+
+    @Override
+    public void onClose(CraftHumanEntity who) {
+        this.owner.getEnderChestInventory().onClose(who);
+    }
+
+    @Override
+    public List<HumanEntity> getViewers() {
+        return this.owner.getEnderChestInventory().getViewers();
+    }
+
+    @Override
+    public boolean stillValid(Player player) {
+        return true;
+    }
+
+    @Override
+    public void setActiveChest(EnderChestBlockEntity enderChest) {
+        this.owner.getEnderChestInventory().setActiveChest(enderChest);
+    }
+
+    @Override
+    public boolean isActiveChest(EnderChestBlockEntity enderChest) {
+        return this.owner.getEnderChestInventory().isActiveChest(enderChest);
+    }
+
+    @Override
+    public int getMaxStackSize() {
+        return this.owner.getEnderChestInventory().getMaxStackSize();
+    }
+
+    @Override
+    public void setMaxStackSize(int i) {
+        this.owner.getEnderChestInventory().setMaxStackSize(i);
+    }
+
+    @Override
+    public InventoryHolder getOwner() {
+        return this.owner.getEnderChestInventory().getOwner();
+    }
+
+    @Override
+    public @Nullable Location getLocation() {
+        return null;
+    }
+
+    @Override
+    public void addListener(ContainerListener listener) {
+        this.owner.getEnderChestInventory().addListener(listener);
+    }
+
+    @Override
+    public void removeListener(ContainerListener listener) {
+        this.owner.getEnderChestInventory().removeListener(listener);
+    }
+
+    @Override
+    public ItemStack getItem(int i) {
+        return i >= 0 && i < this.items.size() ? this.items.get(i) : ItemStack.EMPTY;
+    }
+
+    @Override
+    public ItemStack removeItem(int i, int j) {
+        ItemStack itemstack = ContainerHelper.removeItem(this.items, i, j);
+        if (!itemstack.isEmpty()) {
+            this.setChanged();
+        }
+
+        return itemstack;
+    }
+
+    @Override
+    public ItemStack addItem(ItemStack itemstack) {
+        ItemStack localItem = itemstack.copy();
+        this.moveItemToOccupiedSlotsWithSameType(localItem);
+        if (localItem.isEmpty()) {
+            return ItemStack.EMPTY;
+        } else {
+            this.moveItemToEmptySlots(localItem);
+            return localItem.isEmpty() ? ItemStack.EMPTY : localItem;
+        }
+    }
+
+    @Override
+    public boolean canAddItem(ItemStack itemstack) {
+        for (ItemStack itemstack1 : this.items) {
+            if (itemstack1.isEmpty() || ItemStack.isSameItemSameTags(itemstack1, itemstack) && itemstack1.getCount() < itemstack1.getMaxStackSize()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private void moveItemToEmptySlots(ItemStack itemstack) {
+        for(int i = 0; i < this.getContainerSize(); ++i) {
+            ItemStack localItem = this.getItem(i);
+            if (localItem.isEmpty()) {
+                this.setItem(i, itemstack.copy());
+                itemstack.setCount(0);
+                return;
+            }
+        }
+    }
+
+    private void moveItemToOccupiedSlotsWithSameType(ItemStack itemstack) {
+        for(int i = 0; i < this.getContainerSize(); ++i) {
+            ItemStack localItem = this.getItem(i);
+            if (ItemStack.isSameItemSameTags(localItem, itemstack)) {
+                this.moveItemsBetweenStacks(itemstack, localItem);
+                if (itemstack.isEmpty()) {
+                    return;
+                }
+            }
+        }
+    }
+
+    private void moveItemsBetweenStacks(ItemStack itemstack, ItemStack itemstack1) {
+        int i = Math.min(this.getMaxStackSize(), itemstack1.getMaxStackSize());
+        int j = Math.min(itemstack.getCount(), i - itemstack1.getCount());
+        if (j > 0) {
+            itemstack1.grow(j);
+            itemstack.shrink(j);
+            this.setChanged();
+        }
+    }
+
+    @Override
+    public ItemStack removeItemNoUpdate(int i) {
+        ItemStack itemstack = this.items.get(i);
+        if (itemstack.isEmpty()) {
+            return ItemStack.EMPTY;
+        } else {
+            this.items.set(i, ItemStack.EMPTY);
+            return itemstack;
+        }
+    }
+
+    @Override
+    public void setItem(int i, ItemStack itemstack) {
+        this.items.set(i, itemstack);
+        if (!itemstack.isEmpty() && itemstack.getCount() > this.getMaxStackSize()) {
+            itemstack.setCount(this.getMaxStackSize());
+        }
+
+        this.setChanged();
+    }
+
+    @Override
+    public int getContainerSize() {
+        return this.owner.getEnderChestInventory().getContainerSize();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return this.items.stream().allMatch(ItemStack::isEmpty);
+    }
+
+    @Override
+    public void startOpen(Player player) {
+    }
+
+    @Override
+    public void stopOpen(Player player) {
+    }
+
+    @Override
+    public boolean canPlaceItem(int i, ItemStack itemstack) {
+        return true;
+    }
+
+    @Override
+    public void clearContent() {
+        this.items.clear();
+        this.setChanged();
+    }
+
+    @Override
+    public void fillStackedContents(StackedContents stackedContents) {
+        for (ItemStack itemstack : this.items) {
+            stackedContents.accountStack(itemstack);
+        }
+
+    }
+
+    @Override
+    public List<ItemStack> removeAllItems() {
+        List<ItemStack> list = this.items.stream().filter(Predicate.not(ItemStack::isEmpty)).collect(Collectors.toList());
+        this.clearContent();
+        return list;
+    }
+
+    @Override
+    public ItemStack removeItemType(Item item, int i) {
+        ItemStack itemstack = new ItemStack(item, 0);
+
+        for(int j = this.getContainerSize() - 1; j >= 0; --j) {
+            ItemStack localItem = this.getItem(j);
+            if (localItem.getItem().equals(item)) {
+                int k = i - itemstack.getCount();
+                ItemStack splitItem = localItem.split(k);
+                itemstack.grow(splitItem.getCount());
+                if (itemstack.getCount() == i) {
+                    break;
+                }
+            }
+        }
+
+        if (!itemstack.isEmpty()) {
+            this.setChanged();
+        }
+
+        return itemstack;
+    }
+
+    @Override
+    public String toString() {
+        return this.items.stream().filter((itemStack) -> !itemStack.isEmpty()).collect(Collectors.toList()).toString();
+    }
+
+    @Override
+    public void fromTag(ListTag listTag) {
+        for (int i = 0; i < this.getContainerSize(); ++i) {
+            this.setItem(i, ItemStack.EMPTY);
+        }
+
+        for (int i = 0; i < listTag.size(); ++i) {
+            CompoundTag compoundTag = listTag.getCompound(i);
+            int j = compoundTag.getByte("Slot") & 255;
+            if (j < this.getContainerSize()) {
+                this.setItem(j, ItemStack.of(compoundTag));
+            }
+        }
+
+    }
+
+}
@@ -0,0 +1,769 @@
+/*
+ * 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 com.google.common.collect.ImmutableList;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import java.util.Collection;
+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 {
+
+    private final CraftInventory inventory;
+    private boolean playerOnline;
+    private Player player;
+    private NonNullList<ItemStack> items;
+    private NonNullList<ItemStack> armor;
+    private NonNullList<ItemStack> offhand;
+    private List<NonNullList<ItemStack>> compartments;
+
+    public SpecialPlayerInventory(@NotNull org.bukkit.entity.Player bukkitPlayer, @NotNull Boolean online) {
+        super(PlayerDataManager.getHandle(bukkitPlayer));
+        this.inventory = new CraftInventory(this);
+        this.playerOnline = online;
+        this.player = super.player;
+        this.selected = player.getInventory().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);
+    }
+
+    @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;
+        }
+    }
+
+    @Override
+    public @NotNull CraftInventory getBukkitInventory() {
+        return this.inventory;
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        this.playerOnline = false;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public @NotNull HumanEntity getPlayer() {
+        return this.player.getBukkitEntity();
+    }
+
+    private @NotNull ItemStack getRawItem(int i) {
+        return super.getItem(i);
+    }
+
+    private void setRawItem(int i, @NotNull ItemStack itemStack) {
+        super.setItem(i, itemStack);
+    }
+
+    private static record IndexedCompartment(@Nullable NonNullList<ItemStack> compartment, int index) {}
+
+    private @NotNull SpecialPlayerInventory.IndexedCompartment getIndexedContent(int index) {
+        if (index < items.size()) {
+            return new IndexedCompartment(items, getReversedItemSlotNum(index));
+        }
+
+        index -= items.size();
+
+        if (index < armor.size()) {
+            return new IndexedCompartment(armor, getReversedArmorSlotNum(index));
+        }
+
+        index -= armor.size();
+
+        if (index < offhand.size()) {
+            return new IndexedCompartment(offhand, index);
+        }
+
+        index -= offhand.size();
+
+        return new IndexedCompartment(null, index);
+    }
+
+    private int getReversedArmorSlotNum(final int i) {
+        if (i == 0) {
+            return 3;
+        }
+        if (i == 1) {
+            return 2;
+        }
+        if (i == 2) {
+            return 1;
+        }
+        if (i == 3) {
+            return 0;
+        }
+        return i;
+    }
+
+    private int getReversedItemSlotNum(final int i) {
+        if (i >= 27) {
+            return i - 27;
+        }
+        return i + 9;
+    }
+
+    private boolean contains(Predicate<ItemStack> predicate) {
+        return this.compartments.stream().flatMap(NonNullList::stream).anyMatch(predicate);
+    }
+
+    @Override
+    public List<ItemStack> getArmorContents() {
+        return this.armor;
+    }
+
+    @Override
+    public void onOpen(CraftHumanEntity who) {
+        this.player.getInventory().onOpen(who);
+    }
+
+    @Override
+    public void onClose(CraftHumanEntity who) {
+        this.player.getInventory().onClose(who);
+    }
+
+    @Override
+    public List<HumanEntity> getViewers() {
+        return this.player.getInventory().getViewers();
+    }
+
+    @Override
+    public InventoryHolder getOwner() {
+        return this.player.getBukkitEntity();
+    }
+
+    @Override
+    public int getMaxStackSize() {
+        return this.player.getInventory().getMaxStackSize();
+    }
+
+    @Override
+    public void setMaxStackSize(int size) {
+        this.player.getInventory().setMaxStackSize(size);
+    }
+
+    @Override
+    public Location getLocation() {
+        return this.player.getBukkitEntity().getLocation();
+    }
+
+    @Override
+    public boolean hasCustomName() {
+        return false;
+    }
+
+    @Override
+    public List<ItemStack> getContents() {
+        return this.compartments.stream().flatMap(Collection::stream).collect(Collectors.toList());
+    }
+
+    @Override
+    public ItemStack getSelected() {
+        return isHotbarSlot(this.selected) ? this.items.get(this.selected) : ItemStack.EMPTY;
+    }
+
+    private boolean hasRemainingSpaceForItem(ItemStack itemstack, ItemStack itemstack1) {
+        return !itemstack.isEmpty() && ItemStack.isSameItemSameTags(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize();
+    }
+
+    @Override
+    public int canHold(ItemStack itemstack) {
+        int remains = itemstack.getCount();
+
+        for (int i = 0; i < this.items.size(); ++i) {
+            ItemStack itemstack1 = this.getRawItem(i);
+            if (itemstack1.isEmpty()) {
+                return itemstack.getCount();
+            }
+
+            if (this.hasRemainingSpaceForItem(itemstack1, itemstack)) {
+                remains -= (itemstack1.getMaxStackSize() < this.getMaxStackSize() ? itemstack1.getMaxStackSize() : this.getMaxStackSize()) - itemstack1.getCount();
+            }
+
+            if (remains <= 0) {
+                return itemstack.getCount();
+            }
+        }
+
+        ItemStack offhandItemStack = this.getRawItem(this.items.size() + this.armor.size());
+        if (this.hasRemainingSpaceForItem(offhandItemStack, itemstack)) {
+            remains -= (offhandItemStack.getMaxStackSize() < this.getMaxStackSize() ? offhandItemStack.getMaxStackSize() : this.getMaxStackSize()) - offhandItemStack.getCount();
+        }
+
+        return remains <= 0 ? itemstack.getCount() : itemstack.getCount() - remains;
+    }
+
+    @Override
+    public int getFreeSlot() {
+        for(int i = 0; i < this.items.size(); ++i) {
+            if (this.items.get(i).isEmpty()) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    @Override
+    public void setPickedItem(ItemStack itemstack) {
+        int i = this.findSlotMatchingItem(itemstack);
+        if (isHotbarSlot(i)) {
+            this.selected = i;
+        } else if (i == -1) {
+            this.selected = this.getSuitableHotbarSlot();
+            if (!this.items.get(this.selected).isEmpty()) {
+                int j = this.getFreeSlot();
+                if (j != -1) {
+                    this.items.set(j, this.items.get(this.selected));
+                }
+            }
+
+            this.items.set(this.selected, itemstack);
+        } else {
+            this.pickSlot(i);
+        }
+
+    }
+
+    @Override
+    public void pickSlot(int i) {
+        this.selected = this.getSuitableHotbarSlot();
+        ItemStack itemstack = this.items.get(this.selected);
+        this.items.set(this.selected, this.items.get(i));
+        this.items.set(i, itemstack);
+    }
+
+    @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))) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    @Override
+    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()) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    @Override
+    public int getSuitableHotbarSlot() {
+        int i;
+        int j;
+        for(j = 0; j < 9; ++j) {
+            i = (this.selected + j) % 9;
+            if (this.items.get(i).isEmpty()) {
+                return i;
+            }
+        }
+
+        for(j = 0; j < 9; ++j) {
+            i = (this.selected + j) % 9;
+            if (!this.items.get(i).isEnchanted()) {
+                return i;
+            }
+        }
+
+        return this.selected;
+    }
+
+    @Override
+    public void swapPaint(double d0) {
+        if (d0 > 0.0D) {
+            d0 = 1.0D;
+        }
+
+        if (d0 < 0.0D) {
+            d0 = -1.0D;
+        }
+
+        this.selected = (int) (this.selected - d0);
+
+        while (this.selected < 0) {
+            this.selected += 9;
+        }
+
+        while(this.selected >= 9) {
+            this.selected -= 9;
+        }
+    }
+
+    @Override
+    public int clearOrCountMatchingItems(Predicate<ItemStack> predicate, int i, Container container) {
+        byte b0 = 0;
+        boolean flag = i == 0;
+        int j = b0 + ContainerHelper.clearOrCountMatchingItems(this, predicate, i - b0, flag);
+        j += ContainerHelper.clearOrCountMatchingItems(container, predicate, i - j, flag);
+        ItemStack itemstack = this.player.containerMenu.getCarried();
+        j += ContainerHelper.clearOrCountMatchingItems(itemstack, predicate, i - j, flag);
+        if (itemstack.isEmpty()) {
+            this.player.containerMenu.setCarried(ItemStack.EMPTY);
+        }
+
+        return j;
+    }
+
+    private int addResource(ItemStack itemstack) {
+        int i = this.getSlotWithRemainingSpace(itemstack);
+        if (i == -1) {
+            i = this.getFreeSlot();
+        }
+
+        return i == -1 ? itemstack.getCount() : this.addResource(i, itemstack);
+    }
+
+    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());
+            }
+
+            this.setRawItem(i, localItemStack);
+        }
+
+        int k = Math.min(j, localItemStack.getMaxStackSize() - localItemStack.getCount());
+
+        if (k > this.getMaxStackSize() - localItemStack.getCount()) {
+            k = this.getMaxStackSize() - localItemStack.getCount();
+        }
+
+        if (k != 0) {
+            j -= k;
+            localItemStack.grow(k);
+            localItemStack.setPopTime(5);
+        }
+
+        return j;
+    }
+
+    @Override
+    public int getSlotWithRemainingSpace(ItemStack itemstack) {
+        if (this.hasRemainingSpaceForItem(this.getRawItem(this.selected), itemstack)) {
+            return this.selected;
+        } else if (this.hasRemainingSpaceForItem(this.getRawItem(40), itemstack)) {
+            return 40;
+        } else {
+            for(int i = 0; i < this.items.size(); ++i) {
+                if (this.hasRemainingSpaceForItem(this.items.get(i), itemstack)) {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+    }
+
+    @Override
+    public void tick() {
+        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);
+                }
+            }
+        }
+
+    }
+
+    @Override
+    public boolean add(ItemStack itemStack) {
+        return this.add(-1, itemStack);
+    }
+
+    @Override
+    public boolean add(int i, ItemStack itemStack) {
+        if (itemStack.isEmpty()) {
+            return false;
+        } else {
+            try {
+                if (itemStack.isDamaged()) {
+                    if (i == -1) {
+                        i = this.getFreeSlot();
+                    }
+
+                    if (i >= 0) {
+                        this.items.set(i, itemStack.copy());
+                        this.items.get(i).setPopTime(5);
+                        itemStack.setCount(0);
+                        return true;
+                    } else if (this.player.getAbilities().instabuild) {
+                        itemStack.setCount(0);
+                        return true;
+                    } else {
+                        return false;
+                    }
+                } else {
+                    int j;
+                    do {
+                        j = itemStack.getCount();
+                        if (i == -1) {
+                            itemStack.setCount(this.addResource(itemStack));
+                        } else {
+                            itemStack.setCount(this.addResource(i, itemStack));
+                        }
+                    } while(!itemStack.isEmpty() && itemStack.getCount() < j);
+
+                    if (itemStack.getCount() == j && this.player.getAbilities().instabuild) {
+                        itemStack.setCount(0);
+                        return true;
+                    } else {
+                        return itemStack.getCount() < j;
+                    }
+                }
+            } catch (Throwable var6) {
+                CrashReport crashReport = CrashReport.forThrowable(var6, "Adding item to inventory");
+                CrashReportCategory crashReportCategory = crashReport.addCategory("Item being added");
+                crashReportCategory.setDetail("Item ID", Item.getId(itemStack.getItem()));
+                crashReportCategory.setDetail("Item data", itemStack.getDamageValue());
+                crashReportCategory.setDetail("Item name", () -> itemStack.getHoverName().getString());
+                throw new ReportedException(crashReport);
+            }
+        }
+    }
+
+    @Override
+    public void placeItemBackInInventory(ItemStack itemStack) {
+        this.placeItemBackInInventory(itemStack, true);
+    }
+
+    @Override
+    public void placeItemBackInInventory(ItemStack itemStack, boolean flag) {
+        while(true) {
+            if (!itemStack.isEmpty()) {
+                int i = this.getSlotWithRemainingSpace(itemStack);
+                if (i == -1) {
+                    i = this.getFreeSlot();
+                }
+
+                if (i != -1) {
+                    int j = itemStack.getMaxStackSize() - this.getRawItem(i).getCount();
+                    if (this.add(i, itemStack.split(j)) && flag && this.player instanceof ServerPlayer) {
+                        ((ServerPlayer)this.player).connection.send(new ClientboundContainerSetSlotPacket(-2, 0, i, this.getRawItem(i)));
+                    }
+                    continue;
+                }
+
+                this.player.drop(itemStack, false);
+            }
+
+            return;
+        }
+    }
+
+    @Override
+    public ItemStack removeItem(int rawIndex, final int j) {
+        IndexedCompartment indexedCompartment = getIndexedContent(rawIndex);
+
+        if (indexedCompartment.compartment() == null
+                || indexedCompartment.compartment().get(indexedCompartment.index()).isEmpty()) {
+            return ItemStack.EMPTY;
+        }
+
+        return ContainerHelper.removeItem(indexedCompartment.compartment(), indexedCompartment.index(), j);
+    }
+
+    @Override
+    public void removeItem(ItemStack itemStack) {
+        for (NonNullList<ItemStack> compartment : this.compartments) {
+            for (int i = 0; i < compartment.size(); ++i) {
+                if (compartment.get(i) == itemStack) {
+                    compartment.set(i, ItemStack.EMPTY);
+                    break;
+                }
+            }
+        }
+    }
+
+    @Override
+    public ItemStack removeItemNoUpdate(int rawIndex) {
+        IndexedCompartment indexedCompartment = getIndexedContent(rawIndex);
+
+        if (indexedCompartment.compartment() == null) {
+            return ItemStack.EMPTY;
+        }
+
+        ItemStack removed = indexedCompartment.compartment().set(indexedCompartment.index(), ItemStack.EMPTY);
+
+        if (removed.isEmpty()) {
+            return ItemStack.EMPTY;
+        }
+
+        return removed;
+    }
+
+    @Override
+    public void setItem(int rawIndex, final ItemStack itemStack) {
+        IndexedCompartment indexedCompartment = getIndexedContent(rawIndex);
+
+        if (indexedCompartment.compartment() == null) {
+            this.player.drop(itemStack, true);
+            return;
+        }
+
+        indexedCompartment.compartment().set(indexedCompartment.index(), itemStack);
+    }
+
+    @Override
+    public float getDestroySpeed(BlockState blockState) {
+        return this.items.get(this.selected).getDestroySpeed(blockState);
+    }
+
+    @Override
+    public ListTag save(ListTag listTag) {
+        for (int i = 0; i < this.items.size(); ++i) {
+            if (!this.items.get(i).isEmpty()) {
+                CompoundTag compoundTag = new CompoundTag();
+                compoundTag.putByte("Slot", (byte)i);
+                this.items.get(i).save(compoundTag);
+                listTag.add(compoundTag);
+            }
+        }
+
+        for (int i = 0; i < this.armor.size(); ++i) {
+            if (!this.armor.get(i).isEmpty()) {
+                CompoundTag compoundTag = new CompoundTag();
+                compoundTag.putByte("Slot", (byte)(i + 100));
+                this.armor.get(i).save(compoundTag);
+                listTag.add(compoundTag);
+            }
+        }
+
+        for (int i = 0; i < this.offhand.size(); ++i) {
+            if (!this.offhand.get(i).isEmpty()) {
+                CompoundTag compoundTag = new CompoundTag();
+                compoundTag.putByte("Slot", (byte)(i + 150));
+                this.offhand.get(i).save(compoundTag);
+                listTag.add(compoundTag);
+            }
+        }
+
+        return listTag;
+    }
+
+    @Override
+    public void load(ListTag listTag) {
+        this.items.clear();
+        this.armor.clear();
+        this.offhand.clear();
+
+        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);
+                }
+            }
+        }
+
+    }
+
+    @Override
+    public int getContainerSize() {
+        return 45;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return !contains(itemStack -> !itemStack.isEmpty());
+    }
+
+    @Override
+    public ItemStack getItem(int rawIndex) {
+        IndexedCompartment indexedCompartment = getIndexedContent(rawIndex);
+
+        if (indexedCompartment.compartment() == null) {
+            return ItemStack.EMPTY;
+        }
+
+        return indexedCompartment.compartment().get(indexedCompartment.index());
+    }
+
+    @Override
+    public Component getName() {
+        return this.player.getName();
+    }
+
+    @Override
+    public ItemStack getArmor(int index) {
+        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) {
+            for (int i = 0; i < compartment.size(); ++i) {
+                ItemStack itemstack = compartment.get(i);
+                if (!itemstack.isEmpty()) {
+                    this.player.drop(itemstack, true, false);
+                    compartment.set(i, ItemStack.EMPTY);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void setChanged() {
+        super.setChanged();
+    }
+
+    @Override
+    public int getTimesChanged() {
+        return super.getTimesChanged();
+    }
+
+    @Override
+    public boolean stillValid(Player player) {
+        return true;
+    }
+
+    @Override
+    public boolean contains(ItemStack itemstack) {
+        return contains(itemStack -> itemStack.isEmpty() && itemStack.sameItem(itemstack));
+    }
+
+    @Override
+    public boolean contains(Tag<Item> tag) {
+        return contains(itemStack -> !itemStack.isEmpty() && itemStack.is(tag));
+    }
+
+    @Override
+    public void replaceWith(Inventory inventory) {
+        Function<Integer, ItemStack> getter;
+
+        if (inventory instanceof SpecialPlayerInventory specialPlayerInventory) {
+            getter = specialPlayerInventory::getRawItem;
+        } else {
+            getter = inventory::getItem;
+        }
+
+        for(int i = 0; i < this.getContainerSize(); ++i) {
+            this.setRawItem(i, getter.apply(i));
+        }
+
+        this.selected = inventory.selected;
+    }
+
+    @Override
+    public void clearContent() {
+        for (NonNullList<ItemStack> compartment : this.compartments) {
+            compartment.clear();
+        }
+    }
+
+    @Override
+    public void fillStackedContents(StackedContents stackedContents) {
+        for (ItemStack itemstack : this.items) {
+            stackedContents.accountSimpleStack(itemstack);
+        }
+    }
+
+    @Override
+    public ItemStack removeFromSelected(boolean dropWholeStack) {
+        ItemStack itemstack = this.getSelected();
+        return itemstack.isEmpty() ? ItemStack.EMPTY : this.removeItem(this.selected, dropWholeStack ? itemstack.getCount() : 1);
+    }
+
+}
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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/>.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>openinvparent</artifactId>
+    <groupId>com.lishid</groupId>
+    <relativePath>../../pom.xml</relativePath>
+    <version>4.1.9-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvadapter1_18_R1</artifactId>
+  <name>OpenInvAdapter1_18_R1</name>
+
+  <properties>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
+    <spigot.version>1.18-pre5-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>
+      <scope>provided</scope>
+      <version>${spigot.version}</version>
+      <classifier>remapped-mojang</classifier>
+    </dependency>
+    <dependency>
+      <artifactId>openinvapi</artifactId>
+      <groupId>com.lishid</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>openinvplugincore</artifactId>
+      <groupId>com.lishid</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>annotations</artifactId>
+      <groupId>org.jetbrains</groupId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <configuration>
+          <minimizeJar>true</minimizeJar>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>net.md-5</groupId>
+        <artifactId>specialsource-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>remap</goal>
+            </goals>
+            <id>remap-obf</id>
+            <configuration>
+              <srgIn>org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang</srgIn>
+              <reverse>true</reverse>
+              <remappedDependencies>org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang</remappedDependencies>
+              <remappedArtifactAttached>true</remappedArtifactAttached>
+              <remappedClassifierName>remapped-obf</remappedClassifierName>
+            </configuration>
+          </execution>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>remap</goal>
+            </goals>
+            <id>remap-spigot</id>
+            <configuration>
+              <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
+              <srgIn>org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot</srgIn>
+              <remappedDependencies>org.spigotmc:spigot:${spigot.version}:jar:remapped-obf</remappedDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
@@ -0,0 +1,277 @@
+/*
+ * 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 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.TextComponent;
+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;
+import net.minecraft.world.inventory.ChestMenu;
+import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.inventory.PlayerEnderChestContainer;
+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.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;
+
+public class AnySilentContainer implements IAnySilentContainer {
+
+    private @Nullable Field serverPlayerGameModeGameType;
+
+    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) {
+                Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger();
+                logger.warning("ServerPlayerGameMode#gameModeForPlayer's obfuscated name has changed!");
+                logger.warning("Please report this at https://github.com/Jikoo/OpenInv/issues");
+                logger.warning("Attempting to fall through using reflection. Please verify that SilentContainer does not fail.");
+                // N.B. gameModeForPlayer is (for now) declared before previousGameModeForPlayer so silent shouldn't break.
+                this.serverPlayerGameModeGameType = ReflectionHelper.grabFieldByType(ServerPlayerGameMode.class, GameType.class);
+            }
+        } 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);
+        }
+    }
+
+    @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,
+            final boolean silentchest,
+            @NotNull final org.bukkit.block.Block bukkitBlock) {
+
+        // Silent ender chest is API-only
+        if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) {
+            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
+            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
+            return true;
+        }
+
+        ServerPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
+
+        final ServerLevel level = player.getLevel();
+        final BlockPos blockPos = new BlockPos(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
+        final BlockEntity blockEntity = level.getBlockEntity(blockPos);
+
+        if (blockEntity == null) {
+            return false;
+        }
+
+        if (blockEntity instanceof EnderChestBlockEntity enderChestTile) {
+            // Anychest ender chest. See net.minecraft.world.level.block.BlockEnderChest
+            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 TextComponent("container.enderchest")));
+            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
+            return true;
+        }
+
+        if (!(blockEntity instanceof MenuProvider menuProvider)) {
+            return false;
+        }
+
+        BlockState blockState = level.getBlockState(blockPos);
+        Block block = blockState.getBlock();
+
+        if (block instanceof ChestBlock chestBlock) {
+
+            // boolean flag: check if chest is blocked
+            Optional<MenuProvider> menuOptional = chestBlock.combine(blockState, level, blockPos, false).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));
+                        }
+
+                        @Override
+                        public Optional<MenuProvider> acceptSingle(ChestBlockEntity localChest) {
+                            return Optional.of(localChest);
+                        }
+
+                        @Override
+                        public Optional<MenuProvider> acceptNone() {
+                            return Optional.empty();
+                        }
+                    });
+
+            if (menuOptional.isEmpty()) {
+                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 {
+                bukkitPlayer.incrementStatistic(Statistic.CHEST_OPENED);
+            }
+        }
+
+        if (block instanceof ShulkerBoxBlock) {
+            bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED);
+        }
+
+        if (block instanceof BarrelBlock) {
+            bukkitPlayer.incrementStatistic(Statistic.OPEN_BARREL);
+        }
+
+        // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
+        if (!silentchest || player.gameMode.getGameModeForPlayer() == GameType.SPECTATOR) {
+            player.openMenu(menuProvider);
+            return true;
+        }
+
+        // SilentChest requires access to setting players' game mode directly.
+        if (this.serverPlayerGameModeGameType == null) {
+            return false;
+        }
+
+        if (blockEntity instanceof RandomizableContainerBlockEntity lootable) {
+            if (lootable.lootTable != null) {
+                OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
+                return false;
+            }
+        }
+
+        GameType gameType = player.gameMode.getGameModeForPlayer();
+        this.forceGameType(player, GameType.SPECTATOR);
+        player.openMenu(menuProvider);
+        this.forceGameType(player, gameType);
+        return true;
+    }
+
+    @Override
+    public void deactivateContainer(@NotNull final Player bukkitPlayer) {
+        if (this.serverPlayerGameModeGameType == null) {
+            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.
+        // Regular game mode set calls GameModeChangeEvent and is cancellable.
+        GameType gameType = player.gameMode.getGameModeForPlayer();
+        this.forceGameType(player, GameType.SPECTATOR);
+
+        // Close container - note that this is very different from ServerPlayer#closeContainer!
+        // Triggering event must not be re-called or we'll enter an infinite loop.
+        player.doCloseContainer();
+
+        // Revert forced game mode.
+        this.forceGameType(player, gameType);
+    }
+
+    private void forceGameType(final ServerPlayer player, final GameType gameMode) {
+        if (this.serverPlayerGameModeGameType == null) {
+            // No need to warn repeatedly, error on startup and lack of function should be enough.
+            return;
+        }
+        try {
+            this.serverPlayerGameModeGameType.setAccessible(true);
+            this.serverPlayerGameModeGameType.set(player.gameMode, gameMode);
+        } catch (IllegalArgumentException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+}
@@ -0,0 +1,74 @@
+/*
+ * 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());
+        }
+    }
+
+}
@@ -0,0 +1,230 @@
+/*
+ * 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 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 net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.level.Level;
+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.entity.Player;
+import org.bukkit.inventory.InventoryView;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class PlayerDataManager implements IPlayerDataManager {
+
+    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.log(java.util.logging.Level.WARNING, e.getMessage(), e);
+            bukkitEntity = null;
+        }
+    }
+
+    public static @NotNull ServerPlayer getHandle(final Player player) {
+        if (player instanceof CraftPlayer) {
+            return ((CraftPlayer) player).getHandle();
+        }
+
+        Server server = player.getServer();
+        ServerPlayer nmsPlayer = null;
+
+        if (server instanceof CraftServer) {
+            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getUniqueId());
+        }
+
+        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");
+        }
+
+        return nmsPlayer;
+    }
+
+    @Override
+    public @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline) {
+        // Ensure player has data
+        if (!offline.hasPlayedBefore()) {
+            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);
+
+        if (worldServer == null) {
+            return null;
+        }
+
+        ServerPlayer entity = new ServerPlayer(server, worldServer, profile);
+
+        try {
+            injectPlayer(entity);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+        // Get the bukkit entity
+        Player target = entity.getBukkitEntity();
+        if (target != null) {
+            // Load data
+            target.loadData();
+        }
+        // Return the entity
+        return target;
+    }
+
+    void injectPlayer(ServerPlayer player) throws IllegalAccessException {
+        if (bukkitEntity == null) {
+            return;
+        }
+
+        bukkitEntity.setAccessible(true);
+
+        bukkitEntity.set(player, new OpenPlayer(player.server.server, player));
+    }
+
+    @NotNull
+    @Override
+    public Player inject(@NotNull Player player) {
+        try {
+            ServerPlayer nmsPlayer = getHandle(player);
+            injectPlayer(nmsPlayer);
+            return nmsPlayer.getBukkitEntity();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+            return player;
+        }
+    }
+
+    @Nullable
+    @Override
+    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
+
+        ServerPlayer nmsPlayer = getHandle(player);
+
+        if (nmsPlayer.connection == null) {
+            return null;
+        }
+
+        InventoryView view = getView(player, inventory);
+
+        if (view == null) {
+            return player.openInventory(inventory.getBukkitInventory());
+        }
+
+        AbstractContainerMenu container = new CraftContainer(view, nmsPlayer, nmsPlayer.nextContainerCounter()) {
+            @Override
+            public MenuType<?> getType() {
+                return getContainers(inventory.getBukkitInventory().getSize());
+            }
+        };
+
+        container.setTitle(new TextComponent(view.getTitle()));
+        container = CraftEventFactory.callInventoryOpenEvent(nmsPlayer, container);
+
+        if (container == null) {
+            return null;
+        }
+
+        nmsPlayer.connection.send(new ClientboundOpenScreenPacket(container.containerId, container.getType(),
+                new TextComponent(container.getBukkitView().getTitle())));
+        nmsPlayer.containerMenu = container;
+        nmsPlayer.initMenu(container);
+
+        return container.getBukkitView();
+
+    }
+
+    private @Nullable InventoryView getView(Player player, ISpecialInventory inventory) {
+        if (inventory instanceof SpecialEnderChest) {
+            return new OpenInventoryView(player, inventory, "container.enderchest", "'s Ender Chest");
+        } else if (inventory instanceof SpecialPlayerInventory) {
+            return new OpenInventoryView(player, inventory, "container.player", "'s Inventory");
+        } else {
+            return null;
+        }
+    }
+
+    static @NotNull MenuType<?> getContainers(int inventorySize) {
+
+        return switch (inventorySize) {
+            case 9 -> MenuType.GENERIC_9x1;
+            case 18 -> MenuType.GENERIC_9x2;
+            case 36 -> MenuType.GENERIC_9x4; // PLAYER
+            case 41, 45 -> MenuType.GENERIC_9x5;
+            case 54 -> MenuType.GENERIC_9x6;
+            default -> MenuType.GENERIC_9x3; // Default 27-slot inventory
+        };
+    }
+
+    @Override
+    public int convertToPlayerSlot(InventoryView view, int rawSlot) {
+        int topSize = view.getTopInventory().getSize();
+        if (topSize <= rawSlot) {
+            // Slot is not inside special inventory, use Bukkit logic.
+            return view.convertSlot(rawSlot);
+        }
+
+        // Main inventory, slots 0-26 -> 9-35
+        if (rawSlot < 27) {
+            return rawSlot + 9;
+        }
+        // Hotbar, slots 27-35 -> 0-8
+        if (rawSlot < 36) {
+            return rawSlot - 27;
+        }
+        // Armor, slots 36-39 -> 39-36
+        if (rawSlot < 40) {
+            return 36 + (39 - rawSlot);
+        }
+        // Off hand
+        if (rawSlot == 40) {
+            return 40;
+        }
+        // Drop slots, "out of inventory"
+        return -1;
+    }
+
+}
@@ -0,0 +1,344 @@
+/*
+ * 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 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;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.ContainerHelper;
+import net.minecraft.world.ContainerListener;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.player.StackedContents;
+import net.minecraft.world.inventory.PlayerEnderChestContainer;
+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.entity.HumanEntity;
+import org.bukkit.inventory.InventoryHolder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpecialEnderChest {
+
+    private final CraftInventory inventory;
+    private ServerPlayer owner;
+    private NonNullList<ItemStack> items;
+    private boolean playerOnline;
+
+    public SpecialEnderChest(final org.bukkit.entity.Player player, final Boolean online) {
+        super(PlayerDataManager.getHandle(player));
+        this.inventory = new CraftInventory(this);
+        this.owner = PlayerDataManager.getHandle(player);
+        this.playerOnline = online;
+        this.items = this.owner.getEnderChestInventory().items;
+    }
+
+    @Override
+    public @NotNull CraftInventory getBukkitInventory() {
+        return inventory;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        this.playerOnline = false;
+    }
+
+    @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;
+        }
+    }
+
+    @Override
+    public @NotNull org.bukkit.entity.Player getPlayer() {
+        return owner.getBukkitEntity();
+    }
+
+    @Override
+    public void setChanged() {
+        this.owner.getEnderChestInventory().setChanged();
+    }
+
+    @Override
+    public List<ItemStack> getContents() {
+        return this.items;
+    }
+
+    @Override
+    public void onOpen(CraftHumanEntity who) {
+        this.owner.getEnderChestInventory().onOpen(who);
+    }
+
+    @Override
+    public void onClose(CraftHumanEntity who) {
+        this.owner.getEnderChestInventory().onClose(who);
+    }
+
+    @Override
+    public List<HumanEntity> getViewers() {
+        return this.owner.getEnderChestInventory().getViewers();
+    }
+
+    @Override
+    public boolean stillValid(Player player) {
+        return true;
+    }
+
+    @Override
+    public void setActiveChest(EnderChestBlockEntity enderChest) {
+        this.owner.getEnderChestInventory().setActiveChest(enderChest);
+    }
+
+    @Override
+    public boolean isActiveChest(EnderChestBlockEntity enderChest) {
+        return this.owner.getEnderChestInventory().isActiveChest(enderChest);
+    }
+
+    @Override
+    public int getMaxStackSize() {
+        return this.owner.getEnderChestInventory().getMaxStackSize();
+    }
+
+    @Override
+    public void setMaxStackSize(int i) {
+        this.owner.getEnderChestInventory().setMaxStackSize(i);
+    }
+
+    @Override
+    public InventoryHolder getOwner() {
+        return this.owner.getEnderChestInventory().getOwner();
+    }
+
+    @Override
+    public @Nullable Location getLocation() {
+        return null;
+    }
+
+    @Override
+    public void addListener(ContainerListener listener) {
+        this.owner.getEnderChestInventory().addListener(listener);
+    }
+
+    @Override
+    public void removeListener(ContainerListener listener) {
+        this.owner.getEnderChestInventory().removeListener(listener);
+    }
+
+    @Override
+    public ItemStack getItem(int i) {
+        return i >= 0 && i < this.items.size() ? this.items.get(i) : ItemStack.EMPTY;
+    }
+
+    @Override
+    public ItemStack removeItem(int i, int j) {
+        ItemStack itemstack = ContainerHelper.removeItem(this.items, i, j);
+        if (!itemstack.isEmpty()) {
+            this.setChanged();
+        }
+
+        return itemstack;
+    }
+
+    @Override
+    public ItemStack addItem(ItemStack itemstack) {
+        ItemStack localItem = itemstack.copy();
+        this.moveItemToOccupiedSlotsWithSameType(localItem);
+        if (localItem.isEmpty()) {
+            return ItemStack.EMPTY;
+        } else {
+            this.moveItemToEmptySlots(localItem);
+            return localItem.isEmpty() ? ItemStack.EMPTY : localItem;
+        }
+    }
+
+    @Override
+    public boolean canAddItem(ItemStack itemstack) {
+        for (ItemStack itemstack1 : this.items) {
+            if (itemstack1.isEmpty() || ItemStack.isSameItemSameTags(itemstack1, itemstack) && itemstack1.getCount() < itemstack1.getMaxStackSize()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private void moveItemToEmptySlots(ItemStack itemstack) {
+        for(int i = 0; i < this.getContainerSize(); ++i) {
+            ItemStack localItem = this.getItem(i);
+            if (localItem.isEmpty()) {
+                this.setItem(i, itemstack.copy());
+                itemstack.setCount(0);
+                return;
+            }
+        }
+    }
+
+    private void moveItemToOccupiedSlotsWithSameType(ItemStack itemstack) {
+        for(int i = 0; i < this.getContainerSize(); ++i) {
+            ItemStack localItem = this.getItem(i);
+            if (ItemStack.isSameItemSameTags(localItem, itemstack)) {
+                this.moveItemsBetweenStacks(itemstack, localItem);
+                if (itemstack.isEmpty()) {
+                    return;
+                }
+            }
+        }
+    }
+
+    private void moveItemsBetweenStacks(ItemStack itemstack, ItemStack itemstack1) {
+        int i = Math.min(this.getMaxStackSize(), itemstack1.getMaxStackSize());
+        int j = Math.min(itemstack.getCount(), i - itemstack1.getCount());
+        if (j > 0) {
+            itemstack1.grow(j);
+            itemstack.shrink(j);
+            this.setChanged();
+        }
+    }
+
+    @Override
+    public ItemStack removeItemNoUpdate(int i) {
+        ItemStack itemstack = this.items.get(i);
+        if (itemstack.isEmpty()) {
+            return ItemStack.EMPTY;
+        } else {
+            this.items.set(i, ItemStack.EMPTY);
+            return itemstack;
+        }
+    }
+
+    @Override
+    public void setItem(int i, ItemStack itemstack) {
+        this.items.set(i, itemstack);
+        if (!itemstack.isEmpty() && itemstack.getCount() > this.getMaxStackSize()) {
+            itemstack.setCount(this.getMaxStackSize());
+        }
+
+        this.setChanged();
+    }
+
+    @Override
+    public int getContainerSize() {
+        return this.owner.getEnderChestInventory().getContainerSize();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return this.items.stream().allMatch(ItemStack::isEmpty);
+    }
+
+    @Override
+    public void startOpen(Player player) {
+    }
+
+    @Override
+    public void stopOpen(Player player) {
+    }
+
+    @Override
+    public boolean canPlaceItem(int i, ItemStack itemstack) {
+        return true;
+    }
+
+    @Override
+    public void clearContent() {
+        this.items.clear();
+        this.setChanged();
+    }
+
+    @Override
+    public void fillStackedContents(StackedContents stackedContents) {
+        for (ItemStack itemstack : this.items) {
+            stackedContents.accountStack(itemstack);
+        }
+
+    }
+
+    @Override
+    public List<ItemStack> removeAllItems() {
+        List<ItemStack> list = this.items.stream().filter(Predicate.not(ItemStack::isEmpty)).collect(Collectors.toList());
+        this.clearContent();
+        return list;
+    }
+
+    @Override
+    public ItemStack removeItemType(Item item, int i) {
+        ItemStack itemstack = new ItemStack(item, 0);
+
+        for(int j = this.getContainerSize() - 1; j >= 0; --j) {
+            ItemStack localItem = this.getItem(j);
+            if (localItem.getItem().equals(item)) {
+                int k = i - itemstack.getCount();
+                ItemStack splitItem = localItem.split(k);
+                itemstack.grow(splitItem.getCount());
+                if (itemstack.getCount() == i) {
+                    break;
+                }
+            }
+        }
+
+        if (!itemstack.isEmpty()) {
+            this.setChanged();
+        }
+
+        return itemstack;
+    }
+
+    @Override
+    public String toString() {
+        return this.items.stream().filter((itemStack) -> !itemStack.isEmpty()).collect(Collectors.toList()).toString();
+    }
+
+    @Override
+    public void fromTag(ListTag listTag) {
+        for (int i = 0; i < this.getContainerSize(); ++i) {
+            this.setItem(i, ItemStack.EMPTY);
+        }
+
+        for (int i = 0; i < listTag.size(); ++i) {
+            CompoundTag compoundTag = listTag.getCompound(i);
+            int j = compoundTag.getByte("Slot") & 255;
+            if (j < this.getContainerSize()) {
+                this.setItem(j, ItemStack.of(compoundTag));
+            }
+        }
+
+    }
+
+}
@@ -0,0 +1,769 @@
+/*
+ * 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 com.google.common.collect.ImmutableList;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import java.util.Collection;
+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 {
+
+    private final CraftInventory inventory;
+    private boolean playerOnline;
+    private Player player;
+    private NonNullList<ItemStack> items;
+    private NonNullList<ItemStack> armor;
+    private NonNullList<ItemStack> offhand;
+    private List<NonNullList<ItemStack>> compartments;
+
+    public SpecialPlayerInventory(@NotNull org.bukkit.entity.Player bukkitPlayer, @NotNull Boolean online) {
+        super(PlayerDataManager.getHandle(bukkitPlayer));
+        this.inventory = new CraftInventory(this);
+        this.playerOnline = online;
+        this.player = super.player;
+        this.selected = player.getInventory().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);
+    }
+
+    @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;
+        }
+    }
+
+    @Override
+    public @NotNull CraftInventory getBukkitInventory() {
+        return this.inventory;
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        this.playerOnline = false;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public @NotNull HumanEntity getPlayer() {
+        return this.player.getBukkitEntity();
+    }
+
+    private @NotNull ItemStack getRawItem(int i) {
+        return super.getItem(i);
+    }
+
+    private void setRawItem(int i, @NotNull ItemStack itemStack) {
+        super.setItem(i, itemStack);
+    }
+
+    private static record IndexedCompartment(@Nullable NonNullList<ItemStack> compartment, int index) {}
+
+    private @NotNull SpecialPlayerInventory.IndexedCompartment getIndexedContent(int index) {
+        if (index < items.size()) {
+            return new IndexedCompartment(items, getReversedItemSlotNum(index));
+        }
+
+        index -= items.size();
+
+        if (index < armor.size()) {
+            return new IndexedCompartment(armor, getReversedArmorSlotNum(index));
+        }
+
+        index -= armor.size();
+
+        if (index < offhand.size()) {
+            return new IndexedCompartment(offhand, index);
+        }
+
+        index -= offhand.size();
+
+        return new IndexedCompartment(null, index);
+    }
+
+    private int getReversedArmorSlotNum(final int i) {
+        if (i == 0) {
+            return 3;
+        }
+        if (i == 1) {
+            return 2;
+        }
+        if (i == 2) {
+            return 1;
+        }
+        if (i == 3) {
+            return 0;
+        }
+        return i;
+    }
+
+    private int getReversedItemSlotNum(final int i) {
+        if (i >= 27) {
+            return i - 27;
+        }
+        return i + 9;
+    }
+
+    private boolean contains(Predicate<ItemStack> predicate) {
+        return this.compartments.stream().flatMap(NonNullList::stream).anyMatch(predicate);
+    }
+
+    @Override
+    public List<ItemStack> getArmorContents() {
+        return this.armor;
+    }
+
+    @Override
+    public void onOpen(CraftHumanEntity who) {
+        this.player.getInventory().onOpen(who);
+    }
+
+    @Override
+    public void onClose(CraftHumanEntity who) {
+        this.player.getInventory().onClose(who);
+    }
+
+    @Override
+    public List<HumanEntity> getViewers() {
+        return this.player.getInventory().getViewers();
+    }
+
+    @Override
+    public InventoryHolder getOwner() {
+        return this.player.getBukkitEntity();
+    }
+
+    @Override
+    public int getMaxStackSize() {
+        return this.player.getInventory().getMaxStackSize();
+    }
+
+    @Override
+    public void setMaxStackSize(int size) {
+        this.player.getInventory().setMaxStackSize(size);
+    }
+
+    @Override
+    public Location getLocation() {
+        return this.player.getBukkitEntity().getLocation();
+    }
+
+    @Override
+    public boolean hasCustomName() {
+        return false;
+    }
+
+    @Override
+    public List<ItemStack> getContents() {
+        return this.compartments.stream().flatMap(Collection::stream).collect(Collectors.toList());
+    }
+
+    @Override
+    public ItemStack getSelected() {
+        return isHotbarSlot(this.selected) ? this.items.get(this.selected) : ItemStack.EMPTY;
+    }
+
+    private boolean hasRemainingSpaceForItem(ItemStack itemstack, ItemStack itemstack1) {
+        return !itemstack.isEmpty() && ItemStack.isSameItemSameTags(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize();
+    }
+
+    @Override
+    public int canHold(ItemStack itemstack) {
+        int remains = itemstack.getCount();
+
+        for (int i = 0; i < this.items.size(); ++i) {
+            ItemStack itemstack1 = this.getRawItem(i);
+            if (itemstack1.isEmpty()) {
+                return itemstack.getCount();
+            }
+
+            if (this.hasRemainingSpaceForItem(itemstack1, itemstack)) {
+                remains -= (itemstack1.getMaxStackSize() < this.getMaxStackSize() ? itemstack1.getMaxStackSize() : this.getMaxStackSize()) - itemstack1.getCount();
+            }
+
+            if (remains <= 0) {
+                return itemstack.getCount();
+            }
+        }
+
+        ItemStack offhandItemStack = this.getRawItem(this.items.size() + this.armor.size());
+        if (this.hasRemainingSpaceForItem(offhandItemStack, itemstack)) {
+            remains -= (offhandItemStack.getMaxStackSize() < this.getMaxStackSize() ? offhandItemStack.getMaxStackSize() : this.getMaxStackSize()) - offhandItemStack.getCount();
+        }
+
+        return remains <= 0 ? itemstack.getCount() : itemstack.getCount() - remains;
+    }
+
+    @Override
+    public int getFreeSlot() {
+        for(int i = 0; i < this.items.size(); ++i) {
+            if (this.items.get(i).isEmpty()) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    @Override
+    public void setPickedItem(ItemStack itemstack) {
+        int i = this.findSlotMatchingItem(itemstack);
+        if (isHotbarSlot(i)) {
+            this.selected = i;
+        } else if (i == -1) {
+            this.selected = this.getSuitableHotbarSlot();
+            if (!this.items.get(this.selected).isEmpty()) {
+                int j = this.getFreeSlot();
+                if (j != -1) {
+                    this.items.set(j, this.items.get(this.selected));
+                }
+            }
+
+            this.items.set(this.selected, itemstack);
+        } else {
+            this.pickSlot(i);
+        }
+
+    }
+
+    @Override
+    public void pickSlot(int i) {
+        this.selected = this.getSuitableHotbarSlot();
+        ItemStack itemstack = this.items.get(this.selected);
+        this.items.set(this.selected, this.items.get(i));
+        this.items.set(i, itemstack);
+    }
+
+    @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))) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    @Override
+    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()) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    @Override
+    public int getSuitableHotbarSlot() {
+        int i;
+        int j;
+        for(j = 0; j < 9; ++j) {
+            i = (this.selected + j) % 9;
+            if (this.items.get(i).isEmpty()) {
+                return i;
+            }
+        }
+
+        for(j = 0; j < 9; ++j) {
+            i = (this.selected + j) % 9;
+            if (!this.items.get(i).isEnchanted()) {
+                return i;
+            }
+        }
+
+        return this.selected;
+    }
+
+    @Override
+    public void swapPaint(double d0) {
+        if (d0 > 0.0D) {
+            d0 = 1.0D;
+        }
+
+        if (d0 < 0.0D) {
+            d0 = -1.0D;
+        }
+
+        this.selected = (int) (this.selected - d0);
+
+        while (this.selected < 0) {
+            this.selected += 9;
+        }
+
+        while(this.selected >= 9) {
+            this.selected -= 9;
+        }
+    }
+
+    @Override
+    public int clearOrCountMatchingItems(Predicate<ItemStack> predicate, int i, Container container) {
+        byte b0 = 0;
+        boolean flag = i == 0;
+        int j = b0 + ContainerHelper.clearOrCountMatchingItems(this, predicate, i - b0, flag);
+        j += ContainerHelper.clearOrCountMatchingItems(container, predicate, i - j, flag);
+        ItemStack itemstack = this.player.containerMenu.getCarried();
+        j += ContainerHelper.clearOrCountMatchingItems(itemstack, predicate, i - j, flag);
+        if (itemstack.isEmpty()) {
+            this.player.containerMenu.setCarried(ItemStack.EMPTY);
+        }
+
+        return j;
+    }
+
+    private int addResource(ItemStack itemstack) {
+        int i = this.getSlotWithRemainingSpace(itemstack);
+        if (i == -1) {
+            i = this.getFreeSlot();
+        }
+
+        return i == -1 ? itemstack.getCount() : this.addResource(i, itemstack);
+    }
+
+    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());
+            }
+
+            this.setRawItem(i, localItemStack);
+        }
+
+        int k = Math.min(j, localItemStack.getMaxStackSize() - localItemStack.getCount());
+
+        if (k > this.getMaxStackSize() - localItemStack.getCount()) {
+            k = this.getMaxStackSize() - localItemStack.getCount();
+        }
+
+        if (k != 0) {
+            j -= k;
+            localItemStack.grow(k);
+            localItemStack.setPopTime(5);
+        }
+
+        return j;
+    }
+
+    @Override
+    public int getSlotWithRemainingSpace(ItemStack itemstack) {
+        if (this.hasRemainingSpaceForItem(this.getRawItem(this.selected), itemstack)) {
+            return this.selected;
+        } else if (this.hasRemainingSpaceForItem(this.getRawItem(40), itemstack)) {
+            return 40;
+        } else {
+            for(int i = 0; i < this.items.size(); ++i) {
+                if (this.hasRemainingSpaceForItem(this.items.get(i), itemstack)) {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+    }
+
+    @Override
+    public void tick() {
+        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);
+                }
+            }
+        }
+
+    }
+
+    @Override
+    public boolean add(ItemStack itemStack) {
+        return this.add(-1, itemStack);
+    }
+
+    @Override
+    public boolean add(int i, ItemStack itemStack) {
+        if (itemStack.isEmpty()) {
+            return false;
+        } else {
+            try {
+                if (itemStack.isDamaged()) {
+                    if (i == -1) {
+                        i = this.getFreeSlot();
+                    }
+
+                    if (i >= 0) {
+                        this.items.set(i, itemStack.copy());
+                        this.items.get(i).setPopTime(5);
+                        itemStack.setCount(0);
+                        return true;
+                    } else if (this.player.getAbilities().instabuild) {
+                        itemStack.setCount(0);
+                        return true;
+                    } else {
+                        return false;
+                    }
+                } else {
+                    int j;
+                    do {
+                        j = itemStack.getCount();
+                        if (i == -1) {
+                            itemStack.setCount(this.addResource(itemStack));
+                        } else {
+                            itemStack.setCount(this.addResource(i, itemStack));
+                        }
+                    } while(!itemStack.isEmpty() && itemStack.getCount() < j);
+
+                    if (itemStack.getCount() == j && this.player.getAbilities().instabuild) {
+                        itemStack.setCount(0);
+                        return true;
+                    } else {
+                        return itemStack.getCount() < j;
+                    }
+                }
+            } catch (Throwable var6) {
+                CrashReport crashReport = CrashReport.forThrowable(var6, "Adding item to inventory");
+                CrashReportCategory crashReportCategory = crashReport.addCategory("Item being added");
+                crashReportCategory.setDetail("Item ID", Item.getId(itemStack.getItem()));
+                crashReportCategory.setDetail("Item data", itemStack.getDamageValue());
+                crashReportCategory.setDetail("Item name", () -> itemStack.getHoverName().getString());
+                throw new ReportedException(crashReport);
+            }
+        }
+    }
+
+    @Override
+    public void placeItemBackInInventory(ItemStack itemStack) {
+        this.placeItemBackInInventory(itemStack, true);
+    }
+
+    @Override
+    public void placeItemBackInInventory(ItemStack itemStack, boolean flag) {
+        while(true) {
+            if (!itemStack.isEmpty()) {
+                int i = this.getSlotWithRemainingSpace(itemStack);
+                if (i == -1) {
+                    i = this.getFreeSlot();
+                }
+
+                if (i != -1) {
+                    int j = itemStack.getMaxStackSize() - this.getRawItem(i).getCount();
+                    if (this.add(i, itemStack.split(j)) && flag && this.player instanceof ServerPlayer) {
+                        ((ServerPlayer)this.player).connection.send(new ClientboundContainerSetSlotPacket(-2, 0, i, this.getRawItem(i)));
+                    }
+                    continue;
+                }
+
+                this.player.drop(itemStack, false);
+            }
+
+            return;
+        }
+    }
+
+    @Override
+    public ItemStack removeItem(int rawIndex, final int j) {
+        IndexedCompartment indexedCompartment = getIndexedContent(rawIndex);
+
+        if (indexedCompartment.compartment() == null
+                || indexedCompartment.compartment().get(indexedCompartment.index()).isEmpty()) {
+            return ItemStack.EMPTY;
+        }
+
+        return ContainerHelper.removeItem(indexedCompartment.compartment(), indexedCompartment.index(), j);
+    }
+
+    @Override
+    public void removeItem(ItemStack itemStack) {
+        for (NonNullList<ItemStack> compartment : this.compartments) {
+            for (int i = 0; i < compartment.size(); ++i) {
+                if (compartment.get(i) == itemStack) {
+                    compartment.set(i, ItemStack.EMPTY);
+                    break;
+                }
+            }
+        }
+    }
+
+    @Override
+    public ItemStack removeItemNoUpdate(int rawIndex) {
+        IndexedCompartment indexedCompartment = getIndexedContent(rawIndex);
+
+        if (indexedCompartment.compartment() == null) {
+            return ItemStack.EMPTY;
+        }
+
+        ItemStack removed = indexedCompartment.compartment().set(indexedCompartment.index(), ItemStack.EMPTY);
+
+        if (removed.isEmpty()) {
+            return ItemStack.EMPTY;
+        }
+
+        return removed;
+    }
+
+    @Override
+    public void setItem(int rawIndex, final ItemStack itemStack) {
+        IndexedCompartment indexedCompartment = getIndexedContent(rawIndex);
+
+        if (indexedCompartment.compartment() == null) {
+            this.player.drop(itemStack, true);
+            return;
+        }
+
+        indexedCompartment.compartment().set(indexedCompartment.index(), itemStack);
+    }
+
+    @Override
+    public float getDestroySpeed(BlockState blockState) {
+        return this.items.get(this.selected).getDestroySpeed(blockState);
+    }
+
+    @Override
+    public ListTag save(ListTag listTag) {
+        for (int i = 0; i < this.items.size(); ++i) {
+            if (!this.items.get(i).isEmpty()) {
+                CompoundTag compoundTag = new CompoundTag();
+                compoundTag.putByte("Slot", (byte)i);
+                this.items.get(i).save(compoundTag);
+                listTag.add(compoundTag);
+            }
+        }
+
+        for (int i = 0; i < this.armor.size(); ++i) {
+            if (!this.armor.get(i).isEmpty()) {
+                CompoundTag compoundTag = new CompoundTag();
+                compoundTag.putByte("Slot", (byte)(i + 100));
+                this.armor.get(i).save(compoundTag);
+                listTag.add(compoundTag);
+            }
+        }
+
+        for (int i = 0; i < this.offhand.size(); ++i) {
+            if (!this.offhand.get(i).isEmpty()) {
+                CompoundTag compoundTag = new CompoundTag();
+                compoundTag.putByte("Slot", (byte)(i + 150));
+                this.offhand.get(i).save(compoundTag);
+                listTag.add(compoundTag);
+            }
+        }
+
+        return listTag;
+    }
+
+    @Override
+    public void load(ListTag listTag) {
+        this.items.clear();
+        this.armor.clear();
+        this.offhand.clear();
+
+        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);
+                }
+            }
+        }
+
+    }
+
+    @Override
+    public int getContainerSize() {
+        return 45;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return !contains(itemStack -> !itemStack.isEmpty());
+    }
+
+    @Override
+    public ItemStack getItem(int rawIndex) {
+        IndexedCompartment indexedCompartment = getIndexedContent(rawIndex);
+
+        if (indexedCompartment.compartment() == null) {
+            return ItemStack.EMPTY;
+        }
+
+        return indexedCompartment.compartment().get(indexedCompartment.index());
+    }
+
+    @Override
+    public Component getName() {
+        return this.player.getName();
+    }
+
+    @Override
+    public ItemStack getArmor(int index) {
+        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) {
+            for (int i = 0; i < compartment.size(); ++i) {
+                ItemStack itemstack = compartment.get(i);
+                if (!itemstack.isEmpty()) {
+                    this.player.drop(itemstack, true, false);
+                    compartment.set(i, ItemStack.EMPTY);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void setChanged() {
+        super.setChanged();
+    }
+
+    @Override
+    public int getTimesChanged() {
+        return super.getTimesChanged();
+    }
+
+    @Override
+    public boolean stillValid(Player player) {
+        return true;
+    }
+
+    @Override
+    public boolean contains(ItemStack itemstack) {
+        return contains(itemStack -> itemStack.isEmpty() && itemStack.sameItem(itemstack));
+    }
+
+    @Override
+    public boolean contains(Tag<Item> tag) {
+        return contains(itemStack -> !itemStack.isEmpty() && itemStack.is(tag));
+    }
+
+    @Override
+    public void replaceWith(Inventory inventory) {
+        Function<Integer, ItemStack> getter;
+
+        if (inventory instanceof SpecialPlayerInventory specialPlayerInventory) {
+            getter = specialPlayerInventory::getRawItem;
+        } else {
+            getter = inventory::getItem;
+        }
+
+        for(int i = 0; i < this.getContainerSize(); ++i) {
+            this.setRawItem(i, getter.apply(i));
+        }
+
+        this.selected = inventory.selected;
+    }
+
+    @Override
+    public void clearContent() {
+        for (NonNullList<ItemStack> compartment : this.compartments) {
+            compartment.clear();
+        }
+    }
+
+    @Override
+    public void fillStackedContents(StackedContents stackedContents) {
+        for (ItemStack itemstack : this.items) {
+            stackedContents.accountSimpleStack(itemstack);
+        }
+    }
+
+    @Override
+    public ItemStack removeFromSelected(boolean dropWholeStack) {
+        ItemStack itemstack = this.getSelected();
+        return itemstack.isEmpty() ? ItemStack.EMPTY : this.removeItem(this.selected, dropWholeStack ? itemstack.getCount() : 1);
+    }
+
+}
@@ -1,74 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2020 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/>.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
-    <version>4.1.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>openinvadapter1_8_R3</artifactId>
-  <name>OpenInvAdapter1_8_R3</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
-      <version>1.8.8-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugincore</artifactId>
-      <version>4.1.1-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.2</version>
-        <configuration>
-          <minimizeJar>true</minimizeJar>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
@@ -1,250 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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_8_R3;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import java.lang.reflect.Field;
-import net.minecraft.server.v1_8_R3.AxisAlignedBB;
-import net.minecraft.server.v1_8_R3.Block;
-import net.minecraft.server.v1_8_R3.BlockChest;
-import net.minecraft.server.v1_8_R3.BlockEnderChest;
-import net.minecraft.server.v1_8_R3.BlockPosition;
-import net.minecraft.server.v1_8_R3.Entity;
-import net.minecraft.server.v1_8_R3.EntityOcelot;
-import net.minecraft.server.v1_8_R3.EntityPlayer;
-import net.minecraft.server.v1_8_R3.EnumDirection;
-import net.minecraft.server.v1_8_R3.ITileInventory;
-import net.minecraft.server.v1_8_R3.InventoryEnderChest;
-import net.minecraft.server.v1_8_R3.InventoryLargeChest;
-import net.minecraft.server.v1_8_R3.PlayerInteractManager;
-import net.minecraft.server.v1_8_R3.StatisticList;
-import net.minecraft.server.v1_8_R3.TileEntity;
-import net.minecraft.server.v1_8_R3.TileEntityChest;
-import net.minecraft.server.v1_8_R3.TileEntityEnderChest;
-import net.minecraft.server.v1_8_R3.World;
-import net.minecraft.server.v1_8_R3.WorldSettings.EnumGamemode;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-public class AnySilentContainer implements IAnySilentContainer {
-
-    private Field playerInteractManagerGamemode;
-
-    public AnySilentContainer() {
-        try {
-            this.playerInteractManagerGamemode = PlayerInteractManager.class.getDeclaredField("gamemode");
-            this.playerInteractManagerGamemode.setAccessible(true);
-        } catch (Exception e) {
-            System.err.println("[OpenInv] Unable to directly write player gamemode! SilentChest will fail.");
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public boolean isAnySilentContainer(@NotNull org.bukkit.block.Block bukkitBlock) {
-        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull org.bukkit.block.Block bukkitBlock) {
-
-        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
-        BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        Block block = world.getType(blockPosition).getBlock();
-
-        if (block instanceof BlockEnderChest) {
-            // Ender chests are not blocked by ocelots.
-            return world.getType(blockPosition.up()).getBlock().c();
-        }
-
-        // Check if chest is blocked or has an ocelot on top
-        if (isBlockedChest(world, blockPosition)) {
-            return true;
-        }
-
-        // Check for matching adjacent chests that are blocked or have an ocelot on top
-        for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
-            BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
-            Block localBlock = world.getType(localBlockPosition).getBlock();
-
-            if (localBlock != block) {
-                continue;
-            }
-
-            TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
-            if (!(localTileEntity instanceof TileEntityChest)) {
-                continue;
-            }
-
-            if (isBlockedChest(world, localBlockPosition)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedChest(World world, BlockPosition blockPosition) {
-        // For reference, loot at net.minecraft.server.BlockChest
-        return world.getType(blockPosition.up()).getBlock().c() || hasOcelotOnTop(world, blockPosition);
-    }
-
-    private boolean hasOcelotOnTop(World world, BlockPosition blockPosition) {
-        for (Entity localEntity : world.a(EntityOcelot.class,
-                new AxisAlignedBB(blockPosition.getX(), blockPosition.getY() + 1,
-                        blockPosition.getZ(), blockPosition.getX() + 1, blockPosition.getY() + 2,
-                        blockPosition.getZ() + 1))) {
-            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
-            if (localEntityOcelot.isSitting()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull org.bukkit.block.Block bukkitBlock) {
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        // Silent ender chest is pretty much API-only
-        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            player.b(StatisticList.V);
-            return true;
-        }
-
-        World world = player.world;
-        BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        Object tile = world.getTileEntity(blockPosition);
-
-        if (tile == null) {
-            return false;
-        }
-
-        if (tile instanceof TileEntityEnderChest) {
-            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
-            InventoryEnderChest enderChest = player.getEnderChest();
-            enderChest.a((TileEntityEnderChest) tile);
-            player.openContainer(enderChest);
-            player.b(StatisticList.V);
-            return true;
-        }
-
-        if (!(tile instanceof ITileInventory)) {
-            return false;
-        }
-
-        ITileInventory tileInventory = (ITileInventory) tile;
-        Block block = world.getType(blockPosition).getBlock();
-
-        if (block instanceof BlockChest) {
-            for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
-                BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
-                Block localBlock = world.getType(localBlockPosition).getBlock();
-
-                if (localBlock != block) {
-                    continue;
-                }
-
-                TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
-                if (!(localTileEntity instanceof TileEntityChest)) {
-                    continue;
-                }
-
-                if ((localEnumDirection == EnumDirection.WEST) || (localEnumDirection == EnumDirection.NORTH)) {
-                    tileInventory = new InventoryLargeChest("container.chestDouble",
-                            (TileEntityChest) localTileEntity, tileInventory);
-                } else {
-                    tileInventory = new InventoryLargeChest("container.chestDouble",
-                            tileInventory, (TileEntityChest) localTileEntity);
-                }
-                break;
-            }
-
-            BlockChest blockChest = (BlockChest) block;
-            if (blockChest.b == 0) {
-                player.b(StatisticList.aa);
-            } else if (blockChest.b == 1) {
-                player.b(StatisticList.U);
-            }
-        }
-
-        // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
-        if (!silent || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
-            player.openContainer(tileInventory);
-            return true;
-        }
-
-        // SilentChest requires access to setting players' gamemode directly.
-        if (this.playerInteractManagerGamemode == null) {
-            return false;
-        }
-
-        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
-        this.forceGameMode(player, EnumGamemode.SPECTATOR);
-        player.openContainer(tileInventory);
-        this.forceGameMode(player, gamemode);
-        return true;
-    }
-
-    @Override
-    public void deactivateContainer(@NotNull final Player bukkitPlayer) {
-        if (this.playerInteractManagerGamemode == null) {
-            return;
-        }
-
-        InventoryView view = bukkitPlayer.getOpenInventory();
-        switch (view.getType()) {
-            case CHEST:
-            case ENDER_CHEST:
-                break;
-            default:
-                return;
-        }
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
-        this.forceGameMode(player, EnumGamemode.SPECTATOR);
-        player.activeContainer.b(player);
-        player.activeContainer.a(player, false);
-        player.activeContainer.transferTo(player.defaultContainer, player.getBukkitEntity());
-        player.activeContainer = player.defaultContainer;
-        this.forceGameMode(player, gamemode);
-    }
-
-    private void forceGameMode(final EntityPlayer player, final EnumGamemode gameMode) {
-        if (this.playerInteractManagerGamemode == null) {
-            // No need to warn repeatedly, error on startup and lack of function should be enough.
-            return;
-        }
-        try {
-            if (!this.playerInteractManagerGamemode.isAccessible()) {
-                // Just in case, ensure accessible.
-                this.playerInteractManagerGamemode.setAccessible(true);
-            }
-            this.playerInteractManagerGamemode.set(player.playerInteractManager, gameMode);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-}
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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_8_R3;
-
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.mojang.authlib.GameProfile;
-import net.minecraft.server.v1_8_R3.ChatComponentText;
-import net.minecraft.server.v1_8_R3.EntityPlayer;
-import net.minecraft.server.v1_8_R3.MinecraftServer;
-import net.minecraft.server.v1_8_R3.PacketPlayOutChat;
-import net.minecraft.server.v1_8_R3.PlayerInteractManager;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    @NotNull
-    public static EntityPlayer getHandle(Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        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");
-        }
-
-        return nmsPlayer;
-    }
-
-    @Nullable
-    @Override
-    public Player loadPlayer(@NotNull OfflinePlayer offline) {
-        // Ensure the player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        // Create a profile and entity to load the player data
-        GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
-                new PlayerInteractManager(server.getWorldServer(0)));
-
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
-    }
-
-    @Nullable
-	@Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-        return player.openInventory(inventory.getBukkitInventory());
-    }
-
-    @Override
-    public void sendSystemMessage(@NotNull Player player, @NotNull String message) {
-        int newline = message.indexOf('\n');
-        if (newline != -1) {
-            // No newlines in action bar chat.
-            message = message.substring(0, newline);
-        }
-
-        if (message.isEmpty()) {
-            return;
-        }
-
-        EntityPlayer nmsPlayer = getHandle(player);
-
-        // For action bar chat, color codes are still supported but JSON text color is not allowed. Do not convert text.
-        if (nmsPlayer.playerConnection != null) {
-            nmsPlayer.playerConnection.sendPacket(new PacketPlayOutChat(new ChatComponentText(message), (byte) 2));
-        }
-    }
-
-    @NotNull
-    @Override
-    public String getLocale(Player player) {
-        return getHandle(player).locale;
-    }
-
-}
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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_8_R3;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.lang.reflect.Field;
-import net.minecraft.server.v1_8_R3.EntityPlayer;
-import net.minecraft.server.v1_8_R3.IInventory;
-import net.minecraft.server.v1_8_R3.InventoryEnderChest;
-import net.minecraft.server.v1_8_R3.InventorySubcontainer;
-import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftInventory;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
-
-    private final InventoryEnderChest enderChest;
-    private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline;
-
-    public SpecialEnderChest(Player player, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
-                PlayerDataManager.getHandle(player).getEnderChest().hasCustomName(),
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
-        this.playerOnline = online;
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.bukkitOwner = nmsPlayer.getBukkitEntity();
-        this.items = enderChest.getContents();
-    }
-
-    @Override
-    public @NotNull Inventory getBukkitInventory() {
-        return inventory;
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull Player player) {
-        if (!playerOnline) {
-            try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
-                this.bukkitOwner = nmsPlayer.getBukkitEntity();
-                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
-                Field field = playerEnderChest.getClass().getField("items");
-                field.setAccessible(true);
-                field.set(playerEnderChest, this.items);
-            } catch (Exception ignored) {}
-            playerOnline = true;
-        }
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        playerOnline = false;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
-    @Override
-    public void update() {
-        super.update();
-        enderChest.update();
-    }
-
-}
@@ -1,230 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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_8_R3;
-
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import net.minecraft.server.v1_8_R3.ItemStack;
-import net.minecraft.server.v1_8_R3.PlayerInventory;
-import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftInventory;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-
-    private final ItemStack[] extra = new ItemStack[5];
-    private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline;
-
-    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
-        this.playerOnline = online;
-        this.items = player.inventory.items;
-        this.armor = player.inventory.armor;
-    }
-
-    @Override
-    public @NotNull Inventory getBukkitInventory() {
-        return inventory;
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull Player player) {
-        if (!playerOnline) {
-            this.player = PlayerDataManager.getHandle(player);
-            this.player.inventory.items = this.items;
-            this.player.inventory.armor = this.armor;
-            playerOnline = true;
-        }
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        playerOnline = false;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
-    @Override
-    public ItemStack[] getContents() {
-        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return contents;
-    }
-
-    @Override
-    public int getSize() {
-        return super.getSize() + 5;
-    }
-
-    @Override
-    public ItemStack getItem(int i) {
-        ItemStack[] is = this.items;
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.armor;
-        } else {
-            i = getReversedItemSlotNum(i);
-        }
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.extra;
-        } else if (is == this.armor) {
-            i = getReversedArmorSlotNum(i);
-        }
-
-        return is[i];
-    }
-
-    @Override
-    public ItemStack splitStack(int i, int j) {
-        ItemStack[] is = this.items;
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.armor;
-        } else {
-            i = getReversedItemSlotNum(i);
-        }
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.extra;
-        } else if (is == this.armor) {
-            i = getReversedArmorSlotNum(i);
-        }
-
-        if (is[i] != null) {
-            ItemStack itemstack;
-
-            if (is[i].count <= j) {
-                itemstack = is[i];
-                is[i] = null;
-                return itemstack;
-            } else {
-                itemstack = is[i].cloneAndSubtract(j);
-                if (is[i].count == 0) {
-                    is[i] = null;
-                }
-
-                return itemstack;
-            }
-        }
-
-        return null;
-    }
-
-    @Override
-    public ItemStack splitWithoutUpdate(int i) {
-        ItemStack[] is = this.items;
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.armor;
-        } else {
-            i = getReversedItemSlotNum(i);
-        }
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.extra;
-        } else if (is == this.armor) {
-            i = getReversedArmorSlotNum(i);
-        }
-
-        if (is[i] != null) {
-            ItemStack itemstack = is[i];
-
-            is[i] = null;
-            return itemstack;
-        }
-
-        return null;
-    }
-
-    @Override
-    public void setItem(int i, ItemStack itemstack) {
-        ItemStack[] is = this.items;
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.armor;
-        } else {
-            i = getReversedItemSlotNum(i);
-        }
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.extra;
-        } else if (is == this.armor) {
-            i = getReversedArmorSlotNum(i);
-        }
-
-        // Effects
-        if (is == this.extra) {
-            player.drop(itemstack, true);
-            itemstack = null;
-        }
-
-        is[i] = itemstack;
-
-        player.defaultContainer.b();
-    }
-
-    private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
-            return i - 27;
-        }
-        return i + 9;
-    }
-
-    private int getReversedArmorSlotNum(int i) {
-        if (i == 0) {
-            return 3;
-        }
-        if (i == 1) {
-            return 2;
-        }
-        if (i == 2) {
-            return 1;
-        }
-        if (i == 3) {
-            return 0;
-        }
-        return i;
-    }
-
-    @Override
-    public String getName() {
-        if (player.getName().length() > 16) {
-            return player.getName().substring(0, 16);
-        }
-        return player.getName();
-    }
-
-    @Override
-    public boolean hasCustomName() {
-        return true;
-    }
-
-}
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
+  ~ 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
@@ -19,9 +19,9 @@
  <modelVersion>4.0.0</modelVersion>

  <parent>
-    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.1.1-SNAPSHOT</version>
+    <groupId>com.lishid</groupId>
+    <version>4.1.9-SNAPSHOT</version>
  </parent>

  <artifactId>openinvplugincore</artifactId>
@@ -29,15 +29,20 @@

  <dependencies>
    <dependency>
-      <groupId>com.lishid</groupId>
      <artifactId>openinvapi</artifactId>
-      <version>4.1.1-SNAPSHOT</version>
+      <groupId>com.lishid</groupId>
    </dependency>
    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>1.15.2-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
+      <artifactId>annotations</artifactId>
+      <groupId>org.jetbrains</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>paper-api</artifactId>
+      <groupId>io.papermc.paper</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>planarwrappers</artifactId>
+      <groupId>com.github.jikoo</groupId>
    </dependency>
  </dependencies>

@@ -48,31 +53,13 @@
        <filtering>true</filtering>
      </resource>
    </resources>
+
    <plugins>
      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.2</version>
-        <configuration>
-          <minimizeJar>true</minimizeJar>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
      </plugin>
-
      <plugin>
        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
      </plugin>
    </plugins>
  </build>
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -20,16 +20,12 @@ import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.lishid.openinv.commands.ContainerSettingCommand;
 import com.lishid.openinv.commands.OpenInvCommand;
-import com.lishid.openinv.commands.SearchContainerCommand;
-import com.lishid.openinv.commands.SearchEnchantCommand;
-import com.lishid.openinv.commands.SearchInvCommand;
+import com.lishid.openinv.commands.SearchCommand;
 import com.lishid.openinv.internal.IAnySilentContainer;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.listeners.InventoryClickListener;
-import com.lishid.openinv.listeners.InventoryCloseListener;
-import com.lishid.openinv.listeners.InventoryDragListener;
+import com.lishid.openinv.listeners.InventoryListener;
 import com.lishid.openinv.listeners.PlayerListener;
 import com.lishid.openinv.listeners.PluginListener;
 import com.lishid.openinv.util.Cache;
@@ -37,12 +33,17 @@ import com.lishid.openinv.util.ConfigUpdater;
 import com.lishid.openinv.util.InternalAccessor;
 import com.lishid.openinv.util.LanguageManager;
 import com.lishid.openinv.util.Permissions;
+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.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.function.Consumer;
+import net.md_5.bungee.api.ChatMessageType;
+import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
@@ -87,7 +88,7 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
                // Check if inventory is stored, and if it is, remove it and eject all viewers
                if (OpenInv.this.inventories.containsKey(key)) {
                    Inventory inv = OpenInv.this.inventories.remove(key).getBukkitInventory();
-                    List<HumanEntity> viewers = inv.getViewers();
+                    List<HumanEntity> viewers = new ArrayList<>(inv.getViewers());
                    for (HumanEntity entity : viewers.toArray(new HumanEntity[0])) {
                        entity.closeInventory();
                    }
@@ -96,7 +97,7 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
                // Check if ender chest is stored, and if it is, remove it and eject all viewers
                if (OpenInv.this.enderChests.containsKey(key)) {
                    Inventory inv = OpenInv.this.enderChests.remove(key).getBukkitInventory();
-                    List<HumanEntity> viewers = inv.getViewers();
+                    List<HumanEntity> viewers = new ArrayList<>(inv.getViewers());
                    for (HumanEntity entity : viewers.toArray(new HumanEntity[0])) {
                        entity.closeInventory();
                    }
@@ -105,7 +106,6 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
                if (!OpenInv.this.disableSaving() && !value.isOnline()) {
                    value.saveData();
                }
-                return true;
            });

    private InternalAccessor accessor;
@@ -126,30 +126,40 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
        }

        if (this.inventories.containsKey(key)) {
-            Iterator<HumanEntity> iterator = this.inventories.get(key).getBukkitInventory().getViewers().iterator();
-            while (iterator.hasNext()) {
-                HumanEntity human = iterator.next();
-                // If player has permission or is in the same world, allow continued access
-                // Just in case, also allow null worlds.
-                if (Permissions.CROSSWORLD.hasPermission(human) || human.getWorld().equals(player.getWorld())) {
-                    continue;
-                }
-                human.closeInventory();
-            }
+            kickCrossWorldViewers(player, this.inventories.get(key));
        }

        if (this.enderChests.containsKey(key)) {
-            Iterator<HumanEntity> iterator = this.enderChests.get(key).getBukkitInventory().getViewers().iterator();
-            while (iterator.hasNext()) {
-                HumanEntity human = iterator.next();
-                if (Permissions.CROSSWORLD.hasPermission(human) || human.getWorld().equals(player.getWorld())) {
-                    continue;
-                }
-                human.closeInventory();
-            }
+            kickCrossWorldViewers(player, this.enderChests.get(key));
        }
    }

+    private void kickCrossWorldViewers(Player player, ISpecialInventory inventory) {
+        List<HumanEntity> viewers = new ArrayList<>(inventory.getBukkitInventory().getViewers());
+        for (HumanEntity human : viewers) {
+            // If player has permission or is in the same world, allow continued access
+            // Just in case, also allow null worlds.
+            if (Permissions.CROSSWORLD.hasPermission(human) || Objects.equals(human.getWorld(), player.getWorld())) {
+                continue;
+            }
+            human.closeInventory();
+        }
+    }
+
+    /**
+     * Convert a raw slot number into a player inventory slot number.
+     *
+     * <p>Note that this method is specifically for converting an ISpecialPlayerInventory slot number into a regular
+     * player inventory slot number.
+     *
+     * @param view the open inventory view
+     * @param rawSlot the raw slot in the view
+     * @return the converted slot number
+     */
+    public int convertToPlayerSlot(InventoryView view, int rawSlot) {
+        return this.accessor.getPlayerDataManager().convertToPlayerSlot(view, rawSlot);
+    }
+
    @Override
    public boolean disableSaving() {
        return this.getConfig().getBoolean("settings.disable-saving", false);
@@ -222,22 +232,18 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
        return this.accessor != null && this.accessor.isSupported();
    }

-    @Nullable
    @Override
-    public Player loadPlayer(@NotNull final OfflinePlayer offline) {
+    public @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline) {

        String key = this.getPlayerID(offline);
        if (this.playerCache.containsKey(key)) {
            return this.playerCache.get(key);
        }

-        // TODO: wrap Player to ensure all methods can safely be called offline
-        Player loaded;
-
-        if (offline.isOnline()) {
-            loaded = offline.getPlayer();
-            this.playerCache.put(key, loaded);
-            return loaded;
+        Player player = offline.getPlayer();
+        if (player != null) {
+            this.playerCache.put(key, player);
+            return player;
        }

        if (!this.isSupportedVersion()) {
@@ -251,33 +257,18 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
        Future<Player> future = Bukkit.getScheduler().callSyncMethod(this,
                () -> OpenInv.this.accessor.getPlayerDataManager().loadPlayer(offline));

-        int ticks = 0;
-        while (!future.isDone() && !future.isCancelled() && ticks < 10) {
-            ++ticks;
-            try {
-                Thread.sleep(50L);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-                return null;
-            }
-        }
-
-        if (!future.isDone() || future.isCancelled()) {
-            return null;
-        }
-
        try {
-            loaded = future.get();
+            player = future.get();
        } catch (InterruptedException | ExecutionException e) {
            e.printStackTrace();
            return null;
        }

-        if (loaded != null) {
-            this.playerCache.put(key, loaded);
+        if (player != null) {
+            this.playerCache.put(key, player);
        }

-        return loaded;
+        return player;
    }

    @Override
@@ -302,34 +293,51 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
    }

    public void sendSystemMessage(@NotNull Player player, @NotNull String key) {
+        this.sendSystemMessage(player, key, new String[0]);
+    }
+
+    public void sendSystemMessage(@NotNull Player player, @NotNull String key, String... replacements) {
        String message = this.languageManager.getValue(key, getLocale(player));

-        if (message != null) {
-            this.accessor.getPlayerDataManager().sendSystemMessage(player, message);
+        if (message == null) {
+            return;
        }
+
+        int newline = message.indexOf('\n');
+        if (newline != -1) {
+            // No newlines in action bar chat.
+            message = message.substring(0, newline);
+        }
+
+        if (message.isEmpty()) {
+            return;
+        }
+
+        player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(message));
    }

    public @Nullable String getLocalizedMessage(@NotNull CommandSender sender, @NotNull String key) {
        return this.languageManager.getValue(key, getLocale(sender));
    }

-    @Nullable
-    private String getLocale(@NotNull CommandSender sender) {
+    public @Nullable String getLocalizedMessage(@NotNull CommandSender sender, @NotNull String key, String... replacements) {
+        return this.languageManager.getValue(key, getLocale(sender), replacements);
+    }
+
+    private @NotNull String getLocale(@NotNull CommandSender sender) {
        if (sender instanceof Player) {
-            return this.accessor.getPlayerDataManager().getLocale((Player) sender);
+            return ((Player) sender).getLocale();
        } else {
            return this.getConfig().getString("settings.locale", "en_us");
        }
    }

-    @Override
-    public boolean notifyAnyChest() {
-        return this.getConfig().getBoolean("notify.any-chest", true);
+    public int getSearchPollsPerTick() {
+        return this.getConfig().getInt("settings.search.polls-per-tick", 5);
    }

-    @Override
-    public boolean notifySilentChest() {
-        return this.getConfig().getBoolean("notify.silent-chest", true);
+    public int getSearchResultsMax() {
+        return this.getConfig().getInt("settings.search.max-results", 40);
    }

    @Override
@@ -365,44 +373,37 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
            // Register listeners
            pm.registerEvents(new PlayerListener(this), this);
            pm.registerEvents(new PluginListener(this), this);
-            pm.registerEvents(new InventoryClickListener(), this);
-            pm.registerEvents(new InventoryCloseListener(this), this);
-            // Bukkit will handle missing events for us, attempt to register InventoryDragEvent without a version check
-            pm.registerEvents(new InventoryDragListener(), this);
+            pm.registerEvents(new InventoryListener(this), this);

            // Register commands to their executors
-            OpenInvCommand openInv = new OpenInvCommand(this);
-            this.setCommandExecutor("openinv", openInv);
-            this.setCommandExecutor("openender", openInv);
-            this.setCommandExecutor("searchcontainer", new SearchContainerCommand(this));
-            SearchInvCommand searchInv = new SearchInvCommand(this);
-            this.setCommandExecutor("searchinv", searchInv);
-            this.setCommandExecutor("searchender", searchInv);
-            this.setCommandExecutor("searchenchant", new SearchEnchantCommand(this));
-            ContainerSettingCommand settingCommand = new ContainerSettingCommand(this);
-            this.setCommandExecutor("silentcontainer", settingCommand);
-            this.setCommandExecutor("anycontainer", settingCommand);
+            this.setCommandExecutor(new OpenInvCommand(this), "openinv", "openender");
+            this.setCommandExecutor(new SearchCommand(this), "search");
+            this.setCommandExecutor(new ContainerSettingCommand(this), "silentcontainer", "anycontainer");

        } else {
-            this.getLogger().info("Your version of CraftBukkit (" + this.accessor.getVersion() + ") is not supported.");
-            this.getLogger().info("If this version is a recent release, check for an update.");
-            this.getLogger().info("If this is an older version, ensure that you've downloaded the legacy support version.");
+            this.sendVersionError(this.getLogger()::warning);
        }

    }

-    private void setCommandExecutor(String commandName, CommandExecutor executor) {
-        PluginCommand command = this.getCommand(commandName);
-        if (command != null) {
-            command.setExecutor(executor);
+    private void sendVersionError(Consumer<String> messageMethod) {
+        messageMethod.accept("Your server version (" + this.accessor.getVersion() + ") is not supported.");
+        messageMethod.accept("Please obtain an appropriate version here: " + accessor.getReleasesLink());
+    }
+
+    private void setCommandExecutor(CommandExecutor executor, String... commands) {
+        for (String commandName : commands) {
+            PluginCommand command = this.getCommand(commandName);
+            if (command != null) {
+                command.setExecutor(executor);
+            }
        }
    }

    @Override
    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
        if (!this.accessor.isSupported()) {
-            sender.sendMessage("Your version of CraftBukkit (" + this.accessor.getVersion() + ") is not supported.");
-            sender.sendMessage("If this version is a recent release, check for an update.");
+            this.sendVersionError(sender::sendMessage);
            return true;
        }
        return false;
@@ -465,6 +466,9 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
            return;
        }

+        // Replace stored player with our own version
+        this.playerCache.put(key, this.accessor.getPlayerDataManager().inject(player));
+
        if (this.inventories.containsKey(key)) {
            this.inventories.get(key).setPlayerOffline();
        }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -21,7 +21,7 @@ import com.lishid.openinv.util.TabCompleter;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.BiConsumer;
-import java.util.function.Function;
+import java.util.function.Predicate;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -46,7 +46,7 @@ public class ContainerSettingCommand implements TabExecutor {

        Player player = (Player) sender;
        boolean any = command.getName().startsWith("any");
-        Function<Player, Boolean> getSetting = any ? plugin::getPlayerAnyChestStatus : plugin::getPlayerSilentChestStatus;
+        Predicate<Player> getSetting = any ? plugin::getPlayerAnyChestStatus : plugin::getPlayerSilentChestStatus;
        BiConsumer<OfflinePlayer, Boolean> setSetting = any ? plugin::setPlayerAnyChestStatus : plugin::setPlayerSilentChestStatus;

        if (args.length > 0) {
@@ -62,12 +62,12 @@ public class ContainerSettingCommand implements TabExecutor {
            }

        } else {
-            setSetting.accept(player, !getSetting.apply(player));
+            setSetting.accept(player, !getSetting.test(player));
        }

-        String onOff = plugin.getLocalizedMessage(player, getSetting.apply(player) ? "messages.info.on" : "messages.info.off");
+        String onOff = plugin.getLocalizedMessage(player, getSetting.test(player) ? "messages.info.on" : "messages.info.off");
        if (onOff == null) {
-            onOff = String.valueOf(getSetting.apply(player));
+            onOff = String.valueOf(getSetting.test(player));
        }

        plugin.sendMessage(sender, "messages.info.settingState","%setting%", any ? "AnyContainer" : "SilentContainer", "%state%", onOff);
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -104,10 +104,20 @@ public class OpenInvCommand implements TabExecutor {
        boolean online = target.isOnline();

        if (!online) {
-            // Try loading the player's data
-            onlineTarget = this.plugin.loadPlayer(target);
+            if (Permissions.OPENOFFLINE.hasPermission(player)) {
+                // Try loading the player's data
+                onlineTarget = this.plugin.loadPlayer(target);
+            } else {
+                plugin.sendMessage(player, "messages.error.permissionPlayerOffline");
+                return;
+            }
        } else {
-            onlineTarget = target.getPlayer();
+            if (Permissions.OPENONLINE.hasPermission(player)) {
+                onlineTarget = target.getPlayer();
+            } else {
+                plugin.sendMessage(player, "messages.error.permissionPlayerOnline");
+                return;
+            }
        }

        if (onlineTarget == null) {
@@ -0,0 +1,249 @@
+/*
+ * 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.commands;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.commands.search.ChunkSearchOption;
+import com.lishid.openinv.commands.search.CompletableOption;
+import com.lishid.openinv.commands.search.ItemAmountOption;
+import com.lishid.openinv.commands.search.ItemEnchantOption;
+import com.lishid.openinv.commands.search.ItemTypeOption;
+import com.lishid.openinv.commands.search.PlayerSearchOption;
+import com.lishid.openinv.commands.search.PseudoOption;
+import com.lishid.openinv.search.Search;
+import com.lishid.openinv.search.bucket.SearchBucket;
+import com.lishid.openinv.search.match.ItemMatcher;
+import com.lishid.openinv.search.match.MatchableItem;
+import com.lishid.openinv.search.match.MatchableMeta;
+import com.lishid.openinv.util.PseudoJson;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class SearchCommand implements TabExecutor {
+
+    private final OpenInv plugin;
+    private final Collection<String> activeSearches = Collections.newSetFromMap(new ConcurrentHashMap<>());
+
+    private final Collection<CompletableOption<SearchBucket>> completableSearchBuckets = new HashSet<>();
+    private final Collection<CompletableOption<MatchableItem>> completableMatchOptions = new HashSet<>();
+    private final Collection<CompletableOption<MatchableMeta>> completableMatchMetaOptions = new HashSet<>();
+
+    public SearchCommand(OpenInv plugin) {
+        this.plugin = plugin;
+
+        this.completableSearchBuckets.add(new ChunkSearchOption());
+        this.completableSearchBuckets.add(new PlayerSearchOption(plugin));
+        this.completableMatchOptions.add(new ItemAmountOption());
+        this.completableMatchOptions.add(new ItemTypeOption());
+        this.completableMatchMetaOptions.add(new ItemEnchantOption());
+    }
+
+    @Override
+    public boolean onCommand(
+            @NotNull CommandSender sender,
+            @NotNull Command command,
+            @NotNull String label,
+            @NotNull String[] args) {
+
+        if (args.length < 2) {
+            return false;
+        }
+
+        String id = sender instanceof Player ? plugin.getPlayerID((Player) sender) : "CONSOLE";
+
+        if (activeSearches.contains(id)) {
+            plugin.sendMessage(sender, "messages.error.search.activeSearch");
+            return true;
+        }
+
+        Collection<PseudoJson> arguments = new HashSet<>();
+        for (String arg : args) {
+            arg = arg.toLowerCase(Locale.ROOT);
+            try {
+                arguments.add(PseudoJson.fromString(arg));
+            } catch (IllegalArgumentException e) {
+                plugin.sendMessage(sender, "messages.error.search.invalidSchema", "%value%", arg);
+                return true;
+            }
+        }
+
+        Collection<SearchBucket> searchBuckets = getSearchBuckets(sender, arguments);
+
+        if (searchBuckets.isEmpty()) {
+            plugin.sendMessage(sender, "messages.error.search.invalidInventory");
+            return true;
+        }
+
+        ItemMatcher matcher = getMatcher(sender, arguments);
+
+        if (matcher == null) {
+            plugin.sendMessage(sender, "messages.error.search.invalidMatcher");
+            return true;
+        }
+
+        activeSearches.add(id);
+
+        new Search(matcher, searchBuckets, () -> activeSearches.remove(id)).schedule(sender, plugin);
+
+        return true;
+    }
+
+    private @Nullable ItemMatcher getMatcher(@NotNull CommandSender sender, @NotNull Collection<PseudoJson> args) {
+        List<PseudoOption<MatchableItem>> matchItemOptions = new ArrayList<>();
+        List<PseudoOption<MatchableMeta>> matchMetaOptions = new ArrayList<>();
+
+
+        for (PseudoJson arg : args) {
+            addMatchOptions(completableMatchOptions, matchItemOptions, sender, arg);
+            addMatchOptions(completableMatchMetaOptions, matchMetaOptions, sender, arg);
+        }
+
+        // Must have a match option. Null entries indicate a parsing error.
+        if (matchItemOptions.isEmpty()
+                || matchItemOptions.stream().anyMatch(Objects::isNull)
+                || matchMetaOptions.stream().anyMatch(Objects::isNull)) {
+            return null;
+        }
+
+        return new ItemMatcher(
+                matchItemOptions.stream().map(PseudoOption::option).toList(),
+                matchMetaOptions.stream().map(PseudoOption::option).toList());
+    }
+
+    private <T> void addMatchOptions(
+            @NotNull Collection<CompletableOption<T>> completableOptions,
+            @NotNull Collection<PseudoOption<T>> options,
+            @NotNull CommandSender sender,
+            @NotNull PseudoJson arg) {
+        for (CompletableOption<T> option : completableOptions) {
+            if (option.matches(sender, arg)) {
+                PseudoOption<T> parsed = option.parse(sender, arg);
+                if (parsed == null) {
+                    options.add(null);
+                    continue;
+                }
+
+                if (option.isUnique()) {
+                    String uniqueId = option.getName();
+
+                    // Match existing options.
+                    List<PseudoOption<T>> matches = options.stream()
+                            .filter(Objects::nonNull)
+                            .filter(bucket -> bucket.pseudoJson().getIdentifier().equals(uniqueId))
+                            .collect(Collectors.toList());
+
+                    // Remove all existing options.
+                    options.removeAll(matches);
+
+                    // Merge with existing options.
+                    for (PseudoOption<T> match : matches) {
+                        PseudoOption<T> newParsed = option.merge(sender, match, parsed);
+                        if (newParsed != null) {
+                            parsed = newParsed;
+                        }
+                    }
+                }
+                options.add(parsed);
+            }
+        }
+    }
+
+    private Collection<SearchBucket> getSearchBuckets(
+            @NotNull CommandSender sender,
+            @NotNull Collection<PseudoJson> args) {
+        List<PseudoOption<SearchBucket>> buckets = new ArrayList<>();
+
+        for (PseudoJson arg : args) {
+            addMatchOptions(completableSearchBuckets, buckets, sender, arg);
+        }
+
+        return buckets.stream().map(PseudoOption::option).collect(Collectors.toList());
+    }
+
+    @Override
+    public @Nullable List<String> onTabComplete(
+            @NotNull CommandSender sender,
+            @NotNull Command command,
+            @NotNull String label,
+            @NotNull String[] args) {
+
+        List<PseudoJson> arguments = new ArrayList<>();
+
+        for (int i = 0; i < args.length; i++) {
+            String arg = args[i].toLowerCase(Locale.ROOT);
+            try {
+                arguments.add(PseudoJson.fromString(arg));
+            } catch (IllegalArgumentException e) {
+                if (i == args.length - 1) {
+                    // If last argument cannot be parsed, do not complete.
+                    return List.of();
+                }
+                // Otherwise, ignore formatting issues during tab completion.
+            }
+
+        }
+
+        // Ensure an argument exists.
+        if (arguments.isEmpty()) {
+            arguments.add(new PseudoJson(""));
+        }
+
+        // Remove last indexed argument, it is being completed.
+        PseudoJson last = arguments.remove(arguments.size() - 1);
+
+        // Due to generics, can't just use generic list of options to start with.
+        Collection<PseudoOption<SearchBucket>> buckets = new HashSet<>();
+        Collection<PseudoOption<MatchableItem>> items = new HashSet<>();
+        Collection<PseudoOption<MatchableMeta>> metas = new HashSet<>();
+        for (PseudoJson arg : arguments) {
+            addMatchOptions(completableSearchBuckets, buckets, sender, arg);
+            addMatchOptions(completableMatchOptions, items, sender, arg);
+            addMatchOptions(completableMatchMetaOptions, metas, sender, arg);
+        }
+        Collection<PseudoOption<?>> options = new HashSet<>();
+        options.addAll(buckets);
+        options.addAll(items);
+        options.addAll(metas);
+
+        // Suggest all completable options' completions.
+        return Stream.concat(completableSearchBuckets.stream(),
+                Stream.concat(completableMatchOptions.stream(),
+                        completableMatchMetaOptions.stream()))
+                // Don't suggest unique options that are already present.
+                .filter(option ->
+                        option.isUnique() && options.stream().anyMatch(pseudoOption ->
+                                pseudoOption.pseudoJson().getIdentifier().equals(option.getName())))
+                .flatMap(option -> option.suggestOptions(sender, last).stream())
+                .distinct()
+                .toList();
+    }
+
+}
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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.commands;
-
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.util.TabCompleter;
-import java.util.Collections;
-import java.util.List;
-import org.bukkit.Chunk;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.BlockState;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Command for searching containers in a radius of chunks.
- */
-public class SearchContainerCommand implements TabExecutor {
-
-    private final OpenInv plugin;
-
-    public SearchContainerCommand(OpenInv plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (!(sender instanceof Player)) {
-            plugin.sendMessage(sender, "messages.error.consoleUnsupported");
-            return true;
-        }
-
-        if (args.length < 1) {
-            // Must supply material
-            return false;
-        }
-
-        Material material = Material.getMaterial(args[0].toUpperCase());
-
-        if (material == null) {
-            plugin.sendMessage(sender, "messages.error.invalidMaterial", "%target%", args[0]);
-            return false;
-        }
-
-        int radius = 5;
-
-        if (args.length > 1) {
-            try {
-                radius = Integer.parseInt(args[1]);
-            } catch (NumberFormatException e) {
-                // Invalid radius supplied
-                return false;
-            }
-        }
-
-        Player senderPlayer = (Player) sender;
-        World world = senderPlayer.getWorld();
-        Chunk centerChunk = senderPlayer.getLocation().getChunk();
-        StringBuilder locations = new StringBuilder();
-
-        for (int dX = -radius; dX <= radius; ++dX) {
-            for (int dZ = -radius; dZ <= radius; ++dZ) {
-                if (!world.loadChunk(centerChunk.getX() + dX, centerChunk.getZ() + dZ, false)) {
-                    continue;
-                }
-                Chunk chunk = world.getChunkAt(centerChunk.getX() + dX, centerChunk.getZ() + dZ);
-                for (BlockState tileEntity : chunk.getTileEntities()) {
-                    if (!(tileEntity instanceof InventoryHolder)) {
-                        continue;
-                    }
-                    InventoryHolder holder = (InventoryHolder) tileEntity;
-                    if (!holder.getInventory().contains(material)) {
-                        continue;
-                    }
-                    locations.append(holder.getInventory().getType().name().toLowerCase()).append(" (")
-                            .append(tileEntity.getX()).append(',').append(tileEntity.getY()).append(',')
-                            .append(tileEntity.getZ()).append("), ");
-                }
-            }
-        }
-
-        // Matches found, delete trailing comma and space
-        if (locations.length() > 0) {
-            locations.delete(locations.length() - 2, locations.length());
-        } else {
-            plugin.sendMessage(sender, "messages.info.container.noMatches",
-                    "%target%", material.name());
-            return true;
-        }
-
-        plugin.sendMessage(sender, "messages.info.container.matches",
-                "%target%", material.name(), "%detail%", locations.toString());
-        return true;
-    }
-
-    @Override
-    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
-        if (args.length < 1 || args.length > 2 || !command.testPermissionSilent(sender)) {
-            return Collections.emptyList();
-        }
-
-        String argument = args[args.length - 1];
-        if (args.length == 1) {
-            return TabCompleter.completeEnum(argument, Material.class);
-        } else {
-            return TabCompleter.completeInteger(argument);
-        }
-    }
-
-}
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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.commands;
-
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.util.TabCompleter;
-import java.util.Collections;
-import java.util.List;
-import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Command adding the ability to search online players' inventories for enchantments of a specific
- * type at or above the level specified.
- *
- * @author Jikoo
- */
-public class SearchEnchantCommand implements TabExecutor {
-
-    private final OpenInv plugin;
-
-    public SearchEnchantCommand(OpenInv plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length == 0) {
-            return false;
-        }
-
-        Enchantment enchant = null;
-        int level = 0;
-
-        for (String argument : args) {
-            try {
-                level = Integer.parseInt(argument);
-                continue;
-            } catch (NumberFormatException ignored) {}
-
-            argument = argument.toLowerCase();
-            int colon = argument.indexOf(':');
-            NamespacedKey key;
-            try {
-                if (colon > -1 && colon < argument.length() - 1) {
-                    key = new NamespacedKey(argument.substring(0, colon), argument.substring(colon + 1));
-                } else {
-                    key = NamespacedKey.minecraft(argument);
-                }
-            } catch (IllegalArgumentException ignored) {
-                continue;
-            }
-
-            Enchantment localEnchant = Enchantment.getByKey(key);
-            if (localEnchant != null) {
-                enchant = localEnchant;
-            }
-        }
-
-        // Arguments not set correctly
-        if (level == 0 && enchant == null) {
-            return false;
-        }
-
-        StringBuilder players = new StringBuilder();
-        for (Player player : plugin.getServer().getOnlinePlayers()) {
-            boolean flagInventory = containsEnchantment(player.getInventory(), enchant, level);
-            boolean flagEnder = containsEnchantment(player.getEnderChest(), enchant, level);
-
-            // No matches, continue
-            if (!flagInventory && !flagEnder) {
-                continue;
-            }
-
-            // Matches, append details
-            players.append(player.getName()).append(" (");
-            if (flagInventory) {
-                players.append("inv");
-            }
-            if (flagEnder) {
-                if (flagInventory) {
-                    players.append(',');
-                }
-                players.append("ender");
-            }
-            players.append("), ");
-        }
-
-        if (players.length() > 0) {
-            // 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);
-            return true;
-        }
-
-        plugin.sendMessage(sender, "messages.info.player.matches",
-                "%target%", (enchant != null ? enchant.getKey().toString() : "") + " >= " + level,
-                "%detail%", players.toString());
-        return true;
-    }
-
-    private boolean containsEnchantment(Inventory inventory, Enchantment enchant, int minLevel) {
-        for (ItemStack item : inventory.getContents()) {
-            if (item == null || item.getType() == Material.AIR) {
-                continue;
-            }
-            if (enchant != null) {
-                if (item.containsEnchantment(enchant) && item.getEnchantmentLevel(enchant) >= minLevel) {
-                    return true;
-                }
-            } else {
-                if (!item.hasItemMeta()) {
-                    continue;
-                }
-                ItemMeta meta = item.getItemMeta();
-                if (meta == null || !meta.hasEnchants()) {
-                    continue;
-                }
-                for (int enchLevel : meta.getEnchants().values()) {
-                    if (enchLevel >= minLevel) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (!command.testPermissionSilent(sender) || args.length < 1 || args.length > 2) {
-            return Collections.emptyList();
-        }
-
-        if (args.length == 1) {
-            return TabCompleter.completeObject(args[0], enchantment -> enchantment.getKey().toString(), Enchantment.values());
-        } else {
-            return TabCompleter.completeInteger(args[1]);
-        }
-    }
-
-}
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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.commands;
-
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.util.TabCompleter;
-import java.util.Collections;
-import java.util.List;
-import org.bukkit.Material;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class SearchInvCommand implements TabExecutor {
-
-    private final OpenInv plugin;
-
-    public SearchInvCommand(OpenInv plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-
-        Material material = null;
-        int count = 1;
-
-        if (args.length >= 1) {
-            material = Material.getMaterial(args[0].toUpperCase());
-        }
-
-        if (args.length >= 2) {
-            try {
-                count = Integer.parseInt(args[1]);
-            } catch (NumberFormatException ex) {
-                plugin.sendMessage(sender, "messages.error.invalidNumber", "%target%", args[1]);
-                return false;
-            }
-        }
-
-        if (material == null) {
-            plugin.sendMessage(sender, "messages.error.invalidMaterial", "%target%", args[0]);
-            return false;
-        }
-
-        StringBuilder players = new StringBuilder();
-        boolean searchInv = command.getName().equals("searchinv");
-        for (Player player : plugin.getServer().getOnlinePlayers()) {
-            Inventory inventory = searchInv ? player.getInventory() : player.getEnderChest();
-            if (inventory.contains(material, count)) {
-                players.append(player.getName()).append(", ");
-            }
-        }
-
-        // Matches found, delete trailing comma and space
-        if (players.length() > 0) {
-            players.delete(players.length() - 2, players.length());
-        } else {
-            plugin.sendMessage(sender, "messages.info.player.noMatches",
-                    "%target%", material.name());
-            return true;
-        }
-
-        plugin.sendMessage(sender, "messages.info.player.matches",
-                "%target%", material.name(), "%detail%", players.toString());
-        return true;
-    }
-
-    @Override
-    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length < 1 || args.length > 2 || !command.testPermissionSilent(sender)) {
-            return Collections.emptyList();
-        }
-
-        String argument = args[args.length - 1];
-        if (args.length == 1) {
-            return TabCompleter.completeEnum(argument, Material.class);
-        } else {
-            return TabCompleter.completeInteger(argument);
-        }
-    }
-
-}
@@ -0,0 +1,125 @@
+/*
+ * 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.commands.search;
+
+import com.lishid.openinv.search.bucket.ChunkBucket;
+import com.lishid.openinv.search.bucket.SearchBucket;
+import com.lishid.openinv.util.Permissions;
+import com.lishid.openinv.util.PseudoJson;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class ChunkSearchOption implements CompletableOption<SearchBucket> {
+
+    @Override
+    public @NotNull String getName() {
+        return "chunk";
+    }
+
+    @Override
+    public boolean matches(@NotNull CommandSender sender, @NotNull PseudoJson pseudoJson) {
+        return CompletableOption.super.matches(sender, pseudoJson)
+                && Permissions.SEARCH_CHUNKS_LOADED.hasPermission(sender);
+    }
+
+    @Override
+    public @Nullable PseudoOption<SearchBucket> parse(@NotNull CommandSender sender, @NotNull PseudoJson pseudoJson) {
+        World world = null;
+        Integer chunkX = null;
+        Integer chunkZ = null;
+        int chunkRadius = 5;
+        boolean chunkLoad = false;
+        Map<String, String> mappings = pseudoJson.getMappings();
+
+        if (!(sender instanceof Player senderPlayer)) {
+            if (mappings.size() < 3) {
+                // Console must specify world, x center, z center.
+                return null;
+            }
+        } else {
+            world = senderPlayer.getWorld();
+            Chunk senderChunk = senderPlayer.getLocation().getChunk();
+            chunkX = senderChunk.getX();
+            chunkZ = senderChunk.getZ();
+        }
+
+        for (Map.Entry<String, String> entry : mappings.entrySet()) {
+            String key = entry.getKey();
+            String value = entry.getValue();
+
+            if (key.indexOf('w') >= 0) {
+                world = null;
+                // Name should always be lower case by this point. Ignore case when selecting world.
+                for (World loaded : Bukkit.getWorlds()) {
+                    if (loaded.getName().equalsIgnoreCase(value)) {
+                        world = loaded;
+                        break;
+                    }
+                }
+            } else if (key.indexOf('x') >= 0) {
+                try {
+                    chunkX = Integer.parseInt(value);
+                } catch (NumberFormatException e) {
+                    chunkX = null;
+                }
+            } else if (key.indexOf('z') >= 0) {
+                try {
+                    chunkZ = Integer.parseInt(value);
+                } catch (NumberFormatException e) {
+                    chunkZ = null;
+                }
+            } else if (key.indexOf('r') >= 0) {
+                // R is for radius. Needs to be checked later so that "world" doesn't result in a false positive.
+                try {
+                    chunkRadius = Integer.parseInt(value);
+                } catch (NumberFormatException e) {
+                    // Fall through to default radius.
+                }
+            } else if (key.indexOf('l') >= 0) {
+                // L is for loaded. Needs to be checked later so that "world" doesn't result in a false positive.
+                chunkLoad = Permissions.SEARCH_CHUNKS_UNLOADED.hasPermission(sender) && Boolean.parseBoolean(value);
+            }
+        }
+
+        if (world == null || chunkX == null || chunkZ == null || chunkRadius < 0) {
+            // Invalid data provided.
+            return null;
+        }
+
+        return new PseudoOption<>(pseudoJson, new ChunkBucket(world, chunkX, chunkZ, chunkRadius, chunkLoad));
+    }
+
+    @Override
+    public @NotNull Collection<String> suggestOptions(@NotNull CommandSender sender, @NotNull PseudoJson pseudoJson) {
+        // TODO
+        return Set.of();
+    }
+
+    @Override
+    public boolean isUnique() {
+        return false;
+    }
+
+}
@@ -0,0 +1,110 @@
+/*
+ * 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.commands.search;
+
+import com.lishid.openinv.util.PseudoJson;
+import java.util.Collection;
+import java.util.Locale;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Interface defining behavior for an option.
+ *
+ * @param <T> the type of option represented
+ */
+public interface CompletableOption<T> {
+
+    /**
+     * Get unique identifier representing the option.
+     *
+     * @return the unique identifier
+     */
+    @NotNull String getName();
+
+    /**
+     * Check if the <code>CompletableOption</code> matches the given <code>PseudoJson</code>.
+     *
+     * @param sender the individual using the option
+     * @param pseudoJson the pseudo-JSON element
+     * @return true if the CompletableOption matches
+     */
+    default boolean matches(@NotNull CommandSender sender, @NotNull PseudoJson pseudoJson) {
+        return pseudoJson.getIdentifier().toLowerCase(Locale.ROOT).startsWith(getName());
+    }
+
+    /**
+     * Parse the option represented from the given <code>PseudoJson</code>.
+     *
+     * @param sender the individual using the option
+     * @param pseudoJson the pseudo-JSON element
+     * @return the parsed options
+     */
+    @Nullable PseudoOption<T> parse(@NotNull CommandSender sender, @NotNull PseudoJson pseudoJson);
+
+    /**
+     * Form a collection of viable permutations to suggest for the given <code>PseudoJson</code>.
+     *
+     * @param sender the individual to suggest options for
+     * @param pseudoJson the parsed pseudo-JSON
+     * @return the suggested permutations
+     */
+    @NotNull Collection<String> suggestOptions(
+            @NotNull CommandSender sender,
+            @NotNull PseudoJson pseudoJson);
+
+    /**
+     * Get whether or not multiple different copies of this <code>CompletableOption</code> are allowed.
+     *
+     * @return true if only a single instance is allowed
+     */
+    boolean isUnique();
+
+    /**
+     * Merge similar elements. Used to enforce {@link #isUnique()} despite multiples being provided.
+     *
+     * @param sender the individual using the options
+     * @param first the first parsed option
+     * @param second the second parsed option
+     * @return a single element containing a best-effort merge of both
+     */
+    default @Nullable PseudoOption<T> merge(
+            @NotNull CommandSender sender,
+            @NotNull PseudoOption<?> first,
+            @NotNull PseudoOption<?> second) {
+        PseudoJson merge = new PseudoJson(first.pseudoJson().getIdentifier());
+
+        // Use mappings of first for our base.
+        first.pseudoJson().getMappings().forEach(merge::put);
+        // Overwrite with second.
+        second.pseudoJson().getMappings().forEach(merge::put);
+
+        // Parse merged options.
+        PseudoOption<T> parsed = parse(sender, merge);
+
+        if (parsed != null) {
+            return parsed;
+        }
+
+        // On parsing failure, try second instead.
+        merge = new PseudoJson(second.pseudoJson().getIdentifier(), merge.getMappings());
+
+        return parse(sender, merge);
+    }
+
+}
@@ -0,0 +1,84 @@
+/*
+ * 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.commands.search;
+
+import com.lishid.openinv.search.match.ItemMatchables;
+import com.lishid.openinv.search.match.MatchableItem;
+import com.lishid.openinv.util.PseudoJson;
+import com.lishid.openinv.util.TabCompleter;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.bukkit.command.CommandSender;
+import org.bukkit.util.StringUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class ItemAmountOption implements CompletableOption<MatchableItem> {
+
+    @Override
+    public @NotNull String getName() {
+        return "amount";
+    }
+
+    @Override
+    public @Nullable PseudoOption<MatchableItem> parse(@NotNull CommandSender sender, @NotNull PseudoJson pseudoJson) {
+        String minAmountString = pseudoJson.getMappings().entrySet().stream().findFirst().map(Map.Entry::getValue).orElse(null);
+        if (minAmountString == null) {
+            // Amount not correctly specified. Warn about spec.
+            return null;
+        }
+        int minAmount;
+        try {
+            minAmount = Integer.parseInt(minAmountString);
+        } catch (NumberFormatException e) {
+            // Amount can't be parsed. Warn about spec.
+            return null;
+        }
+
+        return new PseudoOption<>(pseudoJson, ItemMatchables.hasAmount(minAmount));
+    }
+
+    @Override
+    public @NotNull Collection<String> suggestOptions(@NotNull CommandSender sender, @NotNull PseudoJson pseudoJson) {
+        // TODO combine with type
+        if (!pseudoJson.getIdentifier().equals(getName())) {
+            // Suggest name while unformed.
+            if (StringUtil.startsWithIgnoreCase(getName(), pseudoJson.getIdentifier())) {
+                return Set.of(getName() + ":");
+            }
+            // If name is not a valid suggestion, suggest nothing.
+            return Set.of();
+        }
+
+        String minAmountString = pseudoJson.getMappings().entrySet().stream().findFirst().map(Map.Entry::getValue).orElse("");
+
+        // Find and suggest name in full pseudojson.
+        return TabCompleter.completeInteger(minAmountString).stream().map(match -> {
+            PseudoJson amount = new PseudoJson(getName());
+            amount.put(getName(), match);
+            return amount;
+        }).map(PseudoJson::asString).collect(Collectors.toSet());
+    }
+
+    @Override
+    public boolean isUnique() {
+        return true;
+    }
+
+}
@@ -0,0 +1,137 @@
+/*
+ * 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.commands.search;
+
+import com.github.jikoo.planarwrappers.util.StringConverters;
+import com.lishid.openinv.search.match.ItemMatchables;
+import com.lishid.openinv.search.match.MatchableMeta;
+import com.lishid.openinv.util.PseudoJson;
+import com.lishid.openinv.util.TabCompleter;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.bukkit.command.CommandSender;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.util.StringUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class ItemEnchantOption implements CompletableOption<MatchableMeta> {
+
+    @Override
+    public @NotNull String getName() {
+        return "enchant";
+    }
+
+    @Override
+    public @Nullable PseudoOption<MatchableMeta> parse(@NotNull CommandSender sender, @NotNull PseudoJson pseudoJson) {
+        Enchantment enchantment = null;
+        Integer enchantLevel = null;
+        for (Map.Entry<String, String> entry : pseudoJson.getMappings().entrySet()) {
+            if (entry.getValue().isBlank()) {
+                continue;
+            }
+            if (entry.getKey().indexOf('l') >= 0) {
+                try {
+                    enchantLevel = Integer.parseInt(entry.getValue());
+                } catch (NumberFormatException e) {
+                    // Level can't be parsed. Warn about spec.
+                    return null;
+                }
+            }
+            if (entry.getKey().indexOf('t') >= 0) {
+                enchantment = StringConverters.toEnchant(entry.getValue());
+                if (enchantment == null) {
+                    // Enchantment is specified but can't be parsed. Warn about spec.
+                    return null;
+                }
+            }
+        }
+
+        return new PseudoOption<>(pseudoJson, ItemMatchables.hasEnchant(enchantment, enchantLevel));
+    }
+
+    @Override
+    public @NotNull Collection<String> suggestOptions(@NotNull CommandSender sender, @NotNull PseudoJson pseudoJson) {
+        if (!pseudoJson.getIdentifier().equals(getName())) {
+            if (!StringUtil.startsWithIgnoreCase(getName(), pseudoJson.getIdentifier())) {
+                // If enchant is not a valid suggestion, suggest nothing.
+                return Set.of();
+            }
+
+            // Suggest all options while unformed.
+            Set<String> set = new HashSet<>();
+            PseudoJson enchant = new PseudoJson(getName());
+            set.add(enchant.asString());
+            enchant.put("type", "");
+            set.add(enchant.asString());
+            enchant.put("level", "");
+            set.add(enchant.asString());
+            enchant.remove("type");
+            set.add(enchant.asString());
+            return set;
+        }
+
+        Collection<String> enchantments = null;
+        Integer enchantLevel = null;
+        for (Map.Entry<String, String> entry : pseudoJson.getMappings().entrySet()) {
+            if (entry.getValue().isBlank()) {
+                continue;
+            }
+            if (entry.getKey().indexOf('l') >= 0) {
+                try {
+                    enchantLevel = Integer.parseInt(entry.getValue());
+                } catch (NumberFormatException e) {
+                    // Level is present but cannot be parsed. Default 0.
+                    enchantLevel = 0;
+                }
+            }
+            if (entry.getKey().indexOf('t') >= 0) {
+                Enchantment enchant = StringConverters.toEnchant(entry.getValue());
+                if (enchant == null) {
+                    // Enchantment is specified but can't be parsed, tab complete.
+                    enchantments = TabCompleter.completeKeyed(entry.getValue(), Enchantment.values());
+                } else {
+                    enchantments = Set.of(entry.getValue());
+                }
+            }
+        }
+
+        PseudoJson enchant = new PseudoJson(getName());
+        if (enchantLevel != null) {
+            enchant.put("level", String.valueOf(enchantLevel));
+        }
+
+        if (enchantments == null) {
+            return Set.of(enchant.asString());
+        }
+
+        return enchantments.stream().map(enchantment -> {
+            // Reuse is fine, single-threaded.
+            enchant.put("type", enchantment);
+            return enchant;
+        }).map(PseudoJson::asString).collect(Collectors.toSet());
+    }
+
+    @Override
+    public boolean isUnique() {
+        return false;
+    }
+
+}
@@ -0,0 +1,78 @@
+/*
+ * 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.commands.search;
+
+import com.github.jikoo.planarwrappers.util.StringConverters;
+import com.lishid.openinv.search.match.ItemMatchables;
+import com.lishid.openinv.search.match.MatchableItem;
+import com.lishid.openinv.util.PseudoJson;
+import com.lishid.openinv.util.TabCompleter;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.util.StringUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class ItemTypeOption implements CompletableOption<MatchableItem> {
+
+    @Override
+    public @NotNull String getName() {
+        return "type";
+    }
+
+    @Override
+    public @Nullable PseudoOption<MatchableItem> parse(@NotNull CommandSender sender, @NotNull PseudoJson pseudoJson) {
+        String typeName = pseudoJson.getMappings().entrySet().stream().findFirst().map(Map.Entry::getValue).orElse(null);
+        Material material = StringConverters.toMaterial(typeName);
+        if (material == null) {
+            // Invalid material, warn about matcher spec.
+            return null;
+        }
+        return new PseudoOption<>(pseudoJson, ItemMatchables.isType(material));
+    }
+
+    @Override
+    public @NotNull Collection<String> suggestOptions(@NotNull CommandSender sender, @NotNull PseudoJson pseudoJson) {
+        if (!pseudoJson.getIdentifier().equals(getName())) {
+            // Suggest name while unformed.
+            if (StringUtil.startsWithIgnoreCase(getName(), pseudoJson.getIdentifier())) {
+                return Set.of(getName() + ":");
+            }
+            // If name is not a valid suggestion, suggest nothing.
+            return Set.of();
+        }
+
+        String typeName = pseudoJson.getMappings().entrySet().stream().findFirst().map(Map.Entry::getValue).orElse("");
+
+        // Find and suggest matching types in full pseudojson.
+        return TabCompleter.completeMaterial(typeName).stream().map(match -> {
+            PseudoJson type = new PseudoJson(getName());
+            type.put(getName(), match);
+            return type;
+        }).map(PseudoJson::asString).collect(Collectors.toSet());
+    }
+
+    @Override
+    public boolean isUnique() {
+        return true;
+    }
+
+}
@@ -0,0 +1,75 @@
+/*
+ * 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.commands.search;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.search.bucket.PlayerBucket;
+import com.lishid.openinv.search.bucket.SearchBucket;
+import com.lishid.openinv.util.Permissions;
+import com.lishid.openinv.util.PseudoJson;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class PlayerSearchOption implements CompletableOption<SearchBucket> {
+
+    private final OpenInv plugin;
+
+    public PlayerSearchOption(OpenInv plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public @NotNull String getName() {
+        return "player";
+    }
+
+    @Override
+    public boolean matches(@NotNull CommandSender sender, @NotNull PseudoJson pseudoJson) {
+        return CompletableOption.super.matches(sender, pseudoJson)
+                && Permissions.SEARCH_PLAYERS_ONLINE.hasPermission(sender);
+    }
+
+    @Override
+    public @Nullable PseudoOption<SearchBucket> parse(@NotNull CommandSender sender, @NotNull PseudoJson pseudoJson) {
+        Optional<Boolean> optional = pseudoJson.getMappings().entrySet().stream()
+                .filter(entry -> entry.getKey().contains("offline"))
+                .findFirst()
+                .map(Map.Entry::getValue)
+                .map(Boolean::parseBoolean);
+
+        return new PseudoOption<>(
+                pseudoJson, new PlayerBucket(plugin,
+                !(optional.orElse(false) && Permissions.SEARCH_PLAYERS_OFFLINE.hasPermission(sender))));
+    }
+
+    @Override
+    public @NotNull Collection<String> suggestOptions(@NotNull CommandSender sender, @NotNull PseudoJson pseudoJson) {
+        // TODO
+        return Set.of();
+    }
+
+    @Override
+    public boolean isUnique() {
+        return true;
+    }
+
+}
@@ -0,0 +1,27 @@
+/*
+ * 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.commands.search;
+
+import com.lishid.openinv.util.PseudoJson;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Data holder for completable options.
+ *
+ * @param <T> the type of data
+ */
+public record PseudoOption<T>(@NotNull PseudoJson pseudoJson, @NotNull T option) {}
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -32,8 +32,14 @@ public interface IPlayerDataManager {
     * @param offline the OfflinePlayer
     * @return the Player loaded
     */
-    @Nullable
-    Player loadPlayer(@NotNull OfflinePlayer offline);
+    @Nullable Player loadPlayer(@NotNull OfflinePlayer offline);
+
+    /**
+     * Creates a new Player from an existing one that will function slightly better offline.
+     *
+     * @return the Player
+     */
+    @NotNull Player inject(@NotNull Player player);

    /**
     * Opens an ISpecialInventory for a Player.
@@ -43,14 +49,18 @@ public interface IPlayerDataManager {
     *`
     * @return the InventoryView opened
     */
-    @Nullable
-    InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory);
+    @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory);

-    void sendSystemMessage(@NotNull Player player, @NotNull String message);
-
-    @NotNull
-    default String getLocale(Player player) {
-        return player.getLocale();
-    }
+    /**
+     * Convert a raw slot number into a player inventory slot number.
+     *
+     * <p>Note that this method is specifically for converting an ISpecialPlayerInventory slot number into a regular
+     * player inventory slot number.
+     *
+     * @param view the open inventory view
+     * @param rawSlot the raw slot in the view
+     * @return the converted slot number
+     */
+    int convertToPlayerSlot(InventoryView view, int rawSlot);

 }
@@ -0,0 +1,83 @@
+/*
+ * 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;
+
+import com.lishid.openinv.OpenInv;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.jetbrains.annotations.NotNull;
+
+public class OpenInventoryView extends InventoryView {
+
+    private final Player player;
+    private final ISpecialInventory inventory;
+    private final String titleKey;
+    private final String titleDefaultSuffix;
+    private String title;
+
+    public OpenInventoryView(Player player, ISpecialInventory inventory, String titleKey, String titleDefaultSuffix) {
+        this.player = player;
+        this.inventory = inventory;
+        this.titleKey = titleKey;
+        this.titleDefaultSuffix = titleDefaultSuffix;
+    }
+
+    @Override
+    public @NotNull Inventory getTopInventory() {
+        return inventory.getBukkitInventory();
+    }
+
+    @Override
+    public @NotNull Inventory getBottomInventory() {
+        return getPlayer().getInventory();
+    }
+
+    @Override
+    public @NotNull HumanEntity getPlayer() {
+        return player;
+    }
+
+    @Override
+    public @NotNull InventoryType getType() {
+        return inventory.getBukkitInventory().getType();
+    }
+
+    @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;
+            }
+        }
+
+        return title;
+    }
+
+}
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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.util.InventoryAccess;
-import com.lishid.openinv.util.Permissions;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.inventory.Inventory;
-
-public class InventoryClickListener implements Listener {
-
-    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
-    public void onInventoryClick(InventoryClickEvent event) {
-        HumanEntity entity = event.getWhoClicked();
-        Inventory inventory = event.getInventory();
-        if (InventoryAccess.isPlayerInventory(inventory) && !Permissions.EDITINV.hasPermission(entity)
-                || InventoryAccess.isEnderChest(inventory) && !Permissions.EDITENDER.hasPermission(entity)) {
-            event.setCancelled(true);
-        }
-    }
-
-}
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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.IOpenInv;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-
-public class InventoryCloseListener implements Listener {
-
-    private final IOpenInv plugin;
-
-    public InventoryCloseListener(final IOpenInv plugin) {
-        this.plugin = plugin;
-    }
-
-    @EventHandler
-    public void onInventoryClose(final InventoryCloseEvent event) {
-        if (!(event.getPlayer() instanceof Player)) {
-            return;
-        }
-
-        Player player = (Player) event.getPlayer();
-
-        if (this.plugin.getPlayerSilentChestStatus(player)) {
-            this.plugin.getAnySilentContainer().deactivateContainer(player);
-        }
-    }
-
-}
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2011-2020 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.util.InventoryAccess;
-import com.lishid.openinv.util.Permissions;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryDragEvent;
-import org.bukkit.inventory.Inventory;
-
-/**
- * Listener for InventoryDragEvents to prevent unpermitted modification of special inventories.
- *
- * @author Jikoo
- */
-public class InventoryDragListener implements Listener {
-
-    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
-    public void onInventoryDrag(InventoryDragEvent event) {
-        HumanEntity entity = event.getWhoClicked();
-        Inventory inventory = event.getInventory();
-        if (InventoryAccess.isPlayerInventory(inventory) && !Permissions.EDITINV.hasPermission(entity)
-                || InventoryAccess.isEnderChest(inventory) && !Permissions.EDITENDER.hasPermission(entity)) {
-            event.setCancelled(true);
-        }
-    }
-
-}
@@ -0,0 +1,205 @@
+/*
+ * 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 com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.util.InventoryAccess;
+import com.lishid.openinv.util.Permissions;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.bukkit.GameMode;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryAction;
+import org.bukkit.event.inventory.InventoryClickEvent;
+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.InventoryView;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Listener for inventory-related events to prevent modification of inventories where not allowed.
+ *
+ * @author Jikoo
+ */
+public class InventoryListener implements Listener {
+
+    private final OpenInv plugin;
+
+    public InventoryListener(final OpenInv plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler
+    public void onInventoryClose(@NotNull final InventoryCloseEvent event) {
+        if (!(event.getPlayer() instanceof Player)) {
+            return;
+        }
+
+        Player player = (Player) event.getPlayer();
+
+        if (this.plugin.getPlayerSilentChestStatus(player)) {
+            this.plugin.getAnySilentContainer().deactivateContainer(player);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onInventoryClick(@NotNull final InventoryClickEvent event) {
+        if (handleInventoryInteract(event)) {
+            return;
+        }
+
+        // Safe cast - has to be a player to be the holder of a special player inventory.
+        Player player = (Player) event.getWhoClicked();
+
+        if (event.getAction() != InventoryAction.MOVE_TO_OTHER_INVENTORY) {
+            // All own-inventory interactions require updates to display properly.
+            // Update in same tick after event completion.
+            this.plugin.getServer().getScheduler().runTask(this.plugin, player::updateInventory);
+            return;
+        }
+
+        // Extra handling for MOVE_TO_OTHER_INVENTORY - apparently Mojang no longer removes the item from the target
+        // inventory prior to adding it to existing stacks.
+        ItemStack currentItem = event.getCurrentItem();
+        if (currentItem == null) {
+            // Other plugin doing some sort of handling (would be NOTHING for null item otherwise), ignore.
+            return;
+        }
+
+        ItemStack clone = currentItem.clone();
+        event.setCurrentItem(null);
+
+        // Complete add action in same tick after event completion.
+        this.plugin.getServer().getScheduler().runTask(this.plugin, () -> {
+            player.getInventory().addItem(clone);
+            player.updateInventory();
+        });
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onInventoryDrag(@NotNull final InventoryDragEvent event) {
+        if (handleInventoryInteract(event)) {
+            return;
+        }
+
+        InventoryView view = event.getView();
+        int topSize = view.getTopInventory().getSize();
+
+        // Get bottom inventory active slots as player inventory slots.
+        Set<Integer> slots = event.getRawSlots().stream()
+                .filter(slot -> slot >= topSize)
+                .map(slot -> plugin.convertToPlayerSlot(view, slot)).collect(Collectors.toSet());
+
+        int overlapLosses = 0;
+
+        // Count overlapping slots.
+        for (Map.Entry<Integer, ItemStack> newItem : event.getNewItems().entrySet()) {
+            int rawSlot = newItem.getKey();
+
+            // Skip bottom inventory slots.
+            if (rawSlot >= topSize) {
+                continue;
+            }
+
+            int convertedSlot = plugin.convertToPlayerSlot(view, rawSlot);
+
+            if (slots.contains(convertedSlot)) {
+                overlapLosses += getCountDiff(view.getItem(rawSlot), newItem.getValue());
+            }
+        }
+
+        // Allow no overlap to proceed as usual.
+        if (overlapLosses < 1) {
+            return;
+        }
+
+        ItemStack cursor = event.getCursor();
+        if (cursor != null) {
+            cursor.setAmount(cursor.getAmount() + overlapLosses);
+        } else {
+            cursor = event.getOldCursor().clone();
+            cursor.setAmount(overlapLosses);
+        }
+
+        event.setCursor(cursor);
+    }
+
+    private int getCountDiff(@Nullable ItemStack original, @NotNull ItemStack result) {
+        if (original == null || original.getType() != result.getType()) {
+            return result.getAmount();
+        }
+
+        return result.getAmount() - original.getAmount();
+    }
+
+    /**
+     * Handle common InventoryInteractEvent functions.
+     *
+     * @param event the InventoryInteractEvent
+     * @return true unless the top inventory is the holder's own inventory
+     */
+    private boolean handleInventoryInteract(@NotNull final InventoryInteractEvent event) {
+        HumanEntity entity = event.getWhoClicked();
+
+        // Un-cancel spectator interactions.
+        if (Permissions.SPECTATE.hasPermission(entity) && entity.getGameMode() == GameMode.SPECTATOR) {
+            event.setCancelled(false);
+        }
+
+        if (event.isCancelled()) {
+            return true;
+        }
+
+        Inventory inventory = event.getView().getTopInventory();
+
+        // Is the inventory a special ender chest?
+        if (InventoryAccess.isEnderChest(inventory)) {
+            // Disallow ender chest interaction for users without edit permission.
+            if (!Permissions.EDITENDER.hasPermission(entity)) {
+                event.setCancelled(true);
+            }
+            return true;
+        }
+
+        ISpecialPlayerInventory playerInventory = InventoryAccess.getPlayerInventory(inventory);
+
+        // Ignore inventories other than special player inventories.
+        if (playerInventory == null) {
+            return true;
+        }
+
+        // Disallow player inventory interaction for users without edit permission.
+        if (!Permissions.EDITINV.hasPermission(entity)) {
+            event.setCancelled(true);
+            return true;
+        }
+
+        // Only specially handle actions in the player's own inventory.
+        return !event.getWhoClicked().equals(playerInventory.getPlayer());
+    }
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -54,6 +54,12 @@ public class PlayerListener implements Listener {

    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onPlayerInteract(PlayerInteractEvent event) {
+
+        // Do not cancel 3rd party plugins' custom events
+        if (!PlayerInteractEvent.class.equals(event.getClass())) {
+            return;
+        }
+
        if (event.getAction() != Action.RIGHT_CLICK_BLOCK || event.getPlayer().isSneaking()
                || event.useInteractedBlock() == Result.DENY || event.getClickedBlock() == null
                || !plugin.getAnySilentContainer().isAnySilentContainer(event.getClickedBlock())) {
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -0,0 +1,210 @@
+/*
+ * 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.search;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.search.bucket.SearchBucket;
+import com.lishid.openinv.search.match.ItemMatcher;
+import com.lishid.openinv.search.match.MatchResult;
+import com.lishid.openinv.search.match.Matchable;
+import com.lishid.openinv.util.MessagePart;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.stream.Collectors;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A search function.
+ */
+public class Search {
+
+    public static final BaseComponent SEPARATOR = new TextComponent(", ");
+
+    private final Set<MessagePart> matches = new HashSet<>();
+    private final ItemMatcher matcher;
+    private final double totalMatchables;
+    private final Iterator<SearchBucket> bucketIterator;
+    private final Runnable callback;
+    private SearchBucket current = null;
+    private int polls = 0;
+
+    public Search(
+            @NotNull ItemMatcher matcher,
+            @NotNull Collection<@NotNull SearchBucket> buckets,
+            @Nullable Runnable callback) {
+        // Just in case, copy contents to new set.
+        Set<SearchBucket> bucketSet = new HashSet<>(buckets);
+        this.matcher = matcher;
+        this.totalMatchables = bucketSet.stream().mapToInt(SearchBucket::size).sum();
+        this.bucketIterator = bucketSet.iterator();
+        this.callback = callback;
+    }
+
+    private boolean isComplete(OpenInv plugin) {
+        if (matches.size() >= plugin.getSearchResultsMax()) {
+            return true;
+        }
+        if (current != null && current.hasNext()) {
+            return false;
+        }
+        while (bucketIterator.hasNext()) {
+            current = bucketIterator.next();
+            if (current.hasNext()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Search the configured amount of Matchables.
+     *
+     * <p>Matchables are assembled asynchronously, then
+     *
+     * @param plugin the OpenInv instance
+     */
+    private void poll(OpenInv plugin) {
+        Collection<Matchable> syncMatchables = new ArrayList<>();
+        // Assemble matchables async, then search synchronously.
+        for (int i = 0; !isComplete(plugin) && i < plugin.getSearchPollsPerTick(); ++i) {
+            ++polls;
+            // Calling #isComplete will advance to next InventoryProvider as necessary.
+            // Bucket matchables for searching synchronously.
+            syncMatchables.add(current.next());
+        }
+
+        Future<Boolean> future = plugin.getServer().getScheduler().callSyncMethod(plugin, () -> {
+            for (Matchable matchable : syncMatchables) {
+                MatchResult match = matchable.match(matcher);
+                if (match.isMatch()) {
+                    matches.addAll(Arrays.asList(match.getMatch()));
+                }
+            }
+            return true;
+        });
+
+        try {
+            future.get();
+        } catch (InterruptedException | ExecutionException e) {
+            // Eat exception to prevent spam.
+        }
+    }
+
+    private void sendProgress(CommandSender sender, OpenInv plugin) {
+        if (!(sender instanceof Player) || polls % (10 * plugin.getSearchPollsPerTick()) != 1) {
+            return;
+        }
+        double progress = 100 * Math.min(polls, totalMatchables) / totalMatchables;
+        DecimalFormat percent = new DecimalFormat("00.0");
+        plugin.sendSystemMessage((Player) sender, "messages.info.search.progress",
+                "%progress%", percent.format(progress),
+                "%matches%", String.valueOf(matches.size()));
+    }
+
+    private void sendResults(CommandSender sender, OpenInv plugin) {
+        if (matches.isEmpty()) {
+            String localizedMessage = plugin.getLocalizedMessage(sender, "messages.info.search.noMatches");
+            if (localizedMessage == null) {
+                localizedMessage = "No items found with search parameters.";
+            }
+            sender.sendMessage(localizedMessage);
+            return;
+        }
+
+        String prefix = plugin.getLocalizedMessage(sender, "messages.info.search.matches");
+        if (prefix == null) {
+            prefix = "Locations of items matching parameters:";
+        }
+
+        if (sender instanceof Player) {
+            TextComponent textComponent = new TextComponent(prefix);
+            Iterator<MessagePart> iterator = matches.iterator();
+
+            int total = 0;
+            int searchResultsMax = plugin.getSearchResultsMax();
+            while (iterator.hasNext()) {
+                textComponent.addExtra(iterator.next().forPlayer());
+
+                ++total;
+                if (total >= searchResultsMax) {
+                    break;
+                }
+
+                 if (iterator.hasNext()) {
+                     textComponent.addExtra(SEPARATOR);
+                 }
+            }
+
+            // Paper deprecated Spigot's message API.
+            // This is a risky deprecation ignore - Spigot may eventually do the sane thing
+            // and just add a method accepting components to the player directly.
+            //noinspection deprecation
+            sender.spigot().sendMessage(textComponent);
+            return;
+        }
+
+        String message = matches.stream()
+                .limit(plugin.getSearchResultsMax())
+                .map(MessagePart::forConsole)
+                .collect(Collectors.joining(", ", prefix, ""));
+        sender.sendMessage(message);
+    }
+
+    public void schedule(CommandSender sender, OpenInv plugin) {
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                // Scheduler struggles to cancel async tasks with high frequency.
+                if (isCancelled()) {
+                    return;
+                }
+
+                poll(plugin);
+
+                if (isComplete(plugin)) {
+                    if (isCancelled()) {
+                        return;
+                    }
+
+                    sendResults(sender, plugin);
+                    cancel();
+
+                    if (callback != null) {
+                        callback.run();
+                    }
+                    return;
+                }
+
+                sendProgress(sender, plugin);
+            }
+        }.runTaskTimerAsynchronously(plugin, 0L, 1L);
+    }
+
+}
@@ -0,0 +1,123 @@
+/*
+ * 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.search.bucket;
+
+import com.lishid.openinv.search.match.MatchResult;
+import com.lishid.openinv.search.match.Matchable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.function.BiConsumer;
+import org.bukkit.Chunk;
+import org.bukkit.World;
+import org.jetbrains.annotations.NotNull;
+
+public class ChunkBucket implements SearchBucket {
+
+    private final World world;
+    private final boolean load;
+    private final List<ChunkCoord> chunks;
+    protected int index = -1;
+    private Boolean paper = null;
+
+    public ChunkBucket(@NotNull World world, int chunkX, int chunkZ, int radius, boolean load) {
+        this.world = world;
+        this.load = load;
+        this.chunks = new ArrayList<>();
+        // Order chunks based (loosely) on proximity.
+        spiralRectangle(radius, (deltaX, deltaZ) -> chunks.add(new ChunkCoord(chunkX + deltaX, chunkZ + deltaZ)));
+    }
+
+    @Override
+    public @NotNull Matchable next() throws IndexOutOfBoundsException {
+        ChunkCoord chunkCoord = chunks.get(++index);
+
+        if (!world.isChunkGenerated(chunkCoord.x(), chunkCoord.z())) {
+            return Matchable.EMPTY;
+        }
+
+        if (!load && !world.isChunkLoaded(chunkCoord.x(), chunkCoord.z())) {
+            return Matchable.EMPTY;
+        }
+
+        // If async chunk loading is not available, load chunk when checking.
+        if (!isPaper()) {
+            return new MatchableChunk(world, chunkCoord.x(), chunkCoord.z());
+        }
+
+        CompletableFuture<Chunk> chunkAt = world.getChunkAtAsync(chunkCoord.x(), chunkCoord.z());
+
+        Chunk chunk;
+        try {
+            chunk = chunkAt.get();
+        } catch (InterruptedException | ExecutionException e) {
+            return matcher -> MatchResult.NO_MATCH;
+        }
+
+        return new MatchableChunk(chunk);
+    }
+
+    private boolean isPaper() {
+        if (paper == null) {
+            try {
+                // Check for Paper.
+                Class.forName("com.destroystokyo.paper.PaperConfig");
+                paper = true;
+            } catch (ClassNotFoundException e) {
+                paper = false;
+            }
+        }
+
+        return paper;
+    }
+
+    @Override
+    public boolean hasNext() {
+        return index < chunks.size() - 1;
+    }
+
+    @Override
+    public int size() {
+        return chunks.size();
+    }
+
+    /**
+     * Produce a series of integer coordinates starting at 0, 0 that extend outward to form a centered square,
+     * producing closer proximity results sooner than a traditional double for loop from min to max.
+     *
+     * @param radius the radius of the square
+     * @param coordConsumer the method consuming the values produced
+     */
+    private static void spiralRectangle(int radius, BiConsumer<Integer, Integer> coordConsumer) {
+        for (int x = 0; x <= radius; ++x) {
+            for (int z = 0; z <= radius; ++z) {
+                coordConsumer.accept(x, z);
+                if (x != 0) {
+                    coordConsumer.accept(-x, z);
+                    if (z != 0) {
+                        coordConsumer.accept(-x, -z);
+                    }
+                }
+                if (z != 0) {
+                    coordConsumer.accept(x, -z);
+                }
+            }
+        }
+    }
+
+}
@@ -0,0 +1,22 @@
+/*
+ * 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.search.bucket;
+
+/**
+ * A data holder for chunk coordinates.
+ */
+public record ChunkCoord(int x, int z) {}
@@ -0,0 +1,128 @@
+/*
+ * 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.search.bucket;
+
+import com.lishid.openinv.search.match.ItemMatcher;
+import com.lishid.openinv.search.match.MatchResult;
+import com.lishid.openinv.search.match.Matchable;
+import com.lishid.openinv.util.MessagePart;
+import java.util.ArrayList;
+import java.util.List;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.ClickEvent;
+import net.md_5.bungee.api.chat.HoverEvent;
+import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.chat.hover.content.Text;
+import org.bukkit.Chunk;
+import org.bukkit.World;
+import org.bukkit.block.BlockState;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+class MatchableChunk implements Matchable {
+
+    private Chunk chunk;
+    private World world;
+    private int chunkX;
+    private int chunkZ;
+
+    MatchableChunk(@NotNull Chunk chunk) {
+        this.chunk = chunk;
+    }
+
+    MatchableChunk(@NotNull World world, int chunkX, int chunkZ) {
+        this.world = world;
+        this.chunkX = chunkX;
+        this.chunkZ = chunkZ;
+    }
+
+    private Chunk getChunk() {
+        if (chunk == null) {
+            chunk = world.getChunkAt(chunkX, chunkZ);
+        }
+        return chunk;
+    }
+
+    @Override
+    public @NotNull MatchResult match(@NotNull ItemMatcher matcher) {
+        List<BlockState> blocks = new ArrayList<>();
+
+        for (BlockState tileEntity : getChunk().getTileEntities()) {
+            if (!(tileEntity instanceof InventoryHolder)) {
+                continue;
+            }
+
+            Inventory inventory = ((InventoryHolder) tileEntity).getInventory();
+
+            for (ItemStack content : inventory.getContents()) {
+                if (matcher.matches(content)) {
+                    blocks.add(tileEntity);
+                    break;
+                }
+            }
+        }
+
+        if (blocks.isEmpty()) {
+            return MatchResult.NO_MATCH;
+        }
+
+        MessagePart[] matches = new MessagePart[blocks.size()];
+        for (int i = 0; i < matches.length; ++i) {
+            BlockState state = blocks.get(i);
+            matches[i] = new MessagePart(() -> getComponent(state), () -> getString(state));
+        }
+
+        return new MatchResult(matches);
+    }
+
+    private static BaseComponent getComponent(BlockState state) {
+        TextComponent component = new TextComponent(state.getType().name());
+
+        String command = String.format(
+                "/execute in %s minecraft:tp %s %s %s",
+                state.getWorld().getName(),
+                state.getX(),
+                state.getY() + 1,
+                state.getZ());
+        component.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command));
+
+        String hover = String.format(
+                "%s{world:%s,x:%s,y:%s,z:%s}\n\nClick to teleport.",
+                state.getType().getKey(),
+                state.getWorld().getName(),
+                state.getX(),
+                state.getY(),
+                state.getZ());
+        Text hoverText = new Text(new BaseComponent[] { new TextComponent(hover)});
+        component.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hoverText));
+
+        return component;
+    }
+
+    private static String getString(BlockState state) {
+        return String.format(
+                "%s{world:%s,x:%s,y:%s,z:%s}",
+                state.getType().getKey(),
+                state.getWorld().getName(),
+                state.getX(),
+                state.getY(),
+                state.getZ());
+    }
+
+}
@@ -0,0 +1,174 @@
+/*
+ * 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.search.bucket;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.search.match.ItemMatcher;
+import com.lishid.openinv.search.match.MatchResult;
+import com.lishid.openinv.search.match.Matchable;
+import com.lishid.openinv.util.MessagePart;
+import java.util.UUID;
+import java.util.function.Supplier;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.ClickEvent;
+import net.md_5.bungee.api.chat.HoverEvent;
+import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.chat.hover.content.Text;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+import org.jetbrains.annotations.NotNull;
+
+public class MatchablePlayer implements Matchable {
+
+    private final OpenInv plugin;
+    private final OfflinePlayer offlinePlayer;
+
+    public MatchablePlayer(OpenInv plugin, OfflinePlayer offlinePlayer) {
+        this.plugin = plugin;
+        this.offlinePlayer = offlinePlayer;
+    }
+
+    @Override
+    public @NotNull MatchResult match(@NotNull ItemMatcher matcher) {
+
+        Player player;
+        if (offlinePlayer instanceof Player) {
+            player = (Player) offlinePlayer;
+        } else {
+            player = plugin.loadPlayer(offlinePlayer);
+        }
+
+        if (player == null) {
+            return MatchResult.NO_MATCH;
+        }
+
+        boolean matchInv = false;
+        boolean matchEnder = false;
+
+        PlayerInventory playerInventory = player.getInventory();
+
+        // Check inventory. Modern implementations include armor and off hand in contents.
+        for (ItemStack content : playerInventory.getContents()) {
+            if (matcher.matches(content)) {
+                matchInv = true;
+                break;
+            }
+        }
+
+        InventoryView openInventory = player.getOpenInventory();
+
+        // If no matches are found yet, check cursor.
+        if (!matchInv && matcher.matches(openInventory.getCursor())) {
+            matchInv = true;
+        }
+
+        // Check player crafting inventory.
+        if (!matchInv && openInventory.getType() == InventoryType.CRAFTING) {
+            for (ItemStack content : openInventory.getTopInventory().getContents()) {
+                if (matcher.matches(content)) {
+                    matchInv = true;
+                    break;
+                }
+            }
+        }
+
+        // Check ender chest.
+        for (ItemStack content : player.getEnderChest().getContents()) {
+            if (matcher.matches(content)) {
+                matchEnder = true;
+                break;
+            }
+        }
+
+        if (!matchInv && !matchEnder) {
+            return MatchResult.NO_MATCH;
+        }
+
+        String name = player.getName();
+        UUID uuid = player.getUniqueId();
+
+        if (matchInv && matchEnder) {
+            return new MatchResult(new MessagePart[] {
+                    new MessagePart(() -> getBoth(name, uuid), () -> name + " (inv, ender)")
+            });
+        }
+
+        Supplier<BaseComponent> componentSupplier;
+        Supplier<String> stringSupplier;
+
+        if (matchInv) {
+            componentSupplier = () -> getSingle(name, () -> getInvClick(uuid), () -> getInvHover(name));
+            stringSupplier = () -> name + " (inv)";
+        } else {
+            componentSupplier = () -> getSingle(name, () -> getEnderClick(uuid), () -> getEnderHover(name));
+            stringSupplier = () -> name + " (ender)";
+        }
+
+        return new MatchResult(new MessagePart[] { new MessagePart(componentSupplier, stringSupplier) });
+    }
+
+    private static BaseComponent getBoth(String name, UUID uuid) {
+        BaseComponent component = new TextComponent(name + " (inv,");
+        component.setClickEvent(getInvClick(uuid));
+        component.setHoverEvent(getInvHover(name));
+
+        BaseComponent enderComponent = new TextComponent(" ender)");
+        enderComponent.setClickEvent(getEnderClick(uuid));
+        enderComponent.setHoverEvent(getEnderHover(name));
+
+        component.addExtra(enderComponent);
+        return component;
+    }
+
+    private static BaseComponent getSingle(String name, Supplier<ClickEvent> click, Supplier<HoverEvent> hover) {
+        BaseComponent component = new TextComponent(name);
+        component.setClickEvent(click.get());
+        component.setHoverEvent(hover.get());
+        return component;
+    }
+
+    private static ClickEvent getInvClick(UUID uuid) {
+        return getClick("/openinv:openinv ", uuid);
+    }
+
+    private static HoverEvent getInvHover(String name) {
+        return getHover("/openinv ", name);
+    }
+
+    private static ClickEvent getEnderClick(UUID uuid) {
+        return getClick("/openinv:openender ", uuid);
+    }
+
+    private static HoverEvent getEnderHover(String name) {
+        return getHover("/openender ", name);
+    }
+
+    private static ClickEvent getClick(String command, UUID uuid) {
+        // Actual command run is not exposed to user, so there's no reason not to use UUID and be precise.
+        return new ClickEvent(ClickEvent.Action.RUN_COMMAND, command + uuid);
+    }
+
+    private static HoverEvent getHover(String command, String name) {
+        BaseComponent[] text = new BaseComponent[] { new TextComponent(command + name) };
+        return new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(text));
+    }
+
+}
@@ -0,0 +1,56 @@
+/*
+ * 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.search.bucket;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.search.match.Matchable;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+public class PlayerBucket implements SearchBucket {
+
+    private final OpenInv plugin;
+    private final OfflinePlayer[] players;
+    private int index = -1;
+
+    public PlayerBucket(OpenInv plugin, boolean online) {
+        this.plugin = plugin;
+        if (online) {
+            this.players = Bukkit.getOnlinePlayers().toArray(new Player[0]);
+        } else {
+            this.players = Bukkit.getOfflinePlayers();
+        }
+    }
+
+    @Override
+    public boolean hasNext() {
+        return index < players.length - 1;
+    }
+
+    @Override
+    public @NotNull Matchable next() {
+        return new MatchablePlayer(plugin, players[++index]);
+    }
+
+    @Override
+    public int size() {
+        return 1;
+    }
+
+}
@@ -0,0 +1,30 @@
+/*
+ * 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.search.bucket;
+
+import com.lishid.openinv.search.match.Matchable;
+import org.jetbrains.annotations.NotNull;
+
+public interface SearchBucket {
+
+    boolean hasNext();
+
+    @NotNull Matchable next() throws IndexOutOfBoundsException;
+
+    int size();
+
+}
@@ -0,0 +1,64 @@
+/*
+ * 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.search.match;
+
+import org.bukkit.Material;
+import org.bukkit.enchantments.Enchantment;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class ItemMatchables {
+
+    public static MatchableItem isType(@NotNull Material material) {
+        return itemStack -> itemStack.getType() == material;
+    }
+
+    public static MatchableItem hasAmount(int minAmount) {
+        return itemStack -> itemStack.getAmount() >= minAmount;
+    }
+
+    public static MatchableMeta hasEnchant(@Nullable Enchantment enchantment, @Nullable Integer minLevel) {
+        return itemMeta -> {
+            if (minLevel == null) {
+                if (enchantment == null) {
+                    // Level and enchantment not specified, any enchantment of any level matches.
+                    return !itemMeta.getEnchants().isEmpty();
+                }
+
+                // Level not specified, any level of enchantment matches.
+                return itemMeta.hasEnchant(enchantment);
+            }
+
+            if (enchantment != null) {
+                // Level and enchantment are specified, enchantment must meet or exceed level.
+                return itemMeta.getEnchantLevel(enchantment) >= minLevel;
+            }
+
+            // Enchantment not specified, any enchantment that meets or exceeds level matches.
+            for (int enchantLevel : itemMeta.getEnchants().values()) {
+                if (enchantLevel >= minLevel) {
+                    return true;
+                }
+            }
+
+            return false;
+        };
+    }
+
+    private ItemMatchables() {}
+
+}
@@ -0,0 +1,79 @@
+/*
+ * 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.search.match;
+
+import java.util.Collection;
+import java.util.HashSet;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A collection of multiple filters used to match items.
+ */
+public class ItemMatcher {
+
+    private final Collection<MatchableItem> baseOptions;
+    private final Collection<MatchableMeta> metaOptions;
+
+    public ItemMatcher(
+            Collection<MatchableItem> baseOptions,
+            Collection<MatchableMeta> metaOptions) {
+        this.baseOptions = new HashSet<>(baseOptions);
+        this.metaOptions = new HashSet<>(metaOptions);
+    }
+
+    public boolean matches(@Nullable ItemStack other) {
+        // Ensure item exists.
+        if (other == null || other.getType() == Material.AIR) {
+            return false;
+        }
+
+        // Match options against base item.
+        for (MatchableItem baseOption : baseOptions) {
+            if (!baseOption.matches(other)) {
+                return false;
+            }
+        }
+
+        // If no meta options exist, item matches.
+        if (metaOptions.isEmpty()) {
+            return true;
+        }
+
+        // Require item meta for meta options.
+        ItemMeta meta;
+        if (!other.hasItemMeta() || (meta = other.getItemMeta()) == null) {
+            return false;
+        }
+
+        // Match meta-based options.
+        for (MatchableMeta metaOption : metaOptions) {
+            if (!metaOption.matches(meta)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public boolean isEmpty() {
+        return baseOptions.isEmpty() && metaOptions.isEmpty();
+    }
+
+}
@@ -0,0 +1,45 @@
+/*
+ * 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.search.match;
+
+import com.lishid.openinv.util.MessagePart;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class MatchResult {
+
+    public static final MatchResult NO_MATCH = new MatchResult();
+
+    private final MessagePart[] result;
+
+    private MatchResult() {
+        result = null;
+    }
+
+    public MatchResult(MessagePart @NotNull [] result) {
+        this.result = result;
+    }
+
+    public boolean isMatch() {
+        return result != null;
+    }
+
+    public MessagePart @Nullable [] getMatch() {
+        return result;
+    }
+
+}
@@ -0,0 +1,27 @@
+/*
+ * 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.search.match;
+
+import org.jetbrains.annotations.NotNull;
+
+public interface Matchable {
+
+    Matchable EMPTY = matcher -> MatchResult.NO_MATCH;
+
+    @NotNull MatchResult match(@NotNull ItemMatcher matcher);
+
+}
@@ -0,0 +1,26 @@
+/*
+ * 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.search.match;
+
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+public interface MatchableItem {
+
+    boolean matches(@NotNull ItemStack itemStack);
+
+}
@@ -0,0 +1,26 @@
+/*
+ * 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.search.match;
+
+import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.NotNull;
+
+public interface MatchableMeta {
+
+    boolean matches(@NotNull ItemMeta itemMeta);
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -24,7 +24,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.function.Function;
+import java.util.function.Consumer;
+import java.util.function.Predicate;

 /**
 * A minimal thread-safe time-based cache implementation backed by a HashMap and TreeMultimap.
@@ -36,16 +37,17 @@ public class Cache<K, V> {
    private final Map<K, V> internal;
    private final Multimap<Long, K> expiry;
    private final long retention;
-    private final Function<V, Boolean> inUseCheck, postRemoval;
+    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 Function used to check if a key is considered in use
-     * @param postRemoval Function used to perform any operations required when a key is invalidated
+     * @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 Function<V, Boolean> inUseCheck, final Function<V, Boolean> postRemoval) {
+    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);
@@ -136,7 +138,7 @@ public class Cache<K, V> {
    public void invalidateAll() {
        synchronized (this.internal) {
            for (V value : this.internal.values()) {
-                this.postRemoval.apply(value);
+                this.postRemoval.accept(value);
            }
            this.expiry.clear();
            this.internal.clear();
@@ -161,7 +163,7 @@ public class Cache<K, V> {

                iterator.remove();

-                if (this.inUseCheck.apply(this.internal.get(entry.getValue()))) {
+                if (this.inUseCheck.test(this.internal.get(entry.getValue()))) {
                    inUse.add(entry.getValue());
                    continue;
                }
@@ -172,7 +174,7 @@ public class Cache<K, V> {
                    continue;
                }

-                this.postRemoval.apply(value);
+                this.postRemoval.accept(value);
            }

            long nextExpiry = now + this.retention;
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -24,7 +24,6 @@ import java.util.Map;
 import java.util.Set;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.scheduler.BukkitRunnable;

 public class ConfigUpdater {

@@ -36,7 +35,8 @@ public class ConfigUpdater {

    public void checkForUpdates() {
        final int version = plugin.getConfig().getInt("config-version", 1);
-        if (version >= plugin.getConfig().getDefaults().getInt("config-version")) {
+        ConfigurationSection defaults = plugin.getConfig().getDefaults();
+        if (defaults == null || version >= defaults.getInt("config-version")) {
            return;
        }

@@ -50,87 +50,83 @@ public class ConfigUpdater {
            plugin.getLogger().warning("Could not back up config.yml before updating!");
        }

-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                if (version < 2) {
-                    updateConfig1To2();
-                }
-                if (version < 3) {
-                    updateConfig2To3();
-                }
-                if (version < 4) {
-                    updateConfig3To4();
-                }
-
-                new BukkitRunnable() {
-                    @Override
-                    public void run() {
-                        plugin.saveConfig();
-                        plugin.getLogger().info("Configuration update complete!");
-                    }
-                }.runTaskLater(plugin, 1L); // Run on 1 tick delay; on older versions Bukkit's scheduler is not guaranteed FIFO
+        plugin.getServer().getScheduler().runTaskAsynchronously(plugin, () -> {
+            if (version < 2) {
+                updateConfig1To2();
            }
-        }.runTaskAsynchronously(plugin);
+            if (version < 3) {
+                updateConfig2To3();
+            }
+            if (version < 4) {
+                updateConfig3To4();
+            }
+            if (version < 5) {
+                updateConfig4To5();
+            }
+
+            plugin.getServer().getScheduler().runTask(plugin, () -> {
+                plugin.saveConfig();
+                plugin.getLogger().info("Configuration update complete!");
+            });
+        });
+    }
+
+    private void updateConfig4To5() {
+        plugin.getServer().getScheduler().runTask(plugin, () -> {
+            plugin.getConfig().set("settings.search.polls-per-tick", 5);
+            plugin.getConfig().set("settings.search.max-results", 40);
+            plugin.getConfig().set("config-version", 5);
+        });
    }

    private void updateConfig3To4() {
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                plugin.getConfig().set("notify", null);
-                plugin.getConfig().set("settings.locale", "en_US");
-                plugin.getConfig().set("config-version", 4);
-            }
-        }.runTask(plugin);
+        plugin.getServer().getScheduler().runTask(plugin, () -> {
+            plugin.getConfig().set("notify", null);
+            plugin.getConfig().set("settings.locale", "en_US");
+            plugin.getConfig().set("config-version", 4);
+        });
    }

    private void updateConfig2To3() {
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                plugin.getConfig().set("config-version", 3);
-                plugin.getConfig().set("items.open-inv", null);
-                plugin.getConfig().set("ItemOpenInv", null);
-                plugin.getConfig().set("toggles.items.open-inv", null);
-                plugin.getConfig().set("settings.disable-saving",
-                        plugin.getConfig().getBoolean("DisableSaving", false));
-                plugin.getConfig().set("DisableSaving", null);
-            }
-        }.runTask(plugin);
+        plugin.getServer().getScheduler().runTask(plugin, () -> {
+            plugin.getConfig().set("config-version", 3);
+            plugin.getConfig().set("items.open-inv", null);
+            plugin.getConfig().set("ItemOpenInv", null);
+            plugin.getConfig().set("toggles.items.open-inv", null);
+            plugin.getConfig().set("settings.disable-saving",
+                    plugin.getConfig().getBoolean("DisableSaving", false));
+            plugin.getConfig().set("DisableSaving", null);
+        });
    }

    private void updateConfig1To2() {
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                // Get the old config settings
-                boolean notifySilentChest = plugin.getConfig().getBoolean("NotifySilentChest", true);
-                boolean notifyAnyChest = plugin.getConfig().getBoolean("NotifyAnyChest", true);
-                plugin.getConfig().set("ItemOpenInvItemID", null);
-                plugin.getConfig().set("NotifySilentChest", null);
-                plugin.getConfig().set("NotifyAnyChest", null);
-                plugin.getConfig().set("config-version", 2);
-                plugin.getConfig().set("notify.any-chest", notifyAnyChest);
-                plugin.getConfig().set("notify.silent-chest", notifySilentChest);
-            }
-        }.runTask(plugin);
+        plugin.getServer().getScheduler().runTask(plugin, () -> {
+            // Get the old config settings
+            boolean notifySilentChest = plugin.getConfig().getBoolean("NotifySilentChest", true);
+            boolean notifyAnyChest = plugin.getConfig().getBoolean("NotifyAnyChest", true);
+            plugin.getConfig().set("ItemOpenInvItemID", null);
+            plugin.getConfig().set("NotifySilentChest", null);
+            plugin.getConfig().set("NotifyAnyChest", null);
+            plugin.getConfig().set("config-version", 2);
+            plugin.getConfig().set("notify.any-chest", notifyAnyChest);
+            plugin.getConfig().set("notify.silent-chest", notifySilentChest);
+        });

        updateToggles("AnyChest", "toggles.any-chest");
        updateToggles("SilentChest", "toggles.silent-chest");
    }

    private void updateToggles(final String sectionName, final String newSectionName) {
+        ConfigurationSection section = plugin.getConfig().getConfigurationSection(sectionName);
        // Ensure section exists
-        if (!plugin.getConfig().isConfigurationSection(sectionName)) {
+        if (section == null) {
            return;
        }

-        ConfigurationSection section = plugin.getConfig().getConfigurationSection(sectionName);
        Set<String> keys = section.getKeys(false);

        // Ensure section has content
-        if (keys == null || keys.isEmpty()) {
+        if (keys.isEmpty()) {
            return;
        }

@@ -143,25 +139,20 @@ public class ConfigUpdater {
            }
        }

-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                // Wipe old ConfigurationSection
-                plugin.getConfig().set(sectionName, null);
+        plugin.getServer().getScheduler().runTask(plugin, () -> {
+            // Wipe old ConfigurationSection
+            plugin.getConfig().set(sectionName, null);

-                // Prepare new ConfigurationSection
-                ConfigurationSection newSection;
-                if (plugin.getConfig().isConfigurationSection(newSectionName)) {
-                    newSection = plugin.getConfig().getConfigurationSection(newSectionName);
-                } else {
-                    newSection = plugin.getConfig().createSection(newSectionName);
-                }
-                // Set new values
-                for (Map.Entry<String, Boolean> entry : toggles.entrySet()) {
-                    newSection.set(entry.getKey(), entry.getValue());
-                }
+            // Prepare new ConfigurationSection
+            ConfigurationSection newSection = plugin.getConfig().getConfigurationSection(newSectionName);
+            if (newSection == null) {
+                newSection = plugin.getConfig().createSection(newSectionName);
            }
-        }.runTask(plugin);
+            // Set new values
+            for (Map.Entry<String, Boolean> entry : toggles.entrySet()) {
+                newSection.set(entry.getKey(), entry.getValue());
+            }
+        });
    }

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -40,15 +40,56 @@ public class InternalAccessor {
        this.version = packageName.substring(packageName.lastIndexOf('.') + 1);

        try {
-            // TODO: implement support for CraftMagicNumbers#getMappingsVersion
            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.isUseable();
+            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,
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 Jikoo. All rights reserved.
+ * 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
@@ -41,7 +41,7 @@ public class LanguageManager {

 	private final OpenInv plugin;
 	private final String defaultLocale;
-	private Map<String, YamlConfiguration> locales;
+	private final Map<String, YamlConfiguration> locales;

 	public LanguageManager(@NotNull OpenInv plugin, @NotNull String defaultLocale) {
 		this.plugin = plugin;
@@ -99,6 +99,11 @@ public class LanguageManager {

 			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);
+				}
 			}
 		}

@@ -0,0 +1,80 @@
+/*
+ * 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 java.util.List;
+import java.util.function.Supplier;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.ClickEvent;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class MessagePart {
+
+    private final Supplier<BaseComponent> playerProvider;
+    private final Supplier<String> consoleProvider;
+    private @Nullable BaseComponent playerComponent;
+    private @Nullable String consoleComponent;
+
+    public MessagePart(@NotNull Supplier<@NotNull BaseComponent> playerProvider) {
+        this(playerProvider, () -> unwrapComponent(playerProvider.get()));
+    }
+
+    public MessagePart(
+            @NotNull Supplier<@NotNull BaseComponent> playerProvider,
+            @NotNull Supplier<@NotNull String> consoleProvider) {
+        this.playerProvider = playerProvider;
+        this.consoleProvider = consoleProvider;
+    }
+
+    public BaseComponent forPlayer() {
+        if (this.playerComponent == null) {
+            this.playerComponent = playerProvider.get();
+        }
+        return this.playerComponent;
+    }
+
+    public String forConsole() {
+        if (consoleComponent == null) {
+            consoleComponent = consoleProvider.get();
+        }
+        return consoleComponent;
+    }
+
+    private static String unwrapComponent(BaseComponent component) {
+        StringBuilder builder = new StringBuilder();
+        ClickEvent clickEvent = component.getClickEvent();
+
+        if (clickEvent != null) {
+            // Prefer click events, i.e. "Check out our GitHub" with a link -> raw link
+            builder.append(clickEvent.getValue());
+        } else if (component instanceof TextComponent) {
+            builder.append(((TextComponent) component).getText());
+        }
+
+        List<BaseComponent> extra = component.getExtra();
+        if (extra != null) {
+            for (BaseComponent extraComponent : extra) {
+                builder.append(unwrapComponent(extraComponent));
+            }
+        }
+
+        return builder.toString();
+    }
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -25,26 +25,39 @@ public enum Permissions {
    EXEMPT("exempt"),
    CROSSWORLD("crossworld"),
    SILENT("silent"),
-    SILENT_DEFAULT("silent.default"),
+    SILENT_DEFAULT("silent.default", true),
    ANYCHEST("anychest"),
-    ANY_DEFAULT("any.default"),
+    ANY_DEFAULT("any.default", true),
    ENDERCHEST("openender"),
    ENDERCHEST_ALL("openenderall"),
    SEARCH("search"),
+    SEARCH_PLAYERS_ONLINE("search.players.online"),
+    SEARCH_PLAYERS_OFFLINE("search.players.offline"),
+    SEARCH_CHUNKS_LOADED("search.chunks.loaded"),
+    SEARCH_CHUNKS_UNLOADED("search.chunks.unloaded"),
    EDITINV("editinv"),
    EDITENDER("editender"),
-    OPENSELF("openself");
+    OPENSELF("openself"),
+    OPENONLINE("openonline"),
+    OPENOFFLINE("openoffline"),
+    SPECTATE("spectate");

    private final String permission;
+    private final boolean uninheritable;

    Permissions(String permission) {
+        this(permission, false);
+    }
+
+    Permissions(String permission, boolean uninheritable) {
        this.permission = "OpenInv." + permission;
+        this.uninheritable = uninheritable;
    }

    public boolean hasPermission(Permissible permissible) {

        boolean hasPermission = permissible.hasPermission(permission);
-        if (hasPermission || permissible.isPermissionSet(permission)) {
+        if (uninheritable || hasPermission || permissible.isPermissionSet(permission)) {
            return hasPermission;
        }

@@ -0,0 +1,181 @@
+/*
+ * 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 java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A data container for JSON-esque expressions.
+ *
+ * <p>Ex: A ChunkBucket can be expressed <code>chunks{world:world_name,x:0,z:0,radius:10,load:true}</code>. The
+ * starting "chunks" identifies it as a ChunkBucket and the content in braces contains the construction detail.
+ * However, a simpler detail, such as a MatchableItem, may be specified <code>type:IRON_SWORD</code> where "type"
+ * is both the identifier of the MatchableItem and the key of the sole value.
+ *
+ * <p>A best-effort will be made to match other start and finish demarcation techniques.
+ */
+public class PseudoJson {
+
+    private static final char[] BRACE_OPEN = new char[] { '{', '[', '(' };
+    private static final char[] BRACE_CLOSE = new char[] { '}', ']', ')' };
+    private static final Set<Character> RESERVED_CHARACTERS = new HashSet<>();
+
+    static {
+        for (char brace : BRACE_OPEN) {
+            RESERVED_CHARACTERS.add(brace);
+        }
+        for (char brace : BRACE_CLOSE) {
+            RESERVED_CHARACTERS.add(brace);
+        }
+        RESERVED_CHARACTERS.add(',');
+        RESERVED_CHARACTERS.add(':');
+    }
+
+    private final String identifier;
+    private final Map<String, String> mappings;
+
+    public PseudoJson(@NotNull String identifier) {
+        this(identifier, new HashMap<>());
+    }
+
+    public PseudoJson(@NotNull String identifier, @NotNull Map<String, String> mappings) {
+        this.identifier = identifier;
+        mappings.forEach(PseudoJson::validate);
+        this.mappings = mappings;
+    }
+
+    public @NotNull String getIdentifier() {
+        return identifier;
+    }
+
+    public @NotNull Optional<String> put(@NotNull String key, @NotNull String value) {
+        validate(key, value);
+
+        return Optional.ofNullable(this.mappings.put(key, value));
+    }
+
+    public @NotNull Optional<String> get(@NotNull String key) {
+        return Optional.ofNullable(this.mappings.get(key));
+    }
+
+    public @NotNull Map<String, String> getMappings() {
+        return Collections.unmodifiableMap(mappings);
+    }
+
+    public Optional<String> remove(@NotNull String key) {
+        return Optional.ofNullable(this.mappings.get(key));
+    }
+
+    public String asString() {
+        StringBuilder builder = new StringBuilder(identifier);
+
+        builder.append('{');
+
+        for (Iterator<Map.Entry<String, String>> iterator = mappings.entrySet().iterator(); iterator.hasNext();) {
+            Map.Entry<String, String> entry = iterator.next();
+            builder.append(entry.getKey()).append(':').append(entry.getValue());
+            if (iterator.hasNext()) {
+                builder.append(',');
+            }
+        }
+
+        builder.append('}');
+
+        return builder.toString();
+    }
+
+    @Override
+    public String toString() {
+        return asString();
+    }
+
+    private static void validate(String key, String value) {
+        if (RESERVED_CHARACTERS.stream().anyMatch(character -> key.indexOf(character) >= 0 || value.indexOf(character) >= 0)) {
+            throw new IllegalArgumentException(String.format("Primitive pseudo-JSON reserves characters %s", RESERVED_CHARACTERS));
+        }
+    }
+
+    public static PseudoJson fromString(String pseudoJson) {
+        int open = -1;
+        for (char brace : BRACE_OPEN) {
+            open = pseudoJson.indexOf(brace);
+            if (open >= 0) {
+                break;
+            }
+        }
+
+        String identifier = getIdentifier(pseudoJson, open);
+
+        int close = -1;
+        for (char brace : BRACE_CLOSE) {
+            close = pseudoJson.lastIndexOf(brace);
+            if (close >= 0) {
+                break;
+            }
+        }
+
+        if (open >= 0) {
+            if (close <= open) {
+                // Ignore bad ending brace.
+                pseudoJson = pseudoJson.substring(open + 1);
+            } else {
+                // Use only bracketed content
+                pseudoJson = pseudoJson.substring(open + 1, close);
+            }
+        }
+
+        return new PseudoJson(identifier, getMappings(pseudoJson));
+    }
+
+    private static String getIdentifier(String pseudoJson, int braceOpen) {
+        int identifierEnd;
+        if (braceOpen >= 0) {
+            identifierEnd = braceOpen;
+        } else {
+            // No quote, use first mapping.
+            identifierEnd = pseudoJson.indexOf(':');
+            if (identifierEnd == -1) {
+                // No mappings, use whole string.
+                return pseudoJson;
+            }
+        }
+
+        return pseudoJson.substring(0, identifierEnd);
+    }
+
+    private static Map<String, String> getMappings(String pseudoJson) {
+        String[] mappings = pseudoJson.split(",");
+
+        Map<String, String> data = new HashMap<>();
+        for (String mapping : mappings) {
+            String[] datum = mapping.split(":");
+            if (datum.length >= 2) {
+                data.put(datum[0], datum[1]);
+            }
+        }
+
+        return data;
+    }
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * 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
@@ -22,9 +22,12 @@ import java.util.List;
 import java.util.Locale;
 import java.util.function.Function;
 import org.bukkit.Bukkit;
+import org.bukkit.Keyed;
+import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
+import org.jetbrains.annotations.NotNull;

 /**
 * Utility class for common tab completions.
@@ -37,7 +40,7 @@ public class TabCompleter {
     * @param argument the argument to complete
     * @return integer options
     */
-    public static List<String> completeInteger(String argument) {
+    public static List<String> completeInteger(@NotNull String argument) {
        // Ensure existing argument is actually a number
        if (!argument.isEmpty()) {
            try {
@@ -62,14 +65,46 @@ public class TabCompleter {
     * @param enumClazz the Enum to complete for
     * @return the matching Enum values
     */
-    public static List<String> completeEnum(String argument, Class<? extends Enum<?>> enumClazz) {
+    public static List<String> completeEnum(@NotNull String argument, @NotNull Class<? extends Enum<?>> enumClazz) {
+        return completeObject(argument, Enum::name, enumClazz.getEnumConstants());
+    }
+
+    /**
+     * Offer tab completions for {@link Material Materials}.
+     *
+     * @param argument the argument to complete
+     * @return the matching {@code Material} keys
+     */
+    public static List<String> completeMaterial(@NotNull String argument) {
        argument = argument.toLowerCase(Locale.ENGLISH);
        List<String> completions = new ArrayList<>();

-        for (Enum<?> enumConstant : enumClazz.getEnumConstants()) {
-            String name = enumConstant.name().toLowerCase();
-            if (name.startsWith(argument)) {
-                completions.add(name);
+        for (Material material : Material.values()) {
+            if (material.name().toLowerCase(Locale.ENGLISH).startsWith(argument)
+                    || material.getKey().toString().startsWith(argument)
+                    || material.getKey().getKey().startsWith(argument)) {
+                completions.add(material.getKey().toString());
+            }
+        }
+
+        return completions;
+    }
+
+    /**
+     * Offer tab completions for {@link Keyed} values.
+     *
+     * @param argument the argument to complete
+     * @param options the {@code Keyed} values
+     * @return the matching keys
+     */
+    public static List<String> completeKeyed(@NotNull String argument, @NotNull Keyed @NotNull [] options) {
+        argument = argument.toLowerCase(Locale.ENGLISH);
+        List<String> completions = new ArrayList<>();
+
+        for (Keyed keyed : options) {
+            if (keyed.getKey().toString().startsWith(argument)
+                    || keyed.getKey().getKey().startsWith(argument)) {
+                completions.add(keyed.getKey().toString());
            }
        }

@@ -83,7 +118,7 @@ public class TabCompleter {
     * @param options the Strings which may be completed
     * @return the matching Strings
     */
-    public static List<String> completeString(String argument, String[] options) {
+    public static List<String> completeString(@NotNull String argument, @NotNull String @NotNull [] options) {
        argument = argument.toLowerCase(Locale.ENGLISH);
        List<String> completions = new ArrayList<>();

@@ -103,7 +138,7 @@ public class TabCompleter {
     * @param argument the argument to complete
     * @return the matching Players' names
     */
-    public static List<String> completeOnlinePlayer(CommandSender sender, String argument) {
+    public static List<String> completeOnlinePlayer(@NotNull CommandSender sender, String argument) {
        List<String> completions = new ArrayList<>();
        Player senderPlayer = sender instanceof Player ? (Player) sender : null;

@@ -128,12 +163,12 @@ public class TabCompleter {
     * @param options the Objects which may be completed
     * @return the matching Strings
     */
-    public static <T> List<String> completeObject(String argument, Function<T, String> converter, T[] options) {
+    public static <T> List<String> completeObject(@NotNull String argument, @NotNull Function<T, String> converter, @NotNull T @NotNull [] options) {
        argument = argument.toLowerCase(Locale.ENGLISH);
        List<String> completions = new ArrayList<>();

        for (T option : options) {
-            String optionString = converter.apply(option).toLowerCase();
+            String optionString = converter.apply(option).toLowerCase(Locale.ENGLISH);
            if (optionString.startsWith(argument)) {
                completions.add(optionString);
            }
@@ -1,4 +1,7 @@
-config-version: 4
+config-version: 5
 settings:
+  search:
+    polls-per-tick: 5
+    max-results: 40
  disable-saving: false
  locale: 'en_us'
@@ -0,0 +1,30 @@
+messages:
+  error:
+    consoleUnsupported: 'Du kannst diesen Befehl nicht von der Konsole ausführen.'
+    lootNotGenerated: '&cBeute noch nicht erstellt! Bitte schalte &b/silentcontainer&c aus.'
+    invalidMaterial: '&cUngültiges Material: "%target%"'
+    invalidNumber: '&cUngültige Nummer: "%target%"'
+    invalidPlayer: '&cSpieler nicht gefunden.'
+    permissionOpenSelf: '&cDu darfst dein eigenes Inventar nicht öffnen.'
+    permissionEnderAll: '&cDu darfst die Endertruhen von anderen Spielern nicht öffnen.'
+    permissionExempt: '&c%target%''s Inventar ist geschützt.'
+    permissionCrossWorld: '&c%target% ist nicht in der selben Welt wie du.'
+    permissionPlayerOnline: '&cDu darfst keine Inventare von Spielern öffnen, die online sind.'
+    permissionPlayerOffline: '&cDu darfst keine Inventare von Spielern öffnen, die offline sind.'
+    commandException: '&cAn error occurred. Please check console for details.'
+  info:
+    containerBlocked: 'Du öffnest einen gesperrten Container.'
+    containerBlockedSilent: 'Du öffnest einen gesperrten Container lautlos.'
+    containerSilent: 'Du öffnest einen Container lautlos.'
+    settingState: '%setting%: %state%'
+    player:
+      noMatches: 'Keine Spieler mit %target% gefunden.'
+      matches: 'Spieler hält %target%: %detail%'
+    container:
+      noMatches: 'Keine Container mit %target% gefunden.'
+      matches: 'Container hat %target%: %detail%'
+    on: 'an'
+    off: 'aus'
+container:
+  player: '%player%''s Inventar'
+  enderchest: '%player%''s Endertruhe'
@@ -2,6 +2,11 @@ messages:
  error:
    consoleUnsupported: 'You cannot use this command from console.'
    lootNotGenerated: '&cLoot not generated! Please disable &b/silentcontainer&c.'
+    search:
+      invalidSchema: '&cUnable to parse "%value%" to determine target. Try using tab completion!'
+      invalidInventory: '&cUnable to determine target inventories. Try using tab completion!'
+      invalidMatcher: '&cUnable to determine target item parameters. Try using tab completion!'
+      activeSearch: '&cPlease wait for your search to complete before starting another.'
    invalidMaterial: '&cInvalid material: "%target%"'
    invalidNumber: '&cInvalid number: "%target%"'
    invalidPlayer: '&cPlayer not found!'
@@ -9,20 +14,20 @@ messages:
    permissionEnderAll: '&cYou''re not allowed to access other players'' ender chests.'
    permissionExempt: '&c%target%''s inventory is protected.'
    permissionCrossWorld: '&c%target% is not in your world.'
+    permissionPlayerOnline: '&cYou''re not allowed to open the inventory of online players.'
+    permissionPlayerOffline: '&cYou''re not allowed to open the inventory of offline players.'
    commandException: '&cAn error occurred. Please check console for details.'
  info:
    containerBlocked: 'You are opening a blocked container.'
    containerBlockedSilent: 'You are opening a blocked container silently.'
    containerSilent: 'You are opening a container silently.'
    settingState: '%setting%: %state%'
-    player:
-      noMatches: 'No players found with %target%.'
-      matches: 'Players holding %target%: %detail%'
-    container:
-      noMatches: 'No containers found with %target%.'
-      matches: 'Containers holding %target%: %detail%'
+    search:
+      progress: 'Searching... %progress%% | Results: %matches%'
+      noMatches: 'No items found with search parameters.'
+      matches: 'Locations of items matching parameters: '
    on: 'on'
    off: 'off'
 container:
  player: '%player%''s Inventory'
-  enderchest: '%Player''s Ender Chest'
+  enderchest: '%player%''s Ender Chest'
@@ -0,0 +1,31 @@
+messages:
+  error:
+    consoleUnsupported: 'No puedes usar este comando desde la consola.'
+    lootNotGenerated: '&c¡Botín no generado! Desactiva &b/silentcontainer&c.'
+    invalidMaterial: '&cMaterial no válido: "%target%"'
+    invalidNumber: '&cNúmero no válido: "%target%"'
+    invalidPlayer: '&cJugador no encontrado'
+    permissionOpenSelf: '&cNo tienes permisos para abrir tu inventario de esa forma.'
+    permissionEnderAll: '&cNo tienes permiso para abrir cofres de ender de otros jugadores.'
+    permissionExempt: '&c El inventario de %target% está protegido.'
+    permissionCrossWorld: '&c%target% no está en tu dimensión.'
+    permissionPlayerOnline: '&cNo estás autorizado para abrir inventarios de jugadores conectados.'
+    permissionPlayerOffline: '&cNo estás autorizado para abrir inventarios de jugadores desconectados.'
+    commandException: '&cSe ha producido un error, lee la consola para mas información.'
+  info:
+    containerBlocked: 'Estás abriendo un contenedor protegido.'
+    containerBlockedSilent: 'Estás abriendo sigilosamente un contenedor protegido.'
+    containerSilent: 'Estás abriendo un contenedor sigilosamente.'
+    settingState: '%setting%: %state%'
+    player:
+      noMatches: 'No se encontraron jugadores con %target%.'
+      matches: 'Jugadores con %target%: %detail%'
+    container:
+      noMatches: 'No se encontraron contenedores con %target%.'
+      matches: 'Contenedores con %target%: %detail%'
+    on: 'activado'
+    off: 'desactivado'
+container:
+  player: 'Inventario de %player%'
+  enderchest: 'Cofre de Ender de %player%'
+  
@@ -5,7 +5,7 @@ author: lishid
 authors: [Jikoo, ShadowRanger]
 description: >
             This plugin allows you to open a player's inventory as a chest and interact with it in real time.
-api-version: "1.14"
+api-version: "1.16"

 permissions:
  OpenInv.any.default:
@@ -25,6 +25,19 @@ permissions:
      OpenInv.anychest: true
      OpenInv.searchenchant: true
      OpenInv.searchcontainer: true
+      OpenInv.openonline: true
+      OpenInv.openoffline: true
+      OpenInv.spectate: true
+  OpenInv.openinv:
+    default: op
+    children:
+      OpenInv.openonline: true
+      OpenInv.openoffline: true
+  OpenInv.openender:
+    default: op
+    children:
+      OpenInv.openonline: true
+      OpenInv.openoffline: true

 commands:
  openinv:
@@ -39,12 +52,12 @@ commands:
    permission: OpenInv.openender
    usage: |-
           /<command> [Player] - Open a player's enderchest
-  searchinv:
-    aliases: [si]
-    description: Search and list players having a specific item
+  search:
+    aliases: [ searchinv, si, searchender, se, searchenchant, searchenchants, searchcontainer, searchchest ]
+    description: Search inventories for a matching item
    permission: OpenInv.search
    usage: |-
-           /<command> <Material> [MinAmount] - MinAmount is optional, the minimum amount required
+           /<command> <inventories> <item details>
  searchender:
    aliases: [se]
    permission: OpenInv.search
@@ -63,14 +76,3 @@ commands:
    permission: OpenInv.anychest
    usage: |-
           /<command> [check|on|off] - Check, toggle, or set AnyContainer
-  searchenchant:
-    aliases: [searchenchants]
-    description: Search and list players with a specific enchantment.
-    permission: OpenInv.searchenchant
-    usage: |-
-           /<command> <[Enchantment] [MinLevel]> - Enchantment is the enchantment type, MinLevel is the minimum level. One is optional
-  searchcontainer:
-    aliases: [searchchest]
-    description: Search and list containers with a specific material.
-    permission: OpenInv.searchcontainer
-    usage: /<command> <Material> [ChunkRadius] - ChunkRadius is optional, the length that will be searched for matching items. Default 5
@@ -0,0 +1,30 @@
+messages:
+  error:
+    consoleUnsupported: 'Voce nao consegue usar esse comando pelo console.'
+    lootNotGenerated: '&cPilhagem nao gerada! Por favor desabilite &b/silentcontainer&c.'
+    invalidMaterial: '&cMaterial invalido: "%target%"'
+    invalidNumber: '&cNumero invalido: "%target%"'
+    invalidPlayer: '&cJogador nao encontrado!'
+    permissionOpenSelf: '&cVoce nao pode abrir seu proprio inventario.'
+    permissionEnderAll: '&cVoce nao tem permissao para abrir baus de ender de outros jogadores.'
+    permissionExempt: '&cO inventario de %target% e protegido.'
+    permissionCrossWorld: '&c%target% nao esta no seu mundo.'
+    permissionPlayerOnline: '&cVoce nao tem permissao para abrir o inventario de jogadores online.'
+    permissionPlayerOffline: '&cVoce nao tem permissao para abrir o inventario de jogadores offline.'
+    commandException: '&cUm erro ocorreu. Por favor cheque o console para detalhes.'
+  info:
+    containerBlocked: 'Voce esta abrindo um recipiente bloqueado.'
+    containerBlockedSilent: 'Voce esta abrindo um recipiente bloqueado silenciosamente.'
+    containerSilent: 'Voce esta abrindo um recipiente silenciosamente.'
+    settingState: '%setting%: %state%'
+    player:
+      noMatches: 'Nenhum jogador encontrado com %target%.'
+      matches: 'Jogadores segurando %target%: %detail%'
+    container:
+      noMatches: 'Nenhum recipiente encontrado com %target%.'
+      matches: 'Recipientes contendo %target%: %detail%'
+    on: 'ligado'
+    off: 'desligado'
+container:
+  player: 'Inventario de %player%'
+  enderchest: 'Bau de Ender de %player%'
@@ -0,0 +1,31 @@
+# Translated into Chinese Simplified by Flandre_tw
+messages:
+  error:
+    consoleUnsupported: 该命令无法在后台执行。
+    lootNotGenerated: '&c奖励箱尚未生成 ！ 请关闭 &b/silentcontainer&c。'
+    invalidMaterial: '&c无效的物品 ： "%target%"'
+    invalidNumber: '&c无效的数字 ： "%target%"'
+    invalidPlayer: '&c玩家不存在 ！'
+    permissionOpenSelf: '&c你无法开启自己的物品栏。'
+    permissionEnderAll: '&c你无法开启其他玩家的末影箱。'
+    permissionExempt: '&c%target% 的物品栏受到保护。'
+    permissionCrossWorld: '&c%target% 不在你所在的世界。'
+    permissionPlayerOnline: '&c你无法开启线上玩家的物品栏。'
+    permissionPlayerOffline: '&c你无法开启离线玩家的物品栏。'
+    commandException: '&c发生错误，请查看后台。'
+  info:
+    containerBlocked: 你正在开启受阻挡的储物箱。
+    containerBlockedSilent: 你正在悄悄开启受阻挡的储物箱。
+    containerSilent: 你正在悄悄开启储物箱。
+    settingState: '%setting% ： %state%'
+    player:
+      noMatches: 找不到持有 %target% 的玩家。
+      matches: '找到持有 %target% 的玩家 ： %detail%'
+    container:
+      noMatches: 找不到放有 %target% 的储物箱。
+      matches: '找到放有 %target% 的储物箱 ： %detail%'
+    'true': '开启'
+    'false': '关闭'
+container:
+  player: '%player% 的物品栏'
+  enderchest: '%player% 的末影箱' 
@@ -0,0 +1,31 @@
+# Translated into Chinese Traditional by Flandre_tw
+messages:
+  error:
+    consoleUnsupported: 該指令無法在控制台執行。
+    lootNotGenerated: '&c獎勵箱尚未生成 ！ 請關閉 &b/silentcontainer&c。'
+    invalidMaterial: '&c無效的物品 ： "%target%"'
+    invalidNumber: '&c無效的數字 ： "%target%"'
+    invalidPlayer: '&c玩家不存在 ！'
+    permissionOpenSelf: '&c你無法開啟自己的物品欄。'
+    permissionEnderAll: '&c你無法開啟其他玩家的終界箱。'
+    permissionExempt: '&c%target% 的物品欄受到保護。'
+    permissionCrossWorld: '&c%target% 不在你所在的世界。'
+    permissionPlayerOnline: '&c你無法開啟線上玩家的物品欄。'
+    permissionPlayerOffline: '&c你無法開啟離線玩家的物品欄。'
+    commandException: '&c發生錯誤，請查看控制台。'
+  info:
+    containerBlocked: 你正在開啟受阻擋的儲物箱。
+    containerBlockedSilent: 你正在悄悄開啟受阻擋的儲物箱。
+    containerSilent: 你正在悄悄開啟儲物箱。
+    settingState: '%setting% ： %state%'
+    player:
+      noMatches: 找不到持有 %target% 的玩家。
+      matches: '找到持有 %target% 的玩家 ： %detail%'
+    container:
+      noMatches: 找不到放有 %target% 的儲物箱。
+      matches: '找到放有 %target% 的儲物箱 ： %detail%'
+    'true': '開啟'
+    'false': '關閉'
+container:
+  player: '%player% 的物品欄'
+  enderchest: '%player% 的終界箱'
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
+  ~ 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
@@ -19,61 +19,41 @@

  <groupId>com.lishid</groupId>
  <artifactId>openinvparent</artifactId>
-  <name>OpenInvParent</name>
+  <name>OpenInv</name>
  <url>http://dev.bukkit.org/bukkit-plugins/openinv/</url>
-  <version>4.1.1-SNAPSHOT</version>
+  <version>4.1.9-SNAPSHOT</version>

  <packaging>pom</packaging>

  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>16</maven.compiler.source>
+    <maven.compiler.target>16</maven.compiler.target>
  </properties>

-  <modules>
-    <module>api</module>
-    <module>plugin</module>
-    <module>internal</module>
-    <module>assembly</module>
-  </modules>
-
  <profiles>
-
-    <!--
-      ~ N.B.: All version-specific code is handled in submodules of the internal module.
-      ~
-      ~ Internal submodules built by each profile are handled in internal/pom.xml
-     -->
-
    <profile>
      <id>all</id>
-      <activation>
-        <property>
-          <name>all</name>
-          <value>true</value>
-        </property>
-      </activation>
+      <modules>
+        <module>api</module>
+        <module>plugin</module>
+        <module>internal/v1_17_R1</module>
+        <module>internal/v1_18_R1</module>
+        <module>assembly</module>
+      </modules>
    </profile>

    <profile>
-      <id>latest</id>
+      <id>default</id>
      <activation>
-        <property>
-          <name>latest</name>
-          <value>true</value>
-        </property>
+        <activeByDefault>true</activeByDefault>
      </activation>
+      <modules>
+        <module>api</module>
+        <module>plugin</module>
+        <module>assembly</module>
+      </modules>
    </profile>
-
-    <profile>
-      <id>recent</id>
-      <activation>
-        <property>
-          <name>recent</name>
-          <value>true</value>
-        </property>
-      </activation>
-    </profile>
-
  </profiles>

  <repositories>
@@ -81,44 +61,119 @@
      <id>spigot-repo</id>
      <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
    </repository>
+    <repository>
+      <id>papermc</id>
+      <url>https://papermc.io/repo/repository/maven-public/</url>
+    </repository>
+    <repository>
+      <id>jitpack</id>
+      <url>https://jitpack.io</url>
+    </repository>
  </repositories>

-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.2</version>
-        <configuration>
-          <filters>
-            <filter>
-              <artifact>*:*</artifact>
-              <!-- Keep the file clean, don't include every single pom from all modules -->
-              <excludes>
-                <exclude>META-INF/maven/**</exclude>
-              </excludes>
-            </filter>
-          </filters>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <artifactId>annotations</artifactId>
+        <groupId>org.jetbrains</groupId>
+        <scope>provided</scope>
+        <version>23.0.0</version>
+      </dependency>
+      <dependency>
+        <artifactId>paper-api</artifactId>
+        <groupId>io.papermc.paper</groupId>
+        <scope>provided</scope>
+        <version>1.17.1-R0.1-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <artifactId>spigot-api</artifactId>
+        <groupId>org.spigotmc</groupId>
+        <scope>provided</scope>
+        <version>1.17.1-R0.1-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <artifactId>planarwrappers</artifactId>
+        <groupId>com.github.jikoo</groupId>
+        <scope>compile</scope>
+        <version>2.2.4</version>
+      </dependency>
+      <dependency>
+        <artifactId>openinvapi</artifactId>
+        <groupId>com.lishid</groupId>
+        <scope>compile</scope>
+        <version>4.1.9-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <artifactId>openinvplugincore</artifactId>
+        <groupId>com.lishid</groupId>
+        <scope>compile</scope>
+        <version>4.1.9-SNAPSHOT</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>

-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshot-repo</id>
+      <url>https://repository.apache.org/content/repositories/snapshots/</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <build>
+    <pluginManagement>
+      <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>
+            <minimizeJar>true</minimizeJar>
+          </configuration>
+          <executions>
+            <execution>
+              <phase>package</phase>
+              <goals>
+                <goal>shade</goal>
+              </goals>
+            </execution>
+          </executions>
+          <groupId>org.apache.maven.plugins</groupId>
+          <version>3.3.1-SNAPSHOT</version>
+        </plugin>
+
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <groupId>org.apache.maven.plugins</groupId>
+          <version>3.8.1</version>
+        </plugin>
+
+        <plugin>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <groupId>org.apache.maven.plugins</groupId>
+          <version>3.3.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>net.md-5</groupId>
+          <artifactId>specialsource-maven-plugin</artifactId>
+          <version>1.2.2</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
  </build>

 </project>
@@ -0,0 +1,82 @@
+#!/bin/bash
+#
+# 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/>.
+#
+
+# Note that this script is designed for use in GitHub Actions, and is not
+# particularly robust nor configurable. Run from project parent directory.
+
+# Query GitHub for the username of the given email address.
+# Falls through to the given author name.
+function lookup_email_username() {
+  lookup=$(curl -G --data-urlencode "q=$1 in:email" https://api.github.com/search/users -H 'Accept: application/vnd.github.v3+json' | grep '"login":' | sed -e 's/^.*": "//g' -e 's/",.*$//g')
+
+  if [[ $lookup ]]; then
+    echo -n "@$lookup"
+  else
+    echo "$2"
+  fi
+}
+
+# Get a pretty list of supported Minecraft versions
+function get_minecraft_versions() {
+  readarray -t versions <<< "$(. ./scripts/get_spigot_versions.sh)"
+
+  for version in "${versions[@]}"; do
+    # Append comma if variable is set, then append version
+    minecraft_versions="${minecraft_versions:+${minecraft_versions},}${version%%-R*}"
+  done
+
+  echo "${minecraft_versions}"
+}
+
+previous_tag=$(git describe --tags --abbrev=0 @^)
+
+# Use formatted log to pull authors list
+authors_raw=$(git log --pretty=format:"%ae|%an" "$previous_tag"..@)
+readarray -t authors <<<"$authors_raw"
+
+# Use associative array to map email to author name
+declare -A author_data
+
+for author in "${authors[@]}"; do
+  # Match author email
+  author_email=${author%|*}
+  # Convert to lower case
+  author_email=${author_email,,}
+  # Match author name
+  author_name=${author##*|}
+  if [[ -n ${author_data[$author_email]} ]]; then
+    # Skip emails we already have data for
+    continue
+  fi
+
+  # Fetch and store author GitHub username by email
+  author_data[$author_email]=$(lookup_email_username "$author_email" "$author_name")
+done
+
+# Fetch actual formatted changelog
+changelog=$(git log --pretty=format:"* %s (%h) - %ae" "$previous_tag"..@)
+
+for author_email in "${!author_data[@]}"; do
+  # Ignore case when matching
+  shopt -s nocasematch
+  # Match and replace email
+  changelog=${changelog//$author_email/${author_data[$author_email]}}
+done
+
+minecraft_versions=$(get_minecraft_versions)
+
+printf "## Supported Minecraft versions\n%s\n\n## Changelog\n%s" "${minecraft_versions}" "${changelog}"
@@ -0,0 +1,64 @@
+#!/bin/bash
+#
+# 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/>.
+#
+
+# Note that this script is designed for use in GitHub Actions, and is not
+# particularly robust nor configurable. Run from project parent directory.
+
+# Use a nameref as a cache - maven evaluation is pretty slow.
+# Re-calling the script and relying on it to handle caching is way easier than passing around info.
+declare -a spigot_versions
+
+# We don't care about concatenation - either it's not null and we handle entries or it's null and we instantiate.
+# shellcheck disable=SC2199
+if [[ ${spigot_versions[@]} ]]; then
+  for spigot_version in "${spigot_versions[@]}"; do
+    echo "$spigot_version"
+  done
+  return
+fi
+
+old_maven_opts=$MAVEN_OPTS
+# Add JVM parameters to allow help plugin access to packages it needs.
+export MAVEN_OPTS="$old_maven_opts --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED"
+
+# Pull Spigot dependency information from Maven.
+# Since we only care about Spigot versions, only check modules in the folder internal.
+readarray -t modules <<< "$(mvn help:evaluate -Dexpression=project.modules -q -DforceStdout -P all | grep -oP '(?<=<string>)(internal/.*)(?=</string>)')"
+
+declare -n versions="spigot_versions"
+
+for module in "${modules[@]}"; do
+  # Get number of dependencies declared in pom of specified internal module.
+  max_index=$(mvn help:evaluate -Dexpression=project.dependencies -q -DforceStdout -P all -pl "$module" | grep -c "<dependency>")
+
+  for ((i=0; i < max_index; i++)); do
+    # Get artifactId of dependency.
+    artifact_id=$(mvn help:evaluate -Dexpression=project.dependencies["$i"].artifactId -q -DforceStdout -P all -pl "$module")
+
+    # Ensure dependency is Spigot.
+    if [[ "$artifact_id" == spigot ]]; then
+      # Get Spigot version.
+      spigot_version=$(mvn help:evaluate -Dexpression=project.dependencies["$i"].version -q -DforceStdout -P all -pl "$module")
+      versions+=("$spigot_version")
+      echo "$spigot_version"
+      break
+    fi
+  done
+done
+
+# Reset JVM parameters
+export MAVEN_OPTS=$old_maven_opts
@@ -0,0 +1,53 @@
+#!/bin/bash
+#
+# 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/>.
+#
+
+# Note that this script is designed for use in GitHub Actions, and is not
+# particularly robust nor configurable. Run from project parent directory.
+
+buildtools_dir=~/buildtools
+buildtools=$buildtools_dir/BuildTools.jar
+
+get_buildtools () {
+  if [[ -d $buildtools_dir && -f $buildtools ]]; then
+    return
+  fi
+
+  mkdir $buildtools_dir
+  wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar -O $buildtools
+}
+
+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
+
+for version in "${versions[@]}"; do
+  set -e
+  exit_code=0
+  mvn dependency:get -Dartifact=org.spigotmc:spigot:"$version":remapped-mojang -q -o || exit_code=$?
+  if [ $exit_code -ne 0 ]; then
+    echo Installing missing Spigot version "$version"
+    revision=${version%%-R*}
+    get_buildtools
+    java -jar $buildtools -rev "$revision" --remapped
+  else
+    echo Spigot "$version" is already installed
+  fi
+done
Author	SHA1	Message	Date
Jikoo	c9e17e4a12	Update dependencies, use more descriptive record	2021-11-28 20:18:01 -05:00
Jikoo	78908932c5	Progress on tab completion Complete type, amount, and enchant options - Still missing player and chunk bucket completion Update to Java 16 for main plugin - Min supported version 1.16 requires Java 16 Determine uniqueness based on identifier for pseudojson	2021-11-27 16:23:22 -05:00
Jikoo	5f1a613b48	Repackage and rename for clarity	2021-11-27 13:56:31 -05:00
Jikoo	18c3dbaee0	Merge branch 'master' into dev/rewrite-search	2021-11-27 07:09:00 -05:00
Jikoo	d236dd27b3	Update to 1.18-pre5	2021-11-23 13:00:42 -05:00
Jikoo	6775988347	Stash changes	2021-11-23 12:45:40 -05:00
Jikoo	2580797633	Merge branch 'master' into dev/rewrite-search # Conflicts: # plugin/pom.xml # plugin/src/main/java/com/lishid/openinv/commands/SearchContainerCommand.java # plugin/src/main/java/com/lishid/openinv/commands/SearchEnchantCommand.java # plugin/src/main/java/com/lishid/openinv/commands/SearchInvCommand.java # pom.xml	2021-11-17 10:59:17 -05:00
Jikoo	dd90b5281f	Use Java 17 for CI	2021-11-17 10:41:53 -05:00
Jikoo	b4601bb6c1	Fix cached Spigot dependencies never being used Since plugins have not been downloaded, get always fails when running in offline mode.	2021-10-16 19:16:08 -04:00
Jikoo	e3d9cea027	Fix spigot dependency parsing * Re-add cache * Work around reflection issues with mvn help:evaluate on Java 9+	2021-10-16 18:03:38 -04:00
Jikoo	556a8bcfce	Drop 1.16.5 support to use Mojang mappings Because there is no option to create a `remapped-mojang` artifact for 1.16.5 and the whole point of the scripts is to save me time, 1.16.5 support is being removed earlier than usual. Also fixes issues with NMS-based shulker collision check. Closes #36	2021-10-16 16:53:59 -04:00
Jikoo	8599997e03	Work towards fixing shulkers	2021-10-16 16:11:18 -04:00
Jikoo	ea99bd5fd4	Extract duplicate API-only code	2021-07-28 11:28:08 -04:00
蘭蘭露 Flandre_tw	2f36a4d4dc	Add Chinese Simplified translation (#35 )	2021-06-28 20:05:55 -04:00
蘭蘭露 Flandre_tw	e5ebf11d32	Add Chinese Traditional translation (#34 )	2021-06-28 20:05:15 -04:00
Jikoo	4336b454b7	Fix potential CME closing viewers without access Closes #33	2021-06-24 08:21:26 -04:00
Jikoo	b198931f30	Bump version to 4.1.9-SNAPSHOT for development	2021-06-11 18:40:48 -04:00
Jikoo	64af4dddb0	Bump version to 4.1.8 for release	2021-06-11 18:40:39 -04:00
Jikoo	f613c0a522	Remove redundant load	2021-06-11 18:39:19 -04:00
Jikoo	1cae4c7a8e	Correct window id	2021-06-11 18:39:07 -04:00
Jikoo	ff7243db6a	Fix script issues Temporarily explicitly declare Spigot dependencies I don't have the time to deal with whatever the difference between remote and local bash/maven versions is right now.	2021-06-11 12:05:38 -04:00
Jikoo	07a8e3b973	Add 1.17 support	2021-06-11 10:50:50 -04:00
Jikoo	9fccea60f7	Update copyright	2021-06-11 10:50:36 -04:00
Jikoo	9a2b379a64	Escape changelog for YAML With 1.17 releasing soon, we'll get to see if this was the issue very shortly. Worst case scenario the yaml is still messed up, but since the changelog is now the last element, unless it's so badly malformed that the entire action can't run the file should still upload even if the changelog does not.	2021-06-08 11:38:26 -04:00
Jikoo	4d800361d8	Bump version to 4.1.8-SNAPSHOT for development	2021-05-29 09:51:39 -04:00
Jikoo	2cfc55813b	Bump version to 4.1.7 for release	2021-05-29 09:51:25 -04:00
Jikoo	28929fd61e	Clean up parsing, prep for tab completion	2021-05-29 09:38:06 -04:00
Jikoo	0f41701429	Update annotations	2021-05-26 08:17:11 -04:00
Jikoo	9e0ca479a5	Fix Bukkit data not being loaded while offline Closes #16	2021-05-26 08:16:25 -04:00
Jikoo	2445e7f8b6	Disallow concurrent searches from a single user	2021-05-13 07:53:00 -04:00
Jikoo	0af6403570	Move pseudo-JSON to a separate class This and generifying parsing will make tab completion much easier to write.	2021-04-29 16:45:12 -04:00
Jikoo	55018ca228	Fix last parameter, issues with async chunks	2021-04-24 11:37:59 -04:00
Jikoo	64bd918f32	Merge branch 'master' into dev/rewrite-search # Conflicts: # README.MD # api/pom.xml # internal/v1_16_R3/pom.xml # plugin/pom.xml # pom.xml	2021-04-23 14:00:24 -04:00
Jikoo	bd207e948a	Simplify dependency management Use dependencyManagement for versioning shared dependencies Use pluginManagement for versioning and configuring plugins	2021-04-23 13:40:22 -04:00
Jikoo	30425d2baa	Don't bother validating names Fixes problems with players from Geyser not being obtainable when using FloodGate.	2021-04-21 14:57:46 -04:00
Jikoo	fb6a3a7bcf	Simplify dependency management Use dependencyManagement for versioning shared dependencies Use pluginManagement for versioning and configuring plugins Uberjar is still including classes it shouldn't, but that's not a new problem.	2021-04-21 11:07:15 -04:00
Jikoo	4d4aa86399	Simplify enchantment spec	2021-04-21 11:06:53 -04:00
Jikoo	1dce65cecb	Drop PaperLib	2021-04-21 11:05:21 -04:00
Jikoo	c1145ae111	Search progress Change detail specs to JSON-esque expressions Implement matching option parsing Split search bucket specs into multiple arguments	2021-04-16 12:51:19 -04:00
Jikoo	19f029f17f	Search progress Allow multi-world searches Search player crafting inventory if open	2021-04-13 20:36:41 -04:00
Jikoo	916a8c0c55	Start reworking search	2021-04-11 17:35:15 -04:00
Jikoo	e3acb5384a	Deprecate API for removed notification configuration	2021-04-05 19:12:45 -04:00
Jikoo	6c4818dfd9	Add method to access owner Makes handling ISpecialInventory ownership much more consistent with a lot less spaghetti.	2021-03-28 11:12:49 -04:00
Jikoo	5b18656485	Fix incorrect player name in title Closes #13	2021-03-28 11:10:39 -04:00
Jikoo	7ab86f2af9	Fix build	2021-03-22 12:20:58 -04:00
Jikoo	2b563e0e1b	Don't convert release notes to HTML We'll try this in another few months when there're enough changes to be worth it.	2021-03-22 12:07:53 -04:00
Jikoo	2a0e0d33d8	Don't shade annotations	2021-03-22 11:56:39 -04:00
Jikoo	889c2ffdab	Bump version to 4.1.7-SNAPSHOT for development	2021-03-22 11:52:14 -04:00
Jikoo	c440f618c9	Bump version to 4.1.6 for release	2021-03-22 11:52:04 -04:00
Jikoo	ccc6f4b4a6	Fix CF release	2021-03-22 11:50:56 -04:00
Jikoo	ae6c3bd292	Move release location	2021-03-22 10:24:48 -04:00
Jikoo	0e3bdb8741	Convert to HTML for CF	2021-03-22 10:21:09 -04:00
Jikoo	e09e7c59c7	Fix release action	2021-03-22 09:42:52 -04:00
Jikoo	18c7916d79	Include release script	2021-03-22 09:41:36 -04:00
Jikoo	15ee6ef9a5	Fix revision number	2021-03-20 13:19:33 -04:00
Jikoo	24224e4f9d	Add CurseForge release workflow	2021-03-20 13:06:33 -04:00
Jikoo	6563b4f6ce	Migrate API-only functions out of PlayerDataManager With the update to 1.16 there's no need to maintain multiple copies of the same code. Additionally, in 1.16 the action bar now supports JSON text.	2021-03-18 20:31:45 -04:00
Jikoo	1d5a836fd0	Partially automate release changelog	2021-03-18 16:38:41 -04:00
Jikoo	3ba82683ec	Fix double chest custom names not displaying Closes #175	2021-03-17 00:09:10 -04:00
Jikoo	6e5c332272	Extract player implementation	2021-03-16 23:49:17 -04:00
Jikoo	1c9d133ed1	Fix item delete in own inventory Dragging items across top and bottom inventories with own inventory open resulted in the overlapping content being deleted.	2021-03-16 23:49:10 -04:00
Jikoo	dad1e16c18	Fix item dupe in own inventory Reduce desync for other actions in own inventory Closes #182	2021-03-16 12:14:47 -04:00
Jikoo	519dd7da33	Fix cache breaking build on Spigot version change	2021-03-16 09:45:29 -04:00
Adam	1bd7932cc5	Drop 1.8/1.15/1.16.3 support (#185 ) With the recent uptick in requests for support by people running 1.12 who have recently updated past Java 9, I revisited the supported versions. First, the "modern" versions: 1.15 is run by 2.9% of servers, 1.16.3 by 5%. Since all of these versions are supported to ease the transition of updating servers and servers have updated, there's no real reason to keep them around. It's a lot easier if you can update a plugin and just have it work on both versions rather than push all the plugin updates to master with the server update, but none of these versions have any reason for long-term support. Regarding heavily outdated server software: As of the time of writing, 1.8 and 1.12 have market shares of 8.6% and 8.5% of servers respectively. Regarding 1.8: 1.8 support is already a bit wonky - with the changes made to inventory names, it's not (easily) possible to bridge the gap, and future changes will make that more and more difficult. People use 1.8 because they disliked the 1.9 combat changes, but there are plugins that fully rework combat to how it used to be. I have yet to hear a compelling argument that cannot be resolved with plugins. In the interest of my own sanity (handling and backporting the inventory name change in particular was a real humdinger) I will no longer be backporting changes to 1.8. Regarding 1.12: I am honestly not sure why people are not updating. I get it, 1.13 and the flattening was a rough transition, but pretty much every developer active at the time bridged the gap. If your server is heavily dependent on some software only available at that time, you can live with other software available at that time. At the time of 1.12's release, Java 9 was not released. Either update your server, downgrade Java, or fork OpenInv and backport Java 9 support yourself.	2021-03-16 09:34:41 -04:00
Adam	dad00d2d9c	build: Add action to build and automatically release files (#170 ) Auto-release is gonna get a nice live test at a later date.	2020-11-26 11:05:45 -05:00
Jikoo	502f661be3	fix: Update 1.15 adapter to 1.15.2	2020-11-26 10:47:51 -05:00
Jikoo	804d30bcc7	tpyo	2020-11-15 14:33:28 -05:00
Jikoo	db8b67082b	Fix up .gitignore a bit	2020-11-15 13:25:50 -05:00
Jikoo	b2156edcc7	Fix mistake in InventoryAccess grabbing ender chest	2020-11-15 12:59:59 -05:00
Jikoo	45de495699	Simplify command executor assignment a little more	2020-11-15 12:26:36 -05:00
Jikoo	f45d332727	Clarify download locations for older versions Hopefully this will help people figure out where they've gone wrong. Maybe I should be stating supported versions in release notes too.	2020-11-15 12:22:25 -05:00
Jikoo	9705cb156b	Bump version to 4.1.6-SNAPSHOT for development	2020-11-03 18:32:43 -05:00
Jikoo	1c45ef517f	Bump version to 4.1.5 for release	2020-11-03 18:32:11 -05:00
Jikoo	3fee84fc58	Add support for 1.16.4, drop 1.16.1	2020-11-03 18:19:34 -05:00
Jikoo	00113cc4d4	These are my favorite version bumps	2020-09-15 13:47:12 -04:00
Jikoo	788f022e74	Mitigate some permissions confusion For some reason, certain permissions plugins seem to not respect our declared default false nodes. To alleviate user confusion, these nodes will not be allowed to be used via wildcard internally.	2020-09-15 13:44:50 -04:00
Jikoo	da55790fd2	Allow spectators to edit inventories Requires permission OpenInv.spectate Closes #155	2020-09-15 13:35:04 -04:00
Jikoo	1a6d513603	Reduce technical debt * Reduce duplicate code * Use more specific functional interfaces where available * Fix some potential NPEs * Remove some unnecessary/nonfunctional code * Merge inventory listeners - no longer need to keep separate due to event availability * Removed TODO items that probably won't ever be implemented. Good ideas, too drastic changes or too much work to maintain.	2020-09-15 12:51:49 -04:00
Jikoo	a5b02ab26a	Bump version to 4.1.5-SNAPSHOT for development	2020-08-22 12:22:00 -04:00
Jikoo	0c3ce2dfb3	Bump version to 4.1.4 for release	2020-08-22 12:21:22 -04:00
Jikoo	a1f4649a09	Reword invalid version message, include releases link	2020-08-22 12:00:08 -04:00
Jikoo	100d0e12cd	Update to 1.16.2	2020-08-12 00:06:20 -04:00
Jikoo	3e629798e5	Bump version to 4.1.4-SNAPSHOT for development	2020-07-15 23:23:31 -04:00
Jikoo	7c1f15974c	Bump version to 4.1.3 for release	2020-07-15 23:23:03 -04:00
mfnalex	d992237766	Add support for 3rd party plugins firing PlayerInteractEvent (#146 ) * Add support for InvUnload * generalize 3rd party plugins' event check	2020-07-15 22:38:38 -04:00
Jikoo	c93464e643	Fix double chest loot generation with AnyContainer (#142 )	2020-07-08 20:44:15 -04:00
Jikoo	56afefc82b	Bump version to 4.1.3-SNAPSHOT for development	2020-06-25 19:40:07 -04:00
Jikoo	f0a66570d2	Bump version to 4.1.2 for release	2020-06-25 19:39:38 -04:00
Jikoo	201a3578bf	Add 1.16 support, drop 1.14 (#141 )	2020-06-25 19:38:38 -04:00
Nathaniel Freeman	1228fc2de2	es_ES translation	2020-06-24 07:12:20 -04:00
NotMyFault	2561e75ae5	Fix typo	2020-06-02 19:01:33 -04:00
N0tMyFaultOG	80661b9465	Add german translation	2020-06-02 17:59:31 -04:00
Jikoo	53701da34f	Bump version to 4.1.2-SNAPSHOT for development	2020-05-29 10:32:32 -04:00
Jikoo	9cf4712813	Bump version to 4.1.1 for release	2020-05-29 10:32:03 -04:00
Jikoo	abe8fccdb5	Document new nodes	2020-05-29 10:27:50 -04:00
Jikoo	4499bb5453	Don't break behavior on existing setups Permission to use /openinv and /openender will grant online/offline access so that existing permissions configurations do not have to be redone. Users looking to implement the new permissions will need to deny them.	2020-05-29 10:22:40 -04:00
Phoenix616	5405b7d7b9	Add permission for online/offline opening (Resolves #129 )	2020-05-29 10:08:26 -04:00
129fc5e32c631b5007cb2cd8d45d416002b42bab	34199d12a4	Add localization for Brazilian Portuguese	2020-04-30 17:42:10 -04:00
Jikoo	67131ab9f9	Save after adding new keys	2020-04-24 10:47:51 -04:00
Jikoo	723381cb2b	Fix IndexOutOfBounds on no args Closes #128	2020-04-22 12:07:19 -04:00
Jikoo	34e7252d77	Correct lang + replacement mistake with inventory names	2020-04-19 18:04:10 -04:00
Jikoo	a1b2df74cc	Save existing vehicles if we had to load player (#22 )	2020-04-19 17:54:45 -04:00