Add reading assistant

Add relocation notice
2021-07-12 21:07:45 -04:00 · 2021-04-11 18:29:37 -04:00
54 changed files with 357 additions and 2414 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,76 +0,0 @@
-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@v1
-        with:
-          java-version: 16
-
-      # 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
--- a/.github/workflows/close-issue.yml
+++ b/.github/workflows/close-issue.yml
@@ -0,0 +1,13 @@
+name: Close Issue
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: peter-evans/close-issue@v1.0.3
+        with:
+          comment: "Per the notice in the readme, OpenInv is now being maintained at [Jikoo/OpenInv](https://github.com/Jikoo/OpenInv)."
--- a/.github/workflows/close-pr.yml
+++ b/.github/workflows/close-pr.yml
@@ -0,0 +1,13 @@
+name: Close Pull Request
+
+on:
+  pull_request_target:
+    types: [opened]
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: superbrothers/close-pull-request@v3.1.0
+        with:
+          comment: "Per the notice in the readme, OpenInv is now being maintained at [Jikoo/OpenInv](https://github.com/Jikoo/OpenInv)."
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,37 +0,0 @@
-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 }}"
--- a/README.MD
+++ b/README.MD
@@ -1,3 +1,6 @@
+## Notice
+I am now maintaining OpenInv over at [Jikoo/OpenInv](https://github.com/Jikoo/OpenInv) because I needed higher levels of access to add secrets to the repository for Github Actions. It feels ruder to send an email saying what amounts to "pls op" than to redirect people to my fork, though neither option is polite. Existing issues will remain open here until resolved (you can't transfer issues across organizations/users), but any new issues in this repo will be closed without resolution.
+
 ## About
 OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) which allows users to open and edit anyone's inventory or ender chest - online or not!

@@ -15,7 +18,48 @@ OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) whi
 - **AnyContainer**: Open containers, even if blocked by ocelots or blocks.

 ## Commands
-See [the wiki](https://github.com/Jikoo/OpenInv/wiki/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>

 ## Permissions
 <table>
@@ -102,39 +146,8 @@ See [the wiki](https://github.com/Jikoo/OpenInv/wiki/Commands).
 </table>

 ## For Developers
-
-### 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, 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`

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

@@ -143,3 +156,20 @@ 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-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/>.
+```
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2021 lishid. All rights reserved.
+  ~ 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
@@ -19,9 +19,9 @@
  <modelVersion>4.0.0</modelVersion>

  <parent>
-    <artifactId>openinvparent</artifactId>
    <groupId>com.lishid</groupId>
-    <version>4.1.8</version>
+    <artifactId>openinvparent</artifactId>
+    <version>4.1.6-SNAPSHOT</version>
  </parent>

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

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

@@ -42,6 +45,11 @@
    <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>
--- a/api/src/main/java/com/lishid/openinv/IOpenInv.java
+++ b/api/src/main/java/com/lishid/openinv/IOpenInv.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * 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
@@ -24,7 +24,6 @@ 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;
@@ -154,7 +153,10 @@ 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().log(Level.WARNING, new Throwable("Current stack trace"), () -> "Current stack trace");
+            this.getLogger().warning("Trace:");
+            for (StackTraceElement element : new Throwable().fillInStackTrace().getStackTrace()) {
+                this.getLogger().warning(element.toString());
+            }
        }

        OfflinePlayer player;
@@ -170,6 +172,11 @@ 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) {
@@ -225,24 +232,16 @@ 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.
     */
-    @Deprecated
-    default boolean notifyAnyChest() {
-        return true;
-    }
+    boolean notifyAnyChest();

    /**
     * Check the configuration value for whether or not OpenInv displays a notification to the user
     * when a container is activated with SilentChest.
     *
     * @return true unless configured otherwise
-     * @deprecated OpenInv uses action bar chat for notifications. Whether or not they show is based on language settings.
     */
-    @Deprecated
-    default boolean notifySilentChest() {
-        return true;
-    }
+    boolean notifySilentChest();

    /**
     * Mark a Player as no longer in use by a Plugin to allow OpenInv to remove it from the cache
--- a/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java
+++ b/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * 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
--- a/api/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java
+++ b/api/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-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
--- a/api/src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java
+++ b/api/src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-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
--- a/api/src/main/java/com/lishid/openinv/internal/ISpecialInventory.java
+++ b/api/src/main/java/com/lishid/openinv/internal/ISpecialInventory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-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
@@ -16,7 +16,6 @@

 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;
@@ -49,11 +48,4 @@ public interface ISpecialInventory {
     */
    boolean isInUse();

-    /**
-     * Gets the Player associated with this ISpecialInventory.
-     *
-     * @return the HumanEntity
-     */
-    @NotNull HumanEntity getPlayer();
-
 }
--- a/api/src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java
+++ b/api/src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-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
--- a/api/src/main/java/com/lishid/openinv/util/InventoryAccess.java
+++ b/api/src/main/java/com/lishid/openinv/util/InventoryAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-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
--- a/api/src/main/java/com/lishid/openinv/util/StringMetric.java
+++ b/api/src/main/java/com/lishid/openinv/util/StringMetric.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * 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
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2021 lishid. All rights reserved.
+  ~ 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
@@ -21,12 +21,11 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.1.8</version>
+    <version>4.1.6-SNAPSHOT</version>
  </parent>

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

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

-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+<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.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">

  <id>reactor-uberjar</id>

@@ -34,18 +34,8 @@
      <binaries>
        <outputDirectory>/</outputDirectory>
        <unpack>true</unpack>
-        <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>
+        <!-- unpackOptions must be present or build breaks. -->
+        <unpackOptions/>
      </binaries>

    </moduleSet>
--- a/internal/pom.xml
+++ b/internal/pom.xml
@@ -0,0 +1,42 @@
+<!--
+  ~ 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.6-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvinternal</artifactId>
+  <name>OpenInvInternal</name>
+
+  <packaging>pom</packaging>
+
+  <profiles>
+
+    <profile>
+      <id>all</id>
+      <modules>
+        <module>v1_16_R3</module>
+      </modules>
+    </profile>
+
+  </profiles>
+
+</project>
--- a/internal/v1_16_R3/pom.xml
+++ b/internal/v1_16_R3/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2011-2021 lishid. All rights reserved.
+  ~ 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
@@ -20,10 +20,9 @@
  <modelVersion>4.0.0</modelVersion>

  <parent>
-    <artifactId>openinvparent</artifactId>
    <groupId>com.lishid</groupId>
-    <relativePath>../../pom.xml</relativePath>
-    <version>4.1.8</version>
+    <artifactId>openinvinternal</artifactId>
+    <version>4.1.6-SNAPSHOT</version>
  </parent>

  <artifactId>openinvadapter1_16_R3</artifactId>
@@ -31,32 +30,44 @@

  <dependencies>
    <dependency>
-      <artifactId>spigot</artifactId>
      <groupId>org.spigotmc</groupId>
-      <scope>provided</scope>
+      <artifactId>spigot</artifactId>
      <version>1.16.5-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
    </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>
+      <version>4.1.6-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>
--- a/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/AnySilentContainer.java
+++ b/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/AnySilentContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * 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
--- a/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/OpenPlayer.java
+++ b/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/OpenPlayer.java
@@ -32,24 +32,15 @@ public class OpenPlayer extends CraftPlayer {
        super(server, entity);
    }

-    @Override
-    public void loadData() {
-        // See CraftPlayer#loadData
-        NBTTagCompound loaded = this.server.getHandle().playerFileData.load(this.getHandle());
-        if (loaded != null) {
-            readExtraData(loaded);
-        }
-    }
-
    @Override
    public void saveData() {
+        super.saveData();
        EntityPlayer player = this.getHandle();
        // See net.minecraft.server.WorldNBTStorage#save(EntityPlayer)
        try {
            WorldNBTStorage worldNBTStorage = player.server.getPlayerList().playerFileData;

            NBTTagCompound playerData = player.save(new NBTTagCompound());
-            setExtraData(playerData);

            if (!isOnline()) {
                // Special case: save old vehicle data
--- a/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/PlayerDataManager.java
+++ b/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/PlayerDataManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * 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
@@ -57,7 +57,8 @@ public class PlayerDataManager implements IPlayerDataManager {
        }
    }

-    public static @NotNull EntityPlayer getHandle(final Player player) {
+    @NotNull
+    public static EntityPlayer getHandle(final Player player) {
        if (player instanceof CraftPlayer) {
            return ((CraftPlayer) player).getHandle();
        }
@@ -77,8 +78,9 @@ public class PlayerDataManager implements IPlayerDataManager {
        return nmsPlayer;
    }

+    @Nullable
    @Override
-    public @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline) {
+    public Player loadPlayer(@NotNull final OfflinePlayer offline) {
        // Ensure player has data
        if (!offline.hasPlayedBefore()) {
            return null;
--- a/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/SpecialEnderChest.java
+++ b/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/SpecialEnderChest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * 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
@@ -80,11 +80,6 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
        }
    }

-    @Override
-    public @NotNull Player getPlayer() {
-        return owner.getBukkitEntity();
-    }
-
    @Override
    public void update() {
        this.owner.getEnderChest().update();
--- a/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/SpecialPlayerInventory.java
+++ b/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/SpecialPlayerInventory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * 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
@@ -212,11 +212,6 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
        this.playerOnline = false;
    }

-    @Override
-    public @NotNull HumanEntity getPlayer() {
-        return this.player.getBukkitEntity();
-    }
-
    @Override
    public ItemStack splitStack(int i, final int j) {
        List<ItemStack> list = this.items;
--- a/internal/v1_17_R1/pom.xml
+++ b/internal/v1_17_R1/pom.xml
@@ -1,73 +0,0 @@
-<?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.8</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-R0.1-SNAPSHOT</version>
-    </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>
-        <!-- Cannot use minimizeJar until maven-shade-plugin 3.3.0 releases; ASM used does not support Java 16. -->
-        <configuration>
-          <minimizeJar>false</minimizeJar>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
--- a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/AnySilentContainer.java
+++ b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/AnySilentContainer.java
@@ -1,348 +0,0 @@
-/*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_17_R1;
-
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.IAnySilentContainer;
-import java.lang.reflect.Field;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import net.minecraft.core.BlockPosition;
-import net.minecraft.network.chat.ChatMessage;
-import net.minecraft.network.chat.IChatBaseComponent;
-import net.minecraft.server.level.EntityPlayer;
-import net.minecraft.server.level.PlayerInteractManager;
-import net.minecraft.world.ITileInventory;
-import net.minecraft.world.InventoryLargeChest;
-import net.minecraft.world.TileInventory;
-import net.minecraft.world.entity.player.EntityHuman;
-import net.minecraft.world.entity.player.PlayerInventory;
-import net.minecraft.world.inventory.Container;
-import net.minecraft.world.inventory.ContainerChest;
-import net.minecraft.world.inventory.Containers;
-import net.minecraft.world.inventory.InventoryEnderChest;
-import net.minecraft.world.level.EnumGamemode;
-import net.minecraft.world.level.World;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.BlockBarrel;
-import net.minecraft.world.level.block.BlockChest;
-import net.minecraft.world.level.block.BlockChestTrapped;
-import net.minecraft.world.level.block.BlockShulkerBox;
-import net.minecraft.world.level.block.entity.TileEntity;
-import net.minecraft.world.level.block.entity.TileEntityChest;
-import net.minecraft.world.level.block.entity.TileEntityEnderChest;
-import net.minecraft.world.level.block.entity.TileEntityLootable;
-import net.minecraft.world.level.block.state.IBlockData;
-import net.minecraft.world.level.block.state.properties.BlockPropertyChestType;
-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("b");
-            this.playerInteractManagerGamemode.setAccessible(true);
-        } catch (NoSuchFieldException | SecurityException e) {
-            Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger();
-            logger.warning("Unable to directly write player gamemode! SilentChest will fail.");
-            logger.log(Level.WARNING, "Error obtaining gamemode field", e);
-        }
-    }
-
-    @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 directional)) {
-                // Shouldn't be possible. Just in case, demand AnyChest.
-                return true;
-            }
-
-            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) || ((Chest) blockData).getType() == Chest.Type.SINGLE) {
-            return false;
-        }
-
-        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 relativeChest)) {
-            return false;
-        }
-
-        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.getWorld();
-        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.world.level.block.BlockEnderChest
-            InventoryEnderChest enderChest = player.getEnderChest();
-            enderChest.a((TileEntityEnderChest) tile);
-            player.openContainer(new TileInventory((containerCounter, playerInventory, ignored) -> {
-                Containers<?> containers = PlayerDataManager.getContainers(enderChest.getSize());
-                int rows = enderChest.getSize() / 9;
-                return new ContainerChest(containers, containerCounter, playerInventory, enderChest, rows);
-            }, new ChatMessage("container.enderchest")));
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        if (!(tile instanceof ITileInventory tileInventory)) {
-            return false;
-        }
-
-        IBlockData blockData = world.getType(blockPosition);
-        Block block = blockData.getBlock();
-
-        if (block instanceof BlockChest) {
-
-            BlockPropertyChestType chestType = blockData.get(BlockChest.c);
-
-            if (chestType != BlockPropertyChestType.a) {
-
-                BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.h(blockData));
-                IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
-
-                if (adjacentBlockData.getBlock() == block) {
-
-                    BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.c);
-
-                    if (adjacentChestType != BlockPropertyChestType.a && chestType != adjacentChestType
-                            && adjacentBlockData.get(BlockChest.b) == blockData.get(BlockChest.b)) {
-
-                        TileEntity adjacentTile = world.getTileEntity(adjacentBlockPosition);
-
-                        if (adjacentTile instanceof TileEntityChest && tileInventory instanceof  TileEntityChest) {
-                            TileEntityChest rightChest = chestType == BlockPropertyChestType.c ? ((TileEntityChest) tileInventory) : (TileEntityChest) adjacentTile;
-                            TileEntityChest leftChest = chestType == BlockPropertyChestType.c ? (TileEntityChest) adjacentTile : ((TileEntityChest) tileInventory);
-
-                            if (silentchest && (rightChest.g != null || leftChest.g != null)) {
-                                OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
-                                return false;
-                            }
-
-                            tileInventory = new ITileInventory() {
-                                public Container createMenu(int containerCounter, PlayerInventory playerInventory, EntityHuman entityHuman) {
-                                    leftChest.d(playerInventory.l);
-                                    rightChest.d(playerInventory.l);
-                                    return ContainerChest.b(containerCounter, playerInventory, new InventoryLargeChest(rightChest, leftChest));
-                                }
-
-                                public IChatBaseComponent getScoreboardDisplayName() {
-                                    if (leftChest.hasCustomName()) {
-                                        return leftChest.getScoreboardDisplayName();
-                                    }
-                                    if (rightChest.hasCustomName()) {
-                                        return rightChest.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.d.getGameMode() == EnumGamemode.d) {
-            player.openContainer(tileInventory);
-            return true;
-        }
-
-        // SilentChest requires access to setting players' gamemode directly.
-        if (this.playerInteractManagerGamemode == null) {
-            return false;
-        }
-
-        if (tile instanceof TileEntityLootable lootable) {
-            if (lootable.g != null) {
-                OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
-                return false;
-            }
-        }
-
-        EnumGamemode gamemode = player.d.getGameMode();
-        this.forceGameMode(player, EnumGamemode.d);
-        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);
-
-        // Force game mode change without informing plugins or players.
-        EnumGamemode gamemode = player.d.getGameMode();
-        this.forceGameMode(player, EnumGamemode.d);
-
-        // See EntityPlayer#closeInventory - can't call or we'd recursively deactivate.
-        player.bV.b(player);
-        player.bU.a(player.bV);
-        player.bV = player.bU;
-
-        // Revert forced game mode.
-        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 {
-            this.playerInteractManagerGamemode.setAccessible(true);
-            this.playerInteractManagerGamemode.set(player.d, gameMode);
-            // TODO: may need additional calls to update abilities to prevent container sound + animation
-            //  gameMode.a(player.getAbilities());
-            //  player.updateAbilities();
-            //  should be the fix if it doesn't work as-is
-        } catch (IllegalArgumentException | IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-}
--- a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/OpenPlayer.java
+++ b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/OpenPlayer.java
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_17_R1;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import net.minecraft.nbt.NBTCompressedStreamTools;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.server.level.EntityPlayer;
-import net.minecraft.world.level.storage.WorldNBTStorage;
-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, EntityPlayer entity) {
-        super(server, entity);
-    }
-
-    @Override
-    public void loadData() {
-        // See CraftPlayer#loadData
-        NBTTagCompound loaded = this.server.getHandle().r.load(this.getHandle());
-        if (loaded != null) {
-            readExtraData(loaded);
-        }
-    }
-
-    @Override
-    public void saveData() {
-        EntityPlayer player = this.getHandle();
-        // See net.minecraft.world.level.storage.WorldNBTStorage#save(EntityHuman)
-        try {
-            WorldNBTStorage worldNBTStorage = player.c.getPlayerList().r;
-
-            NBTTagCompound playerData = player.save(new NBTTagCompound());
-            setExtraData(playerData);
-
-            if (!isOnline()) {
-                // Special case: save old vehicle data
-                NBTTagCompound oldData = worldNBTStorage.load(player);
-
-                if (oldData != null && oldData.hasKeyOfType("RootVehicle", 10)) {
-                    // See net.minecraft.server.PlayerList#a(NetworkManager, EntityPlayer) and net.minecraft.server.EntityPlayer#b(NBTTagCompound)
-                    playerData.set("RootVehicle", oldData.getCompound("RootVehicle"));
-                }
-            }
-
-            File file = new File(worldNBTStorage.getPlayerDir(), player.getUniqueIDString() + ".dat.tmp");
-            File file1 = new File(worldNBTStorage.getPlayerDir(), player.getUniqueIDString() + ".dat");
-
-            NBTCompressedStreamTools.a(playerData, new FileOutputStream(file));
-
-            if (file1.exists() && !file1.delete() || !file.renameTo(file1)) {
-                LogManager.getLogger().warn("Failed to save player data for {}", player.getDisplayName().getString());
-            }
-
-        } catch (Exception e) {
-            LogManager.getLogger().warn("Failed to save player data for {}", player.getDisplayName().getString());
-        }
-    }
-
-}
--- a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/PlayerDataManager.java
+++ b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/PlayerDataManager.java
@@ -1,231 +0,0 @@
-/*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_17_R1;
-
-import 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.Level;
-import java.util.logging.Logger;
-import net.minecraft.network.chat.ChatComponentText;
-import net.minecraft.network.protocol.game.PacketPlayOutOpenWindow;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.EntityPlayer;
-import net.minecraft.server.level.WorldServer;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.inventory.Container;
-import net.minecraft.world.inventory.Containers;
-import net.minecraft.world.level.World;
-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(Level.WARNING, e.getMessage(), e);
-            bukkitEntity = null;
-        }
-    }
-
-    public static @NotNull 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 @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();
-        WorldServer worldServer = server.getWorldServer(World.f);
-
-        if (worldServer == null) {
-            return null;
-        }
-
-        EntityPlayer entity = new EntityPlayer(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(EntityPlayer player) throws IllegalAccessException {
-        if (bukkitEntity == null) {
-            return;
-        }
-
-        bukkitEntity.setAccessible(true);
-
-        bukkitEntity.set(player, new OpenPlayer(player.c.server, player));
-    }
-
-    @NotNull
-    @Override
-    public Player inject(@NotNull Player player) {
-        try {
-            EntityPlayer 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) {
-
-        EntityPlayer nmsPlayer = getHandle(player);
-
-        if (nmsPlayer.b == null) {
-            return null;
-        }
-
-        InventoryView view = getView(player, inventory);
-
-        if (view == null) {
-            return player.openInventory(inventory.getBukkitInventory());
-        }
-
-        Container container = new CraftContainer(view, nmsPlayer, nmsPlayer.nextContainerCounter()) {
-            @Override
-            public Containers<?> getType() {
-                return getContainers(inventory.getBukkitInventory().getSize());
-            }
-        };
-
-        container.setTitle(new ChatComponentText(view.getTitle()));
-        container = CraftEventFactory.callInventoryOpenEvent(nmsPlayer, container);
-
-        if (container == null) {
-            return null;
-        }
-
-        nmsPlayer.b.sendPacket(new PacketPlayOutOpenWindow(container.j, container.getType(),
-                new ChatComponentText(container.getBukkitView().getTitle())));
-        nmsPlayer.bV = 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 Containers<?> getContainers(int inventorySize) {
-
-        return switch (inventorySize) {
-            case 9 -> Containers.a;
-            case 18 -> Containers.b;
-            case 36 -> Containers.d; // PLAYER
-            case 41, 45 -> Containers.e;
-            case 54 -> Containers.f;
-            default -> Containers.c; // 9x3
-        };
-    }
-
-    @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;
-    }
-
-}
--- a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/SpecialEnderChest.java
+++ b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/SpecialEnderChest.java
@@ -1,341 +0,0 @@
-/*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_17_R1;
-
-import 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.NBTTagList;
-import net.minecraft.server.level.EntityPlayer;
-import net.minecraft.world.ContainerUtil;
-import net.minecraft.world.IInventoryListener;
-import net.minecraft.world.entity.player.AutoRecipeStackManager;
-import net.minecraft.world.entity.player.EntityHuman;
-import net.minecraft.world.inventory.InventoryEnderChest;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.entity.TileEntityEnderChest;
-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.entity.Player;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEnderChest {
-
-    private final CraftInventory inventory;
-    private EntityPlayer owner;
-    private NonNullList<ItemStack> c;
-    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.c = this.owner.getEnderChest().c;
-    }
-
-    @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.c.get(i));
-                }
-                this.c = enderChest.c;
-                enderChest.transaction.addAll(this.transaction);
-            } catch (Exception ignored) {}
-            this.playerOnline = true;
-        }
-    }
-
-    @Override
-    public @NotNull Player getPlayer() {
-        return owner.getBukkitEntity();
-    }
-
-    @Override
-    public void update() {
-        this.owner.getEnderChest().update();
-    }
-
-    @Override
-    public List<ItemStack> getContents() {
-        return this.c;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        super.onOpen(who);
-        this.owner.getEnderChest().onOpen(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.owner.getEnderChest().onClose(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return this.owner.getEnderChest().getViewers();
-    }
-
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void a(TileEntityEnderChest tileentityenderchest) {
-        this.owner.getEnderChest().a(tileentityenderchest);
-    }
-
-    @Override
-    public boolean b(TileEntityEnderChest tileentityenderchest) {
-        return this.owner.getEnderChest().b(tileentityenderchest);
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return this.owner.getEnderChest().getMaxStackSize();
-    }
-
-    @Override
-    public void setMaxStackSize(int i) {
-        this.owner.getEnderChest().setMaxStackSize(i);
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner.getEnderChest().getOwner();
-    }
-
-    @Override
-    public @Nullable 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.c.size() ? this.c.get(i) : ItemStack.b;
-    }
-
-    @Override
-    public ItemStack splitStack(int i, int j) {
-        ItemStack itemstack = ContainerUtil.a(this.c, i, j);
-        if (!itemstack.isEmpty()) {
-            this.update();
-        }
-
-        return itemstack;
-    }
-
-    @Override
-    public ItemStack a(ItemStack itemstack) {
-        ItemStack itemstack1 = itemstack.cloneItemStack();
-        this.d(itemstack1);
-        if (itemstack1.isEmpty()) {
-            return ItemStack.b;
-        } else {
-            this.c(itemstack1);
-            return itemstack1.isEmpty() ? ItemStack.b : itemstack1;
-        }
-    }
-
-    private void c(ItemStack itemstack) {
-        for(int i = 0; i < this.getSize(); ++i) {
-            ItemStack itemstack1 = this.getItem(i);
-            if (itemstack1.isEmpty()) {
-                this.setItem(i, itemstack.cloneItemStack());
-                itemstack.setCount(0);
-                return;
-            }
-        }
-    }
-
-    private void d(ItemStack itemstack) {
-        for(int i = 0; i < this.getSize(); ++i) {
-            ItemStack itemstack1 = this.getItem(i);
-            if (ItemStack.e(itemstack1, itemstack)) {
-                this.a(itemstack, itemstack1);
-                if (itemstack.isEmpty()) {
-                    return;
-                }
-            }
-        }
-    }
-
-    private void a(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.add(j);
-            itemstack.subtract(j);
-            this.update();
-        }
-    }
-
-    @Override
-    public ItemStack splitWithoutUpdate(int i) {
-        ItemStack itemstack = this.c.get(i);
-        if (itemstack.isEmpty()) {
-            return ItemStack.b;
-        } else {
-            this.c.set(i, ItemStack.b);
-            return itemstack;
-        }
-    }
-
-    @Override
-    public void setItem(int i, ItemStack itemstack) {
-        this.c.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 isEmpty() {
-        return this.c.stream().allMatch(ItemStack::isEmpty);
-    }
-
-    @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.c.clear();
-        this.update();
-    }
-
-    @Override
-    public void a(AutoRecipeStackManager autorecipestackmanager) {
-        for (ItemStack itemstack : this.c) {
-            autorecipestackmanager.b(itemstack);
-        }
-
-    }
-
-    @Override
-    public List<ItemStack> f() {
-        List<ItemStack> list = this.c.stream().filter(Predicate.not(ItemStack::isEmpty)).collect(Collectors.toList());
-        this.clear();
-        return list;
-    }
-
-    @Override
-    public ItemStack a(Item item, int i) {
-        ItemStack itemstack = new ItemStack(item, 0);
-
-        for(int j = this.getSize() - 1; j >= 0; --j) {
-            ItemStack itemstack1 = this.getItem(j);
-            if (itemstack1.getItem().equals(item)) {
-                int k = i - itemstack.getCount();
-                ItemStack itemstack2 = itemstack1.cloneAndSubtract(k);
-                itemstack.add(itemstack2.getCount());
-                if (itemstack.getCount() == i) {
-                    break;
-                }
-            }
-        }
-
-        if (!itemstack.isEmpty()) {
-            this.update();
-        }
-
-        return itemstack;
-    }
-
-    @Override
-    public boolean b(ItemStack itemStack) {
-        for (ItemStack itemStack1 : this.c) {
-            if (itemStack1.isEmpty() || ItemStack.e(itemStack1, itemStack) && itemStack1.getCount() < itemStack1.getMaxStackSize()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public String toString() {
-        return this.c.stream().filter((itemStack) -> !itemStack.isEmpty()).collect(Collectors.toList()).toString();
-    }
-
-    @Override
-    public void a(NBTTagList nbttaglist) {
-        for(int i = 0; i < nbttaglist.size(); ++i) {
-            ItemStack itemstack = ItemStack.a(nbttaglist.getCompound(i));
-            if (!itemstack.isEmpty()) {
-                this.a(itemstack);
-            }
-        }
-
-    }
-
-}
--- a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/SpecialPlayerInventory.java
+++ b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/SpecialPlayerInventory.java
@@ -1,777 +0,0 @@
-/*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_17_R1;
-
-import com.google.common.collect.ImmutableList;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import net.minecraft.CrashReport;
-import net.minecraft.CrashReportSystemDetails;
-import net.minecraft.ReportedException;
-import net.minecraft.core.NonNullList;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.network.chat.ChatMessage;
-import net.minecraft.network.chat.IChatBaseComponent;
-import net.minecraft.network.protocol.game.PacketPlayOutSetSlot;
-import net.minecraft.server.level.EntityPlayer;
-import net.minecraft.tags.Tag;
-import net.minecraft.world.ContainerUtil;
-import net.minecraft.world.IInventory;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.EnumItemSlot;
-import net.minecraft.world.entity.player.AutoRecipeStackManager;
-import net.minecraft.world.entity.player.EntityHuman;
-import net.minecraft.world.entity.player.PlayerInventory;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemArmor;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.state.IBlockData;
-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.entity.Player;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-
-public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-
-    private final CraftInventory inventory;
-    private boolean playerOnline;
-    private EntityHuman l;
-    private NonNullList<ItemStack> h;
-    private NonNullList<ItemStack> i;
-    private NonNullList<ItemStack> j;
-    private List<NonNullList<ItemStack>> n;
-
-    public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
-        this.inventory = new CraftInventory(this);
-        this.playerOnline = online;
-        this.l = super.l;
-        this.h = this.l.getInventory().h;
-        this.i = this.l.getInventory().i;
-        this.j = this.l.getInventory().j;
-        this.n = ImmutableList.of(this.h, this.i, this.j);
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull final Player player) {
-        if (!this.playerOnline) {
-            EntityPlayer entityPlayer = PlayerDataManager.getHandle(player);
-            entityPlayer.getInventory().transaction.addAll(this.transaction);
-            this.l = entityPlayer;
-            for (int i = 0; i < getSize(); ++i) {
-                this.l.getInventory().setItem(i, getRawItem(i));
-            }
-            this.l.getInventory().k = this.k;
-            this.h = this.l.getInventory().h;
-            this.i = this.l.getInventory().i;
-            this.j = this.l.getInventory().j;
-            this.n = ImmutableList.of(this.h, this.i, this.j);
-            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.h;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.i;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.j;
-        } else if (list == this.i) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            return ItemStack.b;
-        }
-
-        return list.get(i);
-    }
-
-    private ItemStack getRawItem(int i) {
-        NonNullList<ItemStack> list = null;
-        for (NonNullList<ItemStack> next : this.n) {
-            if (i < next.size()) {
-                list = next;
-                break;
-            }
-            i -= next.size();
-        }
-
-        return list == null ? ItemStack.b : list.get(i);
-    }
-
-    @Override
-    public IChatBaseComponent getDisplayName() {
-        return new ChatMessage(this.l.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.h;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.i;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.j;
-        } else if (list == this.i) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            this.l.drop(itemstack, true);
-            return;
-        }
-
-        list.set(i, itemstack);
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        this.playerOnline = false;
-    }
-
-    @Override
-    public @NotNull HumanEntity getPlayer() {
-        return this.l.getBukkitEntity();
-    }
-
-    @Override
-    public ItemStack splitStack(int i, final int j) {
-        List<ItemStack> list = this.h;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.i;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.j;
-        } else if (list == this.i) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            return ItemStack.b;
-        }
-
-        return list.get(i).isEmpty() ? ItemStack.b : ContainerUtil.a(list, i, j);
-    }
-
-    @Override
-    public ItemStack splitWithoutUpdate(int i) {
-        List<ItemStack> list = this.h;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.i;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.j;
-        } else if (list == this.i) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            return ItemStack.b;
-        }
-
-        if (!list.get(i).isEmpty()) {
-            ItemStack itemstack = list.get(i);
-
-            list.set(i, ItemStack.b);
-            return itemstack;
-        }
-
-        return ItemStack.b;
-    }
-
-    @Override
-    public List<ItemStack> getContents() {
-        return this.n.stream().flatMap(Collection::stream).collect(Collectors.toList());
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return this.n.stream().flatMap(Collection::stream).allMatch(ItemStack::isEmpty);
-    }
-
-    @Override
-    public List<ItemStack> getArmorContents() {
-        return this.i;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        this.transaction.add(who);
-        this.l.getInventory().transaction.add(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        this.transaction.remove(who);
-        this.l.getInventory().transaction.remove(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return this.transaction;
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.l.getBukkitEntity();
-    }
-
-    public Location getLocation() {
-        return this.l.getBukkitEntity().getLocation();
-    }
-
-    /* Below this point largely just copied out of NMS to redirect to our overridden variables. */
-
-    @Override
-    public ItemStack getItemInHand() {
-        return d(this.k) ? this.h.get(this.k) : ItemStack.b;
-    }
-
-    private boolean isSimilarAndNotFull(ItemStack itemstack, ItemStack itemstack1) {
-        return !itemstack.isEmpty() && ItemStack.e(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.h.size(); ++i) {
-            ItemStack itemstack1 = this.getItem(i);
-            if (itemstack1.isEmpty()) {
-                return itemstack.getCount();
-            }
-
-            if (this.isSimilarAndNotFull(itemstack1, itemstack)) {
-                remains -= (Math.min(itemstack1.getMaxStackSize(), this.getMaxStackSize())) - itemstack1.getCount();
-            }
-
-            if (remains <= 0) {
-                return itemstack.getCount();
-            }
-        }
-
-        ItemStack offhandItemStack = this.getItem(this.h.size() + this.i.size());
-        if (this.isSimilarAndNotFull(offhandItemStack, itemstack)) {
-            remains -= (Math.min(offhandItemStack.getMaxStackSize(), this.getMaxStackSize())) - offhandItemStack.getCount();
-        }
-
-        return remains <= 0 ? itemstack.getCount() : itemstack.getCount() - remains;
-    }
-
-    @Override
-    public int getFirstEmptySlotIndex() {
-        for(int i = 0; i < this.h.size(); ++i) {
-            if (this.h.get(i).isEmpty()) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public void a(ItemStack itemstack) {
-        int i = this.b(itemstack);
-        if (d(i)) {
-            this.k = i;
-        } else if (i == -1) {
-            this.k = this.i();
-            if (!this.h.get(this.k).isEmpty()) {
-                int j = this.getFirstEmptySlotIndex();
-                if (j != -1) {
-                    this.h.set(j, this.h.get(this.k));
-                }
-            }
-
-            this.h.set(this.k, itemstack);
-        } else {
-            this.c(i);
-        }
-
-    }
-
-    @Override
-    public void c(int i) {
-        this.k = this.i();
-        ItemStack itemstack = this.h.get(this.k);
-        this.h.set(this.k, this.h.get(i));
-        this.h.set(i, itemstack);
-    }
-
-    @Override
-    public int b(ItemStack itemstack) {
-        for (int i = 0; i < this.h.size(); ++i) {
-            if (!this.h.get(i).isEmpty() && ItemStack.e(itemstack, this.h.get(i))) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public int c(ItemStack itemstack) {
-        for (int i = 0; i < this.h.size(); ++i) {
-            ItemStack itemstack1 = this.h.get(i);
-            if (!this.h.get(i).isEmpty() && ItemStack.e(itemstack, this.h.get(i)) && !this.h.get(i).g() && !itemstack1.hasEnchantments() && !itemstack1.hasName()) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public int i() {
-        int i;
-        int j;
-        for (j = 0; j < 9; ++j) {
-            i = (this.k + j) % 9;
-            if (this.h.get(i).isEmpty()) {
-                return i;
-            }
-        }
-
-        for (j = 0; j < 9; ++j) {
-            i = (this.k + j) % 9;
-            if (!this.h.get(i).hasEnchantments()) {
-                return i;
-            }
-        }
-
-        return this.k;
-    }
-
-    @Override
-    public void a(double d0) {
-        if (d0 > 0.0D) {
-            d0 = 1.0D;
-        }
-
-        if (d0 < 0.0D) {
-            d0 = -1.0D;
-        }
-
-        this.k = (int) (this.k - d0);
-
-        while (this.k < 0) {
-            this.k += 9;
-        }
-
-        while (this.k >= 9) {
-            this.k -= 9;
-        }
-
-    }
-
-    @Override
-    public int a(Predicate<ItemStack> predicate, int i, IInventory iinventory) {
-        byte b0 = 0;
-        boolean flag = i == 0;
-        int j = b0 + ContainerUtil.a(this, predicate, i - b0, flag);
-        j += ContainerUtil.a(iinventory, predicate, i - j, flag);
-        ItemStack itemstack = this.l.bV.getCarried();
-        j += ContainerUtil.a(itemstack, predicate, i - j, flag);
-        if (itemstack.isEmpty()) {
-            this.l.bV.setCarried(ItemStack.b);
-        }
-
-        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(Objects.requireNonNull(itemstack.getTag()).clone());
-            }
-
-            this.setItem(i, itemstack1);
-        }
-
-        k = Math.min(j, itemstack1.getMaxStackSize() - itemstack1.getCount());
-
-        if (k > this.getMaxStackSize() - itemstack1.getCount()) {
-            k = this.getMaxStackSize() - itemstack1.getCount();
-        }
-
-        if (k != 0) {
-            j -= k;
-            itemstack1.add(k);
-            itemstack1.d(5);
-        }
-
-        return j;
-    }
-
-    @Override
-    public int firstPartial(ItemStack itemstack) {
-        if (this.isSimilarAndNotFull(this.getItem(this.k), itemstack)) {
-            return this.k;
-        } else if (this.isSimilarAndNotFull(this.getItem(40), itemstack)) {
-            return 40;
-        } else {
-            for(int i = 0; i < this.h.size(); ++i) {
-                if (this.isSimilarAndNotFull(this.h.get(i), itemstack)) {
-                    return i;
-                }
-            }
-
-            return -1;
-        }
-    }
-
-    @Override
-    public void j() {
-        for (NonNullList<ItemStack> nonNullList : this.n) {
-            for (int i = 0; i < nonNullList.size(); ++i) {
-                if (!nonNullList.get(i).isEmpty()) {
-                    nonNullList.get(i).a(this.l.t, this.l, i, this.k == 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.g()) {
-                    if (i == -1) {
-                        i = this.getFirstEmptySlotIndex();
-                    }
-
-                    if (i >= 0) {
-                        this.h.set(i, itemStack.cloneItemStack());
-                        this.h.get(i).d(5);
-                        itemStack.setCount(0);
-                        return true;
-                    } else if (this.l.getAbilities().d) {
-                        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.l.getAbilities().d) {
-                        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 f(ItemStack itemStack) {
-        this.a(itemStack, true);
-    }
-
-    @Override
-    public void a(ItemStack itemStack, boolean flag) {
-        while(true) {
-            if (!itemStack.isEmpty()) {
-                int i = this.firstPartial(itemStack);
-                if (i == -1) {
-                    i = this.getFirstEmptySlotIndex();
-                }
-
-                if (i != -1) {
-                    int j = itemStack.getMaxStackSize() - this.getItem(i).getCount();
-                    if (this.c(i, itemStack.cloneAndSubtract(j)) && flag && this.l instanceof EntityPlayer) {
-                        ((EntityPlayer)this.l).b.sendPacket(new PacketPlayOutSetSlot(-2, i, this.getItem(i)));
-                    }
-                    continue;
-                }
-
-                this.l.drop(itemStack, false);
-            }
-
-            return;
-        }
-    }
-
-    @Override
-    public void g(ItemStack itemStack) {
-        for (NonNullList<ItemStack> nonNullList : this.n) {
-            for (int i = 0; i < nonNullList.size(); ++i) {
-                if (nonNullList.get(i) == itemStack) {
-                    nonNullList.set(i, ItemStack.b);
-                    break;
-                }
-            }
-        }
-    }
-
-    @Override
-    public float a(IBlockData iBlockData) {
-        return this.h.get(this.k).a(iBlockData);
-    }
-
-    @Override
-    public NBTTagList a(NBTTagList nbtTagList) {
-        NBTTagCompound nbttagcompound;
-        int i;
-        for(i = 0; i < this.h.size(); ++i) {
-            if (!this.h.get(i).isEmpty()) {
-                nbttagcompound = new NBTTagCompound();
-                nbttagcompound.setByte("Slot", (byte)i);
-                this.h.get(i).save(nbttagcompound);
-                nbtTagList.add(nbttagcompound);
-            }
-        }
-
-        for(i = 0; i < this.i.size(); ++i) {
-            if (!this.i.get(i).isEmpty()) {
-                nbttagcompound = new NBTTagCompound();
-                nbttagcompound.setByte("Slot", (byte)(i + 100));
-                this.i.get(i).save(nbttagcompound);
-                nbtTagList.add(nbttagcompound);
-            }
-        }
-
-        for(i = 0; i < this.j.size(); ++i) {
-            if (!this.j.get(i).isEmpty()) {
-                nbttagcompound = new NBTTagCompound();
-                nbttagcompound.setByte("Slot", (byte)(i + 150));
-                this.j.get(i).save(nbttagcompound);
-                nbtTagList.add(nbttagcompound);
-            }
-        }
-
-        return nbtTagList;
-    }
-
-    @Override
-    public void b(NBTTagList nbtTagList) {
-        this.h.clear();
-        this.i.clear();
-        this.j.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.h.size()) {
-                    this.h.set(j, itemstack);
-                } else if (j >= 100 && j < this.i.size() + 100) {
-                    this.i.set(j - 100, itemstack);
-                } else if (j >= 150 && j < this.j.size() + 150) {
-                    this.j.set(j - 150, itemstack);
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public ItemStack e(int i) {
-        return this.i.get(i);
-    }
-
-    @Override
-    public void a(DamageSource damageSource, float f, int[] intArray) {
-        if (f > 0.0F) {
-            f /= 4.0F;
-            if (f < 1.0F) {
-                f = 1.0F;
-            }
-
-            for (int index : intArray) {
-                ItemStack itemstack = this.i.get(index);
-                if ((!damageSource.isFire() || !itemstack.getItem().w()) && itemstack.getItem() instanceof ItemArmor) {
-                    itemstack.damage((int) f, this.l, (entityHuman) -> entityHuman.broadcastItemBreak(EnumItemSlot.a(EnumItemSlot.Function.b, index)));
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public void dropContents() {
-        for (List<ItemStack> list : this.n) {
-            for (int i = 0; i < list.size(); ++i) {
-                ItemStack itemstack = list.get(i);
-                if (!itemstack.isEmpty()) {
-                    list.set(i, ItemStack.b);
-                    this.l.a(itemstack, true, false);
-                }
-            }
-        }
-    }
-
-    @Override
-    public boolean h(ItemStack itemStack) {
-        return this.n.stream()
-                .flatMap(Collection::stream)
-                .anyMatch(itemStack1 -> !itemStack1.isEmpty() && itemStack1.doMaterialsMatch(itemStack));
-    }
-
-    @Override
-    public boolean a(Tag<Item> tag) {
-        return this.n.stream()
-                .flatMap(Collection::stream)
-                .anyMatch(itemStack -> !itemStack.isEmpty() && itemStack.a(tag));
-    }
-
-    @Override
-    public void a(PlayerInventory playerInventory) {
-        for(int i = 0; i < this.getSize(); ++i) {
-            this.setItem(i, playerInventory.getItem(i));
-        }
-
-        this.k = playerInventory.k;
-    }
-
-    @Override
-    public void clear() {
-        for (List<ItemStack> list : this.n) {
-            list.clear();
-        }
-    }
-
-    @Override
-    public void a(AutoRecipeStackManager autoRecipeStackManager) {
-        for (ItemStack itemstack : this.h) {
-            autoRecipeStackManager.a(itemstack);
-        }
-    }
-
-}
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2021 lishid. All rights reserved.
+  ~ 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
@@ -19,9 +19,9 @@
  <modelVersion>4.0.0</modelVersion>

  <parent>
-    <artifactId>openinvparent</artifactId>
    <groupId>com.lishid</groupId>
-    <version>4.1.8</version>
+    <artifactId>openinvparent</artifactId>
+    <version>4.1.6-SNAPSHOT</version>
  </parent>

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

  <dependencies>
    <dependency>
-      <artifactId>openinvapi</artifactId>
      <groupId>com.lishid</groupId>
+      <artifactId>openinvapi</artifactId>
+      <version>4.1.6-SNAPSHOT</version>
    </dependency>
    <dependency>
-      <artifactId>annotations</artifactId>
-      <groupId>org.jetbrains</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>spigot-api</artifactId>
      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot-api</artifactId>
+      <version>1.15.2-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
    </dependency>
  </dependencies>

@@ -49,13 +48,31 @@
        <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>
--- a/plugin/src/main/java/com/lishid/openinv/OpenInv.java
+++ b/plugin/src/main/java/com/lishid/openinv/OpenInv.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * 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
@@ -334,6 +334,16 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
        }
    }

+    @Override
+    public boolean notifyAnyChest() {
+        return this.getConfig().getBoolean("notify.any-chest", true);
+    }
+
+    @Override
+    public boolean notifySilentChest() {
+        return this.getConfig().getBoolean("notify.silent-chest", true);
+    }
+
    @Override
    public void onDisable() {

--- a/plugin/src/main/java/com/lishid/openinv/commands/ContainerSettingCommand.java
+++ b/plugin/src/main/java/com/lishid/openinv/commands/ContainerSettingCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-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
--- a/plugin/src/main/java/com/lishid/openinv/commands/OpenInvCommand.java
+++ b/plugin/src/main/java/com/lishid/openinv/commands/OpenInvCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-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
--- a/plugin/src/main/java/com/lishid/openinv/commands/SearchContainerCommand.java
+++ b/plugin/src/main/java/com/lishid/openinv/commands/SearchContainerCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-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
--- a/plugin/src/main/java/com/lishid/openinv/commands/SearchEnchantCommand.java
+++ b/plugin/src/main/java/com/lishid/openinv/commands/SearchEnchantCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-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
--- a/plugin/src/main/java/com/lishid/openinv/commands/SearchInvCommand.java
+++ b/plugin/src/main/java/com/lishid/openinv/commands/SearchInvCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-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
--- a/plugin/src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java
+++ b/plugin/src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-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
--- a/plugin/src/main/java/com/lishid/openinv/internal/OpenInventoryView.java
+++ b/plugin/src/main/java/com/lishid/openinv/internal/OpenInventoryView.java
@@ -62,7 +62,7 @@ public class OpenInventoryView extends InventoryView {
    @Override
    public @NotNull String getTitle() {
        if (title == null) {
-            HumanEntity owner = inventory.getPlayer();
+            HumanEntity owner = getPlayer();

            String localTitle = OpenInv.getPlugin(OpenInv.class)
                    .getLocalizedMessage(
--- a/plugin/src/main/java/com/lishid/openinv/listeners/InventoryListener.java
+++ b/plugin/src/main/java/com/lishid/openinv/listeners/InventoryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * 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
@@ -199,7 +199,7 @@ public class InventoryListener implements Listener {
        }

        // Only specially handle actions in the player's own inventory.
-        return !event.getWhoClicked().equals(playerInventory.getPlayer());
+        return !event.getWhoClicked().equals(event.getView().getTopInventory().getHolder());
    }

 }
--- a/plugin/src/main/java/com/lishid/openinv/listeners/PlayerListener.java
+++ b/plugin/src/main/java/com/lishid/openinv/listeners/PlayerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * 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
--- a/plugin/src/main/java/com/lishid/openinv/listeners/PluginListener.java
+++ b/plugin/src/main/java/com/lishid/openinv/listeners/PluginListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * 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
--- a/plugin/src/main/java/com/lishid/openinv/util/Cache.java
+++ b/plugin/src/main/java/com/lishid/openinv/util/Cache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * 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
--- a/plugin/src/main/java/com/lishid/openinv/util/ConfigUpdater.java
+++ b/plugin/src/main/java/com/lishid/openinv/util/ConfigUpdater.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-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
--- a/plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java
+++ b/plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * 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
@@ -84,7 +84,7 @@ public class InternalAccessor {
                return "https://github.com/lishid/OpenInv/releases/tag/4.1.5";
            case "v1_16_R3":
            default:
-                return "https://github.com/Jikoo/OpenInv/releases";
+                return "https://github.com/lishid/OpenInv/releases";
        }
    }

--- a/plugin/src/main/java/com/lishid/openinv/util/LanguageManager.java
+++ b/plugin/src/main/java/com/lishid/openinv/util/LanguageManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-2020 Jikoo. 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
--- a/plugin/src/main/java/com/lishid/openinv/util/Permissions.java
+++ b/plugin/src/main/java/com/lishid/openinv/util/Permissions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * Copyright (C) 2011-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
--- a/plugin/src/main/java/com/lishid/openinv/util/TabCompleter.java
+++ b/plugin/src/main/java/com/lishid/openinv/util/TabCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
+ * 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
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2021 lishid. All rights reserved.
+  ~ 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
@@ -19,41 +19,41 @@

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

  <packaging>pom</packaging>

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

-  <profiles>
-    <profile>
-      <id>all</id>
  <modules>
    <module>api</module>
    <module>plugin</module>
-        <module>internal/v1_16_R3</module>
-        <module>internal/v1_17_R1</module>
+    <module>internal</module>
    <module>assembly</module>
  </modules>
-    </profile>
+
+  <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>default</id>
+      <id>all</id>
      <activation>
-        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>all</name>
+          <value>true</value>
+        </property>
      </activation>
-      <modules>
-        <module>api</module>
-        <module>plugin</module>
-        <module>assembly</module>
-      </modules>
    </profile>
+
  </profiles>

  <repositories>
@@ -63,58 +63,22 @@
    </repository>
  </repositories>

-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <artifactId>annotations</artifactId>
-        <groupId>org.jetbrains</groupId>
-        <scope>provided</scope>
-        <version>21.0.1</version>
-      </dependency>
-      <dependency>
-        <artifactId>spigot-api</artifactId>
-        <groupId>org.spigotmc</groupId>
-        <scope>provided</scope>
-        <version>1.16.5-R0.1-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <artifactId>openinvapi</artifactId>
-        <groupId>com.lishid</groupId>
-        <scope>compile</scope>
-        <version>4.1.8</version>
-      </dependency>
-      <dependency>
-        <artifactId>openinvplugincore</artifactId>
-        <groupId>com.lishid</groupId>
-        <scope>compile</scope>
-        <version>4.1.8</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
  <build>
-    <pluginManagement>
    <plugins>
      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.2</version>
        <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. -->
+              <!-- Keep the file clean, don't include every single pom from all modules -->
              <excludes>
-                  <exclude>META-INF/MANIFEST.MF</exclude>
+                <exclude>META-INF/maven/**</exclude>
              </excludes>
            </filter>
          </filters>
-            <minimizeJar>true</minimizeJar>
        </configuration>
        <executions>
          <execution>
@@ -124,23 +88,17 @@
            </goals>
          </execution>
        </executions>
-          <groupId>org.apache.maven.plugins</groupId>
-          <version>3.2.4</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>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
      </plugin>
    </plugins>
-    </pluginManagement>
  </build>

 </project>
--- a/scripts/generate_changelog.sh
+++ b/scripts/generate_changelog.sh
@@ -15,12 +15,14 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #

+# A script for generating a changelog from Git.
+#
 # 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_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
@@ -30,25 +32,10 @@ function lookup_email_username() {
  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"..@)
+authors_raw=$(git log --pretty=format:"%ae|%an" "$(git describe --tags --abbrev=0 @^)"..@)
 readarray -t authors <<<"$authors_raw"

-# Use associative array to map email to author name
 declare -A author_data

 for author in "${authors[@]}"; do
@@ -68,7 +55,7 @@ for author in "${authors[@]}"; do
 done

 # Fetch actual formatted changelog
-changelog=$(git log --pretty=format:"* %s (%h) - %ae" "$previous_tag"..@)
+changelog=$(git log --pretty=format:"%s (%h) - %ae" "$(git describe --tags --abbrev=0 @^)"..@)

 for author_email in "${!author_data[@]}"; do
  # Ignore case when matching
@@ -77,6 +64,4 @@ for author_email in "${!author_data[@]}"; do
  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}"
+echo "GENERATED_CHANGELOG<<EOF${changelog}EOF" >> "$GITHUB_ENV"
--- a/scripts/get_spigot_versions.sh
+++ b/scripts/get_spigot_versions.sh
@@ -1,50 +0,0 @@
-#!/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/>.
-#
-
-# TODO FIGURE OUT AND REMOVE WHEN LESS STRESS
-hacky_versions=("1.16.5-R0.1-SNAPSHOT" "1.17-R0.1-SNAPSHOT")
-for hacky_version in "${hacky_versions[@]}"; do
-  echo "$hacky_version"
-done
-
-exit 0
-
-# Note that this script is designed for use in GitHub Actions, and is not
-# particularly robust nor configurable. Run from project parent directory.
-
-# 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>)')"
-
-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
--- a/scripts/install_spigot_dependencies.sh
+++ b/scripts/install_spigot_dependencies.sh
@@ -15,12 +15,39 @@
 # 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.
+# A script for installing required Spigot versions.
+#
+# Note that this script is designed for use in GitHub Actions, and is
+# not particularly robust nor configurable.
+# In its current state, the script must be run from OpenInv's parent
+# project directory and will always install BuildTools to ~/buildtools.

 buildtools_dir=~/buildtools
 buildtools=$buildtools_dir/BuildTools.jar

+get_spigot_versions () {
+  # Get all submodules of internal module
+  modules=$(mvn help:evaluate -Dexpression=project.modules -q -DforceStdout -P all -pl internal | grep -oP '(?<=<string>)(.*)(?=<\/string>)')
+  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 internal/"$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 internal/"$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 internal/"$module")
+        echo "$spigot_version"
+        break
+      fi
+    done
+  done
+}
+
 get_buildtools () {
  if [[ -d $buildtools_dir && -f $buildtools ]]; then
    return
@@ -30,8 +57,8 @@ get_buildtools () {
  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[@]}"
+versions=$(get_spigot_versions)
+echo Found Spigot dependencies: "$versions"

 for version in "${versions[@]}"; do
  set -e
@@ -39,7 +66,7 @@ for version in "${versions[@]}"; do
  mvn dependency:get -Dartifact=org.spigotmc:spigot:"$version" -q -o || exit_code=$?
  if [ $exit_code -ne 0 ]; then
    echo Installing missing Spigot version "$version"
-    revision=${version%%-R*}
+    revision=$(echo "$version" | grep -oP '(\d+\.\d+(\.\d+)?)(?=-R[0-9\.]+-SNAPSHOT)')
    get_buildtools
    java -jar $buildtools -rev "$revision"
  else
--- a/scripts/set_curseforge_env.sh
+++ b/scripts/set_curseforge_env.sh
@@ -1,55 +0,0 @@
-#!/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.
-
-# Parse Spigot dependency information into major Minecraft versions
-function get_curseforge_minecraft_versions() {
-  readarray -t versions <<< "$(. ./scripts/get_spigot_versions.sh)"
-
-  for version in "${versions[@]}"; do
-    # Parse Minecraft major version
-    version="${version%[.-]"${version#*.*[.-]}"}"
-
-    # Skip already listed versions
-    if [[ "$minecraft_versions" =~ "$version"($|,) ]]; then
-      continue
-    fi
-
-    # Append comma if variable is set, then append version
-    minecraft_versions="${minecraft_versions:+${minecraft_versions},}Minecraft ${version}"
-  done
-
-  echo "${minecraft_versions}"
-}
-
-# Modify provided changelog to not break when inserted into yaml file.
-function get_yaml_safe_changelog() {
-  changelog=$1
-  # Since we're using a flow scalar, newlines need to be doubled.
-  echo "${changelog//
-/
-
-}"
-}
-
-minecraft_versions=$(get_curseforge_minecraft_versions)
-echo "CURSEFORGE_MINECRAFT_VERSIONS=$minecraft_versions" >> "$GITHUB_ENV"
-
-changelog=$(get_yaml_safe_changelog "$1")
-printf "CURSEFORGE_CHANGELOG<<EOF\n%s\nEOF\n" "$changelog" >> "$GITHUB_ENV"
--- a/scripts/set_release_env.sh
+++ b/scripts/set_release_env.sh
@@ -1,32 +0,0 @@
-#!/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.
-
-# Get a pretty string of the project's name and version
-# Disable SC warning about variable expansion for this function - those are Maven variables.
-# shellcheck disable=SC2016
-function get_versioned_name() {
-  mvn -q -Dexec.executable=echo -Dexec.args='${project.name} ${project.version}' --non-recursive exec:exec
-}
-
-# Set GitHub environmental variables
-echo "VERSIONED_NAME=$(get_versioned_name)" >> "$GITHUB_ENV"
-
-changelog="$(. ./scripts/generate_changelog.sh)"
-printf "GENERATED_CHANGELOG<<EOF\n%s\nEOF\n" "$changelog" >> "$GITHUB_ENV"
--- a/scripts/tag_release.sh
+++ b/scripts/tag_release.sh
@@ -1,37 +0,0 @@
-#!/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/>.
-#
-
-if [[ ! $1 ]]; then
-  echo "Please provide a version string."
-  return
-fi
-
-version="$1"
-snapshot="${version%.*}.$((${version##*.} + 1))-SNAPSHOT"
-
-mvn versions:set -DnewVersion="$version"
-
-git add .
-git commit -S -m "Bump version to $version for release"
-git tag -s "$version" -m "Release $version"
-
-mvn clean package -am -P all
-
-mvn versions:set -DnewVersion="$snapshot"
-
-git add .
-git commit -S -m "Bump version to $snapshot for development"
Author	SHA1	Message	Date
Jikoo	1c579564bc	Add reading assistant	2021-07-12 21:07:45 -04:00
Adam	eae4021138	Add relocation notice	2021-04-11 18:29:37 -04:00