Bump version to 4.1.8 for release

Temporarily explicitly declare Spigot dependencies
I don't have the time to deal with whatever the difference between remote and local bash/maven versions is right now.

.github/workflows/ci.yml

@@ -0,0 +1,76 @@
+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

.github/workflows/release.yml

@@ -0,0 +1,37 @@
+name: Release to CurseForge
+
+on:
+  release:
+    types: [ released ]
+
+jobs:
+  curseforge_release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Fetch Github Release Asset
+        uses: dsaltares/fetch-gh-release-asset@0.0.5
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          version: ${{ github.event.release.id }}
+          file: OpenInv.jar
+
+      - name: Set CurseForge Variables
+        run: . scripts/set_curseforge_env.sh "${{ github.event.release.body }}"
+
+      - name: Create CurseForge Release
+        uses: itsmeow/curseforge-upload@v3
+        with:
+          token: ${{ secrets.CURSEFORGE_TOKEN }}
+          project_id: 31432
+          game_endpoint: minecraft
+          file_path: ./OpenInv.jar
+          display_name: "${{ github.event.release.name }}"
+          game_versions: "${{ env.CURSEFORGE_MINECRAFT_VERSIONS }}"
+          release_type: release
+          changelog_type: markdown
+          changelog: "${{ env.CURSEFORGE_CHANGELOG }}"

.gitignore

@@ -1,11 +1,10 @@
 **/.settings
-**/.gitignore
 **/.project
 **/.classpath
-**/.idea
+**/.idea/
 **.iml
-**/target
-**/bin
-**/out
-**dependency-reduced-pom.xml
-**pom.xml.versionsBackup
+**/target/
+**/bin/
+**/out/
+**/dependency-reduced-pom.xml
+**/pom.xml.versionsBackup

README.MD

@@ -15,48 +15,7 @@ OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) whi
 - **AnyContainer**: Open containers, even if blocked by ocelots or blocks.
 
 ## Commands
-<table width=100%>
-  <tr>
-    <th width=175px>Command</th>
-    <th>Aliases</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>/openinv [player]</td>
-    <td>oi, inv, open</td>
-    <td>Open a player's inventory. If unspecified, will select last player opened or own if none opened previously.</td>
-  </tr>
-  <tr>
-    <td>/openender [player]</td>
-    <td>oe</td>
-    <td>Open a player's ender chest. If unspecified, will select last player opened or own if none opened previously.</td>
-  </tr>
-  <tr>
-    <td>/searchinv &ltitem&gt [minAmount]</td>
-    <td>si</td>
-    <td>Lists all online players that have a certain item in their inventory.</td>
-  </tr>
-  <tr>
-    <td>/searchender &ltitem&gt [minAmount]</td>
-    <td>se</td>
-    <td>Lists all online players that have a certain item in their ender chest.</td>
-  </tr>
-  <tr>
-    <td>/searchenchant &lt[enchantment] [MinLevel]&gt</td>
-    <td>searchenchants</td>
-    <td>Lists all online players with a specific enchantment.</td>
-  </tr>
-  <tr>
-    <td>/anycontainer [check]</td>
-    <td>ac, anychest</td>
-    <td>Check or toggle the AnyContainer function, allowing opening blocked containers.</td>
-  </tr>
-  <tr>
-    <td>/silentcontainer [check]</td>
-    <td>sc, silentchest</td>
-    <td>Check or toggle the SilentContainer function, allowing opening containers silently.</td>
-  </tr>
-</table>
+See [the wiki](https://github.com/Jikoo/OpenInv/wiki/Commands).
 
 ## Permissions
 <table>
@@ -136,11 +95,46 @@ OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) whi
     <td>OpenInv.silent.default</td>
     <td>Cause SilentContainer to be enabled by default.</td>
   </tr>
+  <tr>
+    <td>OpenInv.spectate</td>
+    <td>Allows users in spectate gamemode to edit inventories.</td>
+  </tr>
 </table>
 
 ## For Developers
-To compile, the relevant Craftbukkit/Spigot jars must be installed in your local repository using the install plugin.
-Ex: `mvn install:install-file -Dpackaging=jar -Dfile=spigot-1.8-R0.1-SNAPSHOT.jar -DgroupId=org.spigotmc -DartifactId=spigot -Dversion=1.8-R0.1-SNAPSHOT`
+
+### As a Dependency
+The OpenInv API is available via [JitPack](https://jitpack.io/).
+```xml
+  <repositories>
+    <repository>
+      <id>jitpack.io</id>
+      <url>https://jitpack.io</url>
+    </repository>
+  </repositories>
+```
+```xml
+  <dependencies>
+    <dependency>
+      <groupId>com.github.jikoo.OpenInv</groupId>
+      <artifactId>openinvapi</artifactId>
+      <version>${openinv.version}</version>
+    </dependency>
+  </dependencies>
+```
+
+### Compilation
+To compile, the relevant Spigot jars must be installed in your local repository using the `install` plugin:
+```shell
+mvn install:install-file -Dpackaging=jar -Dfile=spigot-1.8-R0.1-SNAPSHOT.jar \
+    -DgroupId=org.spigotmc -DartifactId=spigot -Dversion=1.8-R0.1-SNAPSHOT
+```
+Note that BuildTools automatically installs produced files. If you use BuildTools to compile Spigot locally, you don't need to install it manually.  
+If you want to use Paper as a dependency, you can install it by executing PaperClip with the property `paperclip.install` set to true:
+```shell
+wget -O paperclip.jar https://papermc.io/api/v1/paper/1.16.5/latest/download
+java -jar -Dpaperclip.install=true paperclip.jar
+```
 
 To compile for a single version, specify the NMS revision you are targeting: `mvn -pl <NMS module> -am clean install`
 
@@ -149,20 +143,3 @@ To compile for a set of versions, you'll need to use a profile. The only provide
 For more information, check out the [official Maven guide](http://maven.apache.org/guides/introduction/introduction-to-profiles.html).
 
 The final file is `target/OpenInv.jar`
-
-## License
-```
-Copyright (C) 2011-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/>.
-```

api/pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2021 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -19,9 +19,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>4.1.4</version>
+    <groupId>com.lishid</groupId>
+    <version>4.1.8</version>
   </parent>
 
   <artifactId>openinvapi</artifactId>
@@ -29,15 +29,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jetbrains</groupId>
       <artifactId>annotations</artifactId>
-      <version>17.0.0</version>
+      <groupId>org.jetbrains</groupId>
     </dependency>
     <dependency>
-      <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.8.8-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
+      <groupId>org.spigotmc</groupId>
     </dependency>
   </dependencies>
 
@@ -45,11 +42,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
       </plugin>
     </plugins>
   </build>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import com.lishid.openinv.util.InventoryAccess;
 import com.lishid.openinv.util.StringMetric;
 import java.util.UUID;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -153,10 +154,7 @@ public interface IOpenInv {
         if (Bukkit.getServer().isPrimaryThread()) {
             this.getLogger().warning("Call to OpenInv#matchPlayer made on the main thread!");
             this.getLogger().warning("This can cause the server to hang, potentially severely.");
-            this.getLogger().warning("Trace:");
-            for (StackTraceElement element : new Throwable().fillInStackTrace().getStackTrace()) {
-                this.getLogger().warning(element.toString());
-            }
+            this.getLogger().log(Level.WARNING, new Throwable("Current stack trace"), () -> "Current stack trace");
         }
 
         OfflinePlayer player;
@@ -172,11 +170,6 @@ public interface IOpenInv {
             // Not a UUID
         }
 
-        // Ensure name is valid if server is in online mode to avoid unnecessary searching
-        if (Bukkit.getServer().getOnlineMode() && !name.matches("[a-zA-Z0-9_]{3,16}")) {
-            return null;
-        }
-
         player = Bukkit.getServer().getPlayerExact(name);
 
         if (player != null) {
@@ -232,16 +225,24 @@ public interface IOpenInv {
      * when a container is activated with AnyChest.
      *
      * @return true unless configured otherwise
+     * @deprecated OpenInv uses action bar chat for notifications. Whether or not they show is based on language settings.
      */
-    boolean notifyAnyChest();
+    @Deprecated
+    default boolean notifyAnyChest() {
+        return true;
+    }
 
     /**
      * Check the configuration value for whether or not OpenInv displays a notification to the user
      * when a container is activated with SilentChest.
      *
      * @return true unless configured otherwise
+     * @deprecated OpenInv uses action bar chat for notifications. Whether or not they show is based on language settings.
      */
-    boolean notifySilentChest();
+    @Deprecated
+    default boolean notifySilentChest() {
+        return true;
+    }
 
     /**
      * Mark a Player as no longer in use by a Plugin to allow OpenInv to remove it from the cache

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
 
 package com.lishid.openinv.internal;
 
+import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.jetbrains.annotations.NotNull;
@@ -48,4 +49,11 @@ public interface ISpecialInventory {
      */
     boolean isInUse();
 
+    /**
+     * Gets the Player associated with this ISpecialInventory.
+     *
+     * @return the HumanEntity
+     */
+    @NotNull HumanEntity getPlayer();
+
 }

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@ package com.lishid.openinv.util;
 
 import com.lishid.openinv.internal.IInventoryAccess;
 import com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -33,76 +34,63 @@ public class InventoryAccess implements IInventoryAccess {
 
     static {
         String packageName = Bukkit.getServer().getClass().getPackage().getName();
-        String version = packageName.substring(packageName.lastIndexOf('.') + 1);
         try {
-            craftInventory = Class.forName("org.bukkit.craftbukkit." + version + ".inventory.CraftInventory");
+            craftInventory = Class.forName(packageName + ".inventory.CraftInventory");
         } catch (ClassNotFoundException ignored) {}
         try {
             getInventory = craftInventory.getDeclaredMethod("getInventory");
         } catch (NoSuchMethodException ignored) {}
     }
 
+    /**
+     * @deprecated use {@link #isUsable()}
+     */
+    @Deprecated
     public static boolean isUseable() {
+        return isUsable();
+    }
+
+    public static boolean isUsable() {
         return craftInventory != null && getInventory != null;
     }
 
     public static boolean isPlayerInventory(@NotNull Inventory inventory) {
-        if (craftInventory.isAssignableFrom(inventory.getClass())) {
-            try {
-                return getInventory.invoke(inventory) instanceof ISpecialPlayerInventory;
-            } catch (ReflectiveOperationException ignored) {}
-        }
-        return grabFieldOfTypeFromObject(ISpecialPlayerInventory.class, inventory) != null;
+        return getPlayerInventory(inventory) != null;
     }
 
-    public static ISpecialPlayerInventory getPlayerInventory(@NotNull Inventory inventory) {
-        Object inv = null;
-        if (craftInventory.isAssignableFrom(inventory.getClass())) {
-            try {
-                inv = getInventory.invoke(inventory);
-            } catch (ReflectiveOperationException ignored) {}
-        }
-
-        if (inv == null) {
-            inv = grabFieldOfTypeFromObject(ISpecialPlayerInventory.class, inventory);
-        }
-
-        if (inv instanceof ISpecialPlayerInventory) {
-            return (ISpecialPlayerInventory) inv;
-        }
-
-        return null;
+    public static @Nullable ISpecialPlayerInventory getPlayerInventory(@NotNull Inventory inventory) {
+        return getSpecialInventory(ISpecialPlayerInventory.class, inventory);
     }
 
     public static boolean isEnderChest(@NotNull Inventory inventory) {
-        if (craftInventory.isAssignableFrom(inventory.getClass())) {
-            try {
-                return getInventory.invoke(inventory) instanceof ISpecialEnderChest;
-            } catch (ReflectiveOperationException ignored) {}
-        }
-        return grabFieldOfTypeFromObject(ISpecialEnderChest.class, inventory) != null;
+        return getEnderChest(inventory) != null;
     }
 
-    public static ISpecialEnderChest getEnderChest(@NotNull Inventory inventory) {
-        Object inv = null;
-        if (craftInventory.isAssignableFrom(inventory.getClass())) {
+    public static @Nullable ISpecialEnderChest getEnderChest(@NotNull Inventory inventory) {
+        return getSpecialInventory(ISpecialEnderChest.class, inventory);
+    }
+
+    private static <T extends ISpecialInventory> @Nullable T getSpecialInventory(@NotNull Class<T> expected, @NotNull Inventory inventory) {
+        Object inv;
+        if (craftInventory != null && getInventory != null && craftInventory.isAssignableFrom(inventory.getClass())) {
             try {
                 inv = getInventory.invoke(inventory);
+                if (expected.isInstance(inv)) {
+                    return expected.cast(inv);
+                }
             } catch (ReflectiveOperationException ignored) {}
         }
 
-        if (inv == null) {
-            inv = grabFieldOfTypeFromObject(ISpecialEnderChest.class, inventory);
-        }
+        inv = grabFieldOfTypeFromObject(expected, inventory);
 
-        if (inv instanceof ISpecialEnderChest) {
-            return (ISpecialEnderChest) inv;
+        if (expected.isInstance(inv)) {
+            return expected.cast(inv);
         }
 
         return null;
     }
 
-    private static <T> T grabFieldOfTypeFromObject(final Class<T> type, final Object object) {
+    private static <T> @Nullable T grabFieldOfTypeFromObject(final Class<T> type, final Object object) {
         // Use reflection to find the IInventory
         Class<?> clazz = object.getClass();
         T result = null;
@@ -142,4 +130,5 @@ public class InventoryAccess implements IInventoryAccess {
     public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
         return isPlayerInventory(inventory);
     }
+
 }

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

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

assembly/pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2021 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -21,11 +21,12 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>4.1.4</version>
+    <version>4.1.8</version>
   </parent>
 
   <artifactId>openinvassembly</artifactId>
   <name>OpenInvAssembly</name>
+  <packaging>pom</packaging>
 
   <build>
     <directory>../target</directory>
@@ -34,7 +35,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.2.0</version>
         <executions>
           <execution>
             <id>reactor-uberjar</id>

assembly/src/assembly/reactor-uberjar.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2021 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -14,9 +14,9 @@
   ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
 
   <id>reactor-uberjar</id>
 
@@ -34,8 +34,18 @@
       <binaries>
         <outputDirectory>/</outputDirectory>
         <unpack>true</unpack>
-        <!-- unpackOptions must be present or build breaks. -->
-        <unpackOptions/>
+        <unpackOptions>
+          <excludes>
+            <!--
+              - Exclude existing meta - assembly will write its own manifest, and the rest is maven
+              - details that end users don't need. Ignoring it saves around 7KB after compression
+              - with a single internal module present.
+             -->
+            <exclude>META-INF/**</exclude>
+          </excludes>
+        </unpackOptions>
+        <!-- Exclude dependencies - shade plugin will handle their inclusion as necessary in individual jars. -->
+        <includeDependencies>false</includeDependencies>
       </binaries>
 
     </moduleSet>

internal/pom.xml

@@ -1,45 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, version 3.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<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.4</version>
-  </parent>
-
-  <artifactId>openinvinternal</artifactId>
-  <name>OpenInvInternal</name>
-
-  <packaging>pom</packaging>
-
-  <profiles>
-
-    <profile>
-      <id>all</id>
-      <modules>
-        <module>v1_8_R3</module>
-        <module>v1_15_R1</module>
-        <module>v1_16_R1</module>
-        <module>v1_16_R2</module>
-      </modules>
-    </profile>
-
-  </profiles>
-
-</project>

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

@@ -1,359 +0,0 @@
-/*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_15_R1;
-
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.IAnySilentContainer;
-import java.lang.reflect.Field;
-import net.minecraft.server.v1_15_R1.Block;
-import net.minecraft.server.v1_15_R1.BlockBarrel;
-import net.minecraft.server.v1_15_R1.BlockChest;
-import net.minecraft.server.v1_15_R1.BlockChestTrapped;
-import net.minecraft.server.v1_15_R1.BlockEnderChest;
-import net.minecraft.server.v1_15_R1.BlockPosition;
-import net.minecraft.server.v1_15_R1.BlockPropertyChestType;
-import net.minecraft.server.v1_15_R1.BlockShulkerBox;
-import net.minecraft.server.v1_15_R1.ChatMessage;
-import net.minecraft.server.v1_15_R1.Container;
-import net.minecraft.server.v1_15_R1.ContainerChest;
-import net.minecraft.server.v1_15_R1.Containers;
-import net.minecraft.server.v1_15_R1.EntityHuman;
-import net.minecraft.server.v1_15_R1.EntityPlayer;
-import net.minecraft.server.v1_15_R1.EnumGamemode;
-import net.minecraft.server.v1_15_R1.IBlockData;
-import net.minecraft.server.v1_15_R1.IChatBaseComponent;
-import net.minecraft.server.v1_15_R1.ITileInventory;
-import net.minecraft.server.v1_15_R1.InventoryEnderChest;
-import net.minecraft.server.v1_15_R1.InventoryLargeChest;
-import net.minecraft.server.v1_15_R1.PlayerInteractManager;
-import net.minecraft.server.v1_15_R1.PlayerInventory;
-import net.minecraft.server.v1_15_R1.TileEntity;
-import net.minecraft.server.v1_15_R1.TileEntityChest;
-import net.minecraft.server.v1_15_R1.TileEntityEnderChest;
-import net.minecraft.server.v1_15_R1.TileEntityLootable;
-import net.minecraft.server.v1_15_R1.TileInventory;
-import net.minecraft.server.v1_15_R1.World;
-import org.bukkit.Material;
-import org.bukkit.Statistic;
-import org.bukkit.block.Barrel;
-import org.bukkit.block.BlockFace;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.EnderChest;
-import org.bukkit.block.ShulkerBox;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.Directional;
-import org.bukkit.block.data.type.Chest;
-import org.bukkit.entity.Cat;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.bukkit.util.BoundingBox;
-import org.jetbrains.annotations.NotNull;
-
-public class AnySilentContainer implements IAnySilentContainer {
-
-    private Field playerInteractManagerGamemode;
-
-    public AnySilentContainer() {
-        try {
-            this.playerInteractManagerGamemode = PlayerInteractManager.class.getDeclaredField("gamemode");
-            this.playerInteractManagerGamemode.setAccessible(true);
-        } catch (NoSuchFieldException | SecurityException e) {
-            System.err.println("[OpenInv] Unable to directly write player gamemode! SilentChest will fail.");
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public boolean isAnySilentContainer(@NotNull final org.bukkit.block.Block bukkitBlock) {
-        if (bukkitBlock.getType() == Material.ENDER_CHEST) {
-            return true;
-        }
-        BlockState state = bukkitBlock.getState();
-        return state instanceof org.bukkit.block.Chest
-                || state instanceof org.bukkit.block.ShulkerBox
-                || state instanceof org.bukkit.block.Barrel;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(@NotNull final Player p, @NotNull final org.bukkit.block.Block block) {
-        BlockState blockState = block.getState();
-
-        // Barrels do not require AnyContainer.
-        if (blockState instanceof Barrel) {
-            return false;
-        }
-
-        // Enderchests require a non-occluding block on top to open.
-        if (blockState instanceof EnderChest) {
-            return block.getRelative(0, 1, 0).getType().isOccluding();
-        }
-
-        // Shulker boxes require 1/2 a block clear in the direction they open.
-        if (blockState instanceof ShulkerBox) {
-            BoundingBox boundingBox = block.getBoundingBox();
-            if (boundingBox.getVolume() > 1) {
-                // Shulker box is already open.
-                return false;
-            }
-
-            BlockData blockData = block.getBlockData();
-            if (!(blockData instanceof Directional)) {
-                // Shouldn't be possible. Just in case, demand AnyChest.
-                return true;
-            }
-
-            Directional directional = (Directional) blockData;
-            BlockFace face = directional.getFacing();
-            boundingBox.shift(face.getDirection());
-            // Return whether or not bounding boxes overlap.
-            return block.getRelative(face, 1).getBoundingBox().overlaps(boundingBox);
-        }
-
-        if (!(blockState instanceof org.bukkit.block.Chest)) {
-            return false;
-        }
-
-        if (isBlockedChest(block)) {
-            return true;
-        }
-
-        BlockData blockData = block.getBlockData();
-        if (!(blockData instanceof Chest) || ((Chest) blockData).getType() == Chest.Type.SINGLE) {
-            return false;
-        }
-
-        Chest chest = (Chest) blockData;
-        int ordinal = (chest.getFacing().ordinal() + 4 + (chest.getType() == Chest.Type.RIGHT ? -1 : 1)) % 4;
-        BlockFace relativeFace = BlockFace.values()[ordinal];
-        org.bukkit.block.Block relative = block.getRelative(relativeFace);
-
-        if (relative.getType() != block.getType()) {
-            return false;
-        }
-
-        BlockData relativeData = relative.getBlockData();
-        if (!(relativeData instanceof Chest)) {
-            return false;
-        }
-        
-        Chest relativeChest = (Chest) relativeData;
-        if (relativeChest.getFacing() != chest.getFacing()
-                || relativeChest.getType() != (chest.getType() == Chest.Type.RIGHT ? Chest.Type.LEFT : Chest.Type.RIGHT)) {
-            return false;
-        }
-
-        return isBlockedChest(relative);
-    }
-
-    private boolean isBlockedChest(org.bukkit.block.Block block) {
-        org.bukkit.block.Block relative = block.getRelative(0, 1, 0);
-        return relative.getType().isOccluding()
-                || block.getWorld().getNearbyEntities(BoundingBox.of(relative), entity -> entity instanceof Cat).size() > 0;
-    }
-
-    @Override
-    public boolean activateContainer(@NotNull final Player bukkitPlayer, final boolean silentchest,
-                                     @NotNull final org.bukkit.block.Block bukkitBlock) {
-
-        // Silent ender chest is API-only
-        if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        final World world = player.world;
-        final BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        final TileEntity tile = world.getTileEntity(blockPosition);
-
-        if (tile == null) {
-            return false;
-        }
-
-        if (tile instanceof TileEntityEnderChest) {
-            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
-            InventoryEnderChest enderChest = player.getEnderChest();
-            enderChest.a((TileEntityEnderChest) tile);
-            player.openContainer(new TileInventory((containerCounter, playerInventory, ignored) -> {
-                Containers<?> containers;
-                int rows = enderChest.getSize() / 9;
-                switch (rows) {
-                    case 1:
-                        containers = Containers.GENERIC_9X1;
-                        break;
-                    case 2:
-                        containers = Containers.GENERIC_9X2;
-                        break;
-                    case 3:
-                    default:
-                        containers = Containers.GENERIC_9X3;
-                        break;
-                    case 4:
-                        containers = Containers.GENERIC_9X4;
-                        break;
-                    case 5:
-                        containers = Containers.GENERIC_9X5;
-                        break;
-                    case 6:
-                        containers = Containers.GENERIC_9X6;
-                        break;
-                }
-                return new ContainerChest(containers, containerCounter, playerInventory, enderChest, rows);
-            }, BlockEnderChest.e));
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        if (!(tile instanceof ITileInventory)) {
-            return false;
-        }
-
-        ITileInventory tileInventory = (ITileInventory) tile;
-        IBlockData blockData = world.getType(blockPosition);
-        Block block = blockData.getBlock();
-
-        if (block instanceof BlockChest) {
-
-            BlockPropertyChestType chestType = blockData.get(BlockChest.c);
-
-            if (chestType != BlockPropertyChestType.SINGLE) {
-
-                BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.i(blockData));
-                IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
-
-                if (adjacentBlockData.getBlock() == block) {
-
-                    BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.c);
-
-                    if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
-                            && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
-
-                        TileEntity adjacentTile = world.getTileEntity(adjacentBlockPosition);
-
-                        if (adjacentTile instanceof TileEntityChest && tileInventory instanceof  TileEntityChest) {
-                            TileEntityChest rightChest = chestType == BlockPropertyChestType.RIGHT ? ((TileEntityChest) tileInventory) : (TileEntityChest) adjacentTile;
-                            TileEntityChest leftChest = chestType == BlockPropertyChestType.RIGHT ? (TileEntityChest) adjacentTile : ((TileEntityChest) tileInventory);
-
-                            if (silentchest && (rightChest.lootTable != null || leftChest.lootTable != 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.player);
-                                    rightChest.d(playerInventory.player);
-                                    return ContainerChest.b(containerCounter, playerInventory, new InventoryLargeChest(rightChest, leftChest));
-                                }
-
-                                public IChatBaseComponent getScoreboardDisplayName() {
-                                    return new ChatMessage("container.chestDouble");
-                                }
-                            };
-                        }
-                    }
-                }
-            }
-
-            if (block instanceof BlockChestTrapped) {
-                bukkitPlayer.incrementStatistic(Statistic.TRAPPED_CHEST_TRIGGERED);
-            } else {
-                bukkitPlayer.incrementStatistic(Statistic.CHEST_OPENED);
-            }
-        }
-
-        if (block instanceof BlockShulkerBox) {
-            bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED);
-        }
-
-        if (block instanceof BlockBarrel) {
-            bukkitPlayer.incrementStatistic(Statistic.OPEN_BARREL);
-        }
-
-        // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
-        if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
-            player.openContainer(tileInventory);
-            return true;
-        }
-
-        // SilentChest requires access to setting players' gamemode directly.
-        if (this.playerInteractManagerGamemode == null) {
-            return false;
-        }
-
-        if (tile instanceof TileEntityLootable) {
-            TileEntityLootable lootable = (TileEntityLootable) tile;
-            if (lootable.lootTable != null) {
-                OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
-                return false;
-            }
-        }
-
-        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
-        this.forceGameMode(player, EnumGamemode.SPECTATOR);
-        player.openContainer(tileInventory);
-        this.forceGameMode(player, gamemode);
-        return true;
-    }
-
-    @Override
-    public void deactivateContainer(@NotNull final Player bukkitPlayer) {
-        if (this.playerInteractManagerGamemode == null) {
-            return;
-        }
-
-        InventoryView view = bukkitPlayer.getOpenInventory();
-        switch (view.getType()) {
-            case CHEST:
-            case ENDER_CHEST:
-            case SHULKER_BOX:
-            case BARREL:
-            break;
-        default:
-            return;
-        }
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
-        this.forceGameMode(player, EnumGamemode.SPECTATOR);
-        player.activeContainer.b(player);
-        player.activeContainer.a(player, false);
-        player.activeContainer.transferTo(player.defaultContainer, player.getBukkitEntity());
-        player.activeContainer = player.defaultContainer;
-        this.forceGameMode(player, gamemode);
-    }
-
-    private void forceGameMode(final EntityPlayer player, final EnumGamemode gameMode) {
-        if (this.playerInteractManagerGamemode == null) {
-            // No need to warn repeatedly, error on startup and lack of function should be enough.
-            return;
-        }
-        try {
-            if (!this.playerInteractManagerGamemode.isAccessible()) {
-                // Just in case, ensure accessible.
-                this.playerInteractManagerGamemode.setAccessible(true);
-            }
-            this.playerInteractManagerGamemode.set(player.playerInteractManager, gameMode);
-        } catch (IllegalArgumentException | IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-}

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

@@ -1,289 +0,0 @@
-/*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_15_R1;
-
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.mojang.authlib.GameProfile;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.lang.reflect.Field;
-import net.minecraft.server.v1_15_R1.ChatComponentText;
-import net.minecraft.server.v1_15_R1.ChatMessageType;
-import net.minecraft.server.v1_15_R1.Container;
-import net.minecraft.server.v1_15_R1.Containers;
-import net.minecraft.server.v1_15_R1.DimensionManager;
-import net.minecraft.server.v1_15_R1.Entity;
-import net.minecraft.server.v1_15_R1.EntityHuman;
-import net.minecraft.server.v1_15_R1.EntityPlayer;
-import net.minecraft.server.v1_15_R1.MinecraftServer;
-import net.minecraft.server.v1_15_R1.NBTCompressedStreamTools;
-import net.minecraft.server.v1_15_R1.NBTTagCompound;
-import net.minecraft.server.v1_15_R1.PacketPlayOutChat;
-import net.minecraft.server.v1_15_R1.PacketPlayOutOpenWindow;
-import net.minecraft.server.v1_15_R1.PlayerInteractManager;
-import net.minecraft.server.v1_15_R1.PlayerInventory;
-import net.minecraft.server.v1_15_R1.WorldNBTStorage;
-import org.apache.logging.log4j.LogManager;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_15_R1.event.CraftEventFactory;
-import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftContainer;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    private Field bukkitEntity;
-
-    public PlayerDataManager() {
-        try {
-            bukkitEntity = Entity.class.getDeclaredField("bukkitEntity");
-        } catch (NoSuchFieldException e) {
-            System.out.println("Unable to obtain field to inject custom save process - players' mounts may be deleted when loaded.");
-            e.printStackTrace();
-            bukkitEntity = null;
-        }
-    }
-
-    @NotNull
-    public static EntityPlayer getHandle(final Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
-    @Nullable
-    @Override
-    public Player loadPlayer(@NotNull final OfflinePlayer offline) {
-        // Ensure player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        // Create a profile and entity to load the player data
-        // 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();
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(DimensionManager.OVERWORLD), profile,
-                new PlayerInteractManager(server.getWorldServer(DimensionManager.OVERWORLD)));
-
-        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 CraftPlayer(player.server.server, player) {
-            @Override
-            public void saveData() {
-                super.saveData();
-                // See net.minecraft.server.WorldNBTStorage#save(EntityPlayer)
-                try {
-                    WorldNBTStorage worldNBTStorage = (WorldNBTStorage) player.server.getPlayerList().playerFileData;
-
-                    NBTTagCompound playerData = player.save(new NBTTagCompound());
-
-                    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);
-                } catch (Exception e) {
-                    LogManager.getLogger().warn("Failed to save player data for {}", player.getDisplayName().getString());
-                }
-            }
-        });
-    }
-
-    @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.playerConnection == null) {
-            return null;
-        }
-
-        String title;
-        if (inventory instanceof SpecialEnderChest) {
-            HumanEntity owner = (HumanEntity) ((SpecialEnderChest) inventory).getBukkitOwner();
-            title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.enderchest", "%player%", owner.getName());
-            if (title == null) {
-                title = owner.getName() + "'s Ender Chest";
-            }
-        } else if (inventory instanceof SpecialPlayerInventory) {
-            EntityHuman owner = ((PlayerInventory) inventory).player;
-            title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.player", "%player%", owner.getName());
-            if (title == null) {
-                title = owner.getName() + "'s Inventory";
-            }
-        } else {
-            return player.openInventory(inventory.getBukkitInventory());
-        }
-
-        String finalTitle = title;
-        Container container = new CraftContainer(new InventoryView() {
-            @Override
-            public @NotNull Inventory getTopInventory() {
-                return inventory.getBukkitInventory();
-            }
-            @Override
-            public @NotNull Inventory getBottomInventory() {
-                return player.getInventory();
-            }
-            @Override
-            public @NotNull HumanEntity getPlayer() {
-                return player;
-            }
-            @Override
-            public @NotNull InventoryType getType() {
-                return inventory.getBukkitInventory().getType();
-            }
-            @Override
-            public @NotNull String getTitle() {
-                return finalTitle;
-            }
-        }, nmsPlayer, nmsPlayer.nextContainerCounter()) {
-            @Override
-            public Containers<?> getType() {
-                switch (inventory.getBukkitInventory().getSize()) {
-                    case 9:
-                        return Containers.GENERIC_9X1;
-                    case 18:
-                        return Containers.GENERIC_9X2;
-                    case 27:
-                    default:
-                        return Containers.GENERIC_9X3;
-                    case 36:
-                        return Containers.GENERIC_9X4;
-                    case 41: // PLAYER
-                    case 45:
-                        return Containers.GENERIC_9X5;
-                    case 54:
-                        return Containers.GENERIC_9X6;
-                }
-            }
-        };
-
-        container.setTitle(new ChatComponentText(title));
-        container = CraftEventFactory.callInventoryOpenEvent(nmsPlayer, container);
-
-        if (container == null) {
-            return null;
-        }
-
-        nmsPlayer.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, container.getType(),
-                new ChatComponentText(container.getBukkitView().getTitle())));
-        nmsPlayer.activeContainer = container;
-        container.addSlotListener(nmsPlayer);
-
-        return container.getBukkitView();
-
-    }
-
-    @Override
-    public void sendSystemMessage(@NotNull Player player, @NotNull String message) {
-        int newline = message.indexOf('\n');
-        if (newline != -1) {
-            // No newlines in action bar chat.
-            message = message.substring(0, newline);
-        }
-
-        if (message.isEmpty()) {
-            return;
-        }
-
-        EntityPlayer nmsPlayer = getHandle(player);
-
-        // For action bar chat, color codes are still supported but JSON text color is not allowed. Do not convert text.
-        if (nmsPlayer.playerConnection != null) {
-            nmsPlayer.playerConnection.sendPacket(new PacketPlayOutChat(new ChatComponentText(message), ChatMessageType.GAME_INFO));
-        }
-    }
-
-}

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

@@ -1,255 +0,0 @@
-/*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_15_R1;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.util.List;
-import net.minecraft.server.v1_15_R1.AutoRecipeStackManager;
-import net.minecraft.server.v1_15_R1.ContainerUtil;
-import net.minecraft.server.v1_15_R1.EntityHuman;
-import net.minecraft.server.v1_15_R1.EntityPlayer;
-import net.minecraft.server.v1_15_R1.IInventoryListener;
-import net.minecraft.server.v1_15_R1.InventoryEnderChest;
-import net.minecraft.server.v1_15_R1.ItemStack;
-import net.minecraft.server.v1_15_R1.NonNullList;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-
-public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEnderChest {
-
-    private final CraftInventory inventory;
-    private EntityPlayer owner;
-    private NonNullList<ItemStack> items;
-    private boolean playerOnline;
-
-    public SpecialEnderChest(final Player player, final Boolean online) {
-        super(PlayerDataManager.getHandle(player));
-        this.inventory = new CraftInventory(this);
-        this.owner = PlayerDataManager.getHandle(player);
-        this.playerOnline = online;
-        this.items = this.owner.getEnderChest().items;
-    }
-
-    @Override
-    public @NotNull CraftInventory getBukkitInventory() {
-        return inventory;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        this.playerOnline = false;
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull final Player player) {
-        if (!this.playerOnline) {
-            try {
-                this.owner = PlayerDataManager.getHandle(player);
-                InventoryEnderChest enderChest = owner.getEnderChest();
-                for (int i = 0; i < enderChest.getSize(); ++i) {
-                    enderChest.setItem(i, this.items.get(i));
-                }
-                this.items = enderChest.items;
-            } catch (Exception ignored) {}
-            this.playerOnline = true;
-        }
-    }
-
-    @Override
-    public void update() {
-        this.owner.getEnderChest().update();
-    }
-
-    @Override
-    public List<ItemStack> getContents() {
-        return this.items;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        this.owner.getEnderChest().onOpen(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        this.owner.getEnderChest().onClose(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return this.owner.getEnderChest().getViewers();
-    }
-
-    @Override
-    public void setMaxStackSize(int i) {
-        this.owner.getEnderChest().setMaxStackSize(i);
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner.getEnderChest().getOwner();
-    }
-
-    @Override
-    public Location getLocation() {
-        return null;
-    }
-
-    @Override
-    public void a(IInventoryListener iinventorylistener) {
-        this.owner.getEnderChest().a(iinventorylistener);
-    }
-
-    @Override
-    public void b(IInventoryListener iinventorylistener) {
-        this.owner.getEnderChest().b(iinventorylistener);
-    }
-
-    @Override
-    public ItemStack getItem(int i) {
-        return i >= 0 && i < this.items.size() ? this.items.get(i) : ItemStack.a;
-    }
-
-    @Override
-    public ItemStack splitStack(int i, int j) {
-        ItemStack itemstack = ContainerUtil.a(this.items, i, j);
-        if (!itemstack.isEmpty()) {
-            this.update();
-        }
-
-        return itemstack;
-    }
-
-    @Override
-    public ItemStack a(ItemStack itemstack) {
-        ItemStack itemstack1 = itemstack.cloneItemStack();
-
-        for (int i = 0; i < this.getSize(); ++i) {
-            ItemStack itemstack2 = this.getItem(i);
-            if (itemstack2.isEmpty()) {
-                this.setItem(i, itemstack1);
-                this.update();
-                return ItemStack.a;
-            }
-
-            if (ItemStack.c(itemstack2, itemstack1)) {
-                int j = Math.min(this.getMaxStackSize(), itemstack2.getMaxStackSize());
-                int k = Math.min(itemstack1.getCount(), j - itemstack2.getCount());
-                if (k > 0) {
-                    itemstack2.add(k);
-                    itemstack1.subtract(k);
-                    if (itemstack1.isEmpty()) {
-                        this.update();
-                        return ItemStack.a;
-                    }
-                }
-            }
-        }
-
-        if (itemstack1.getCount() != itemstack.getCount()) {
-            this.update();
-        }
-
-        return itemstack1;
-    }
-
-    @Override
-    public ItemStack splitWithoutUpdate(int i) {
-        ItemStack itemstack = this.items.get(i);
-        if (itemstack.isEmpty()) {
-            return ItemStack.a;
-        } else {
-            this.items.set(i, ItemStack.a);
-            return itemstack;
-        }
-    }
-
-    @Override
-    public void setItem(int i, ItemStack itemstack) {
-        this.items.set(i, itemstack);
-        if (!itemstack.isEmpty() && itemstack.getCount() > this.getMaxStackSize()) {
-            itemstack.setCount(this.getMaxStackSize());
-        }
-
-        this.update();
-    }
-
-    @Override
-    public int getSize() {
-        return this.owner.getEnderChest().getSize();
-    }
-
-    @Override
-    public boolean isNotEmpty() {
-
-        for (ItemStack itemstack : this.items) {
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return 64;
-    }
-
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen(EntityHuman entityhuman) {
-    }
-
-    @Override
-    public void closeContainer(EntityHuman entityhuman) {
-    }
-
-    @Override
-    public boolean b(int i, ItemStack itemstack) {
-        return true;
-    }
-
-    @Override
-    public void clear() {
-        this.items.clear();
-    }
-
-    @Override
-    public void a(AutoRecipeStackManager autorecipestackmanager) {
-
-        for (ItemStack itemstack : this.items) {
-            autorecipestackmanager.b(itemstack);
-        }
-
-    }
-
-}

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

@@ -1,759 +0,0 @@
-/*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_15_R1;
-
-import com.google.common.collect.ImmutableList;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import net.minecraft.server.v1_15_R1.AutoRecipeStackManager;
-import net.minecraft.server.v1_15_R1.ChatMessage;
-import net.minecraft.server.v1_15_R1.ContainerUtil;
-import net.minecraft.server.v1_15_R1.CrashReport;
-import net.minecraft.server.v1_15_R1.CrashReportSystemDetails;
-import net.minecraft.server.v1_15_R1.EntityHuman;
-import net.minecraft.server.v1_15_R1.EntityPlayer;
-import net.minecraft.server.v1_15_R1.EnumItemSlot;
-import net.minecraft.server.v1_15_R1.IBlockData;
-import net.minecraft.server.v1_15_R1.IChatBaseComponent;
-import net.minecraft.server.v1_15_R1.Item;
-import net.minecraft.server.v1_15_R1.ItemArmor;
-import net.minecraft.server.v1_15_R1.ItemStack;
-import net.minecraft.server.v1_15_R1.NBTTagCompound;
-import net.minecraft.server.v1_15_R1.NBTTagList;
-import net.minecraft.server.v1_15_R1.NonNullList;
-import net.minecraft.server.v1_15_R1.PacketPlayOutSetSlot;
-import net.minecraft.server.v1_15_R1.PlayerInventory;
-import net.minecraft.server.v1_15_R1.ReportedException;
-import net.minecraft.server.v1_15_R1.World;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-
-    private final CraftInventory inventory;
-    private boolean playerOnline;
-    private EntityHuman player;
-    private NonNullList<ItemStack> items, armor, extraSlots;
-    private List<NonNullList<ItemStack>> f;
-
-    public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
-        this.inventory = new CraftInventory(this);
-        this.playerOnline = online;
-        this.player = super.player;
-        this.items = this.player.inventory.items;
-        this.armor = this.player.inventory.armor;
-        this.extraSlots = this.player.inventory.extraSlots;
-        this.f = ImmutableList.of(this.items, this.armor, this.extraSlots);
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull final Player player) {
-        if (!this.playerOnline) {
-            EntityPlayer entityPlayer = PlayerDataManager.getHandle(player);
-            entityPlayer.inventory.transaction.addAll(this.transaction);
-            this.player = entityPlayer;
-            for (int i = 0; i < getSize(); ++i) {
-                this.player.inventory.setItem(i, getRawItem(i));
-            }
-            this.player.inventory.itemInHandIndex = this.itemInHandIndex;
-            this.items = this.player.inventory.items;
-            this.armor = this.player.inventory.armor;
-            this.extraSlots = this.player.inventory.extraSlots;
-            this.f = ImmutableList.of(this.items, this.armor, this.extraSlots);
-            this.playerOnline = true;
-        }
-    }
-
-    @Override
-    public boolean a(final EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public @NotNull CraftInventory getBukkitInventory() {
-        return this.inventory;
-    }
-
-    @Override
-    public ItemStack getItem(int i) {
-        List<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            return ItemStack.a;
-        }
-
-        return list.get(i);
-    }
-
-    private ItemStack getRawItem(int i) {
-        NonNullList<ItemStack> list = null;
-        for (NonNullList<ItemStack> next : this.f) {
-            if (i < next.size()) {
-                list = next;
-                break;
-            }
-            i -= next.size();
-        }
-
-        return list == null ? ItemStack.a : list.get(i);
-    }
-
-    @Override
-    public IChatBaseComponent getDisplayName() {
-        return new ChatMessage(this.player.getName());
-    }
-
-    @Override
-    public boolean hasCustomName() {
-        return false;
-    }
-
-    private int getReversedArmorSlotNum(final int i) {
-        if (i == 0) {
-            return 3;
-        }
-        if (i == 1) {
-            return 2;
-        }
-        if (i == 2) {
-            return 1;
-        }
-        if (i == 3) {
-            return 0;
-        }
-        return i;
-    }
-
-    private int getReversedItemSlotNum(final int i) {
-        if (i >= 27) {
-            return i - 27;
-        }
-        return i + 9;
-    }
-
-    @Override
-    public int getSize() {
-        return 45;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
-    @Override
-    public void setItem(int i, final ItemStack itemstack) {
-        List<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            this.player.drop(itemstack, true);
-            return;
-        }
-
-        list.set(i, itemstack);
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        this.playerOnline = false;
-    }
-
-    @Override
-    public ItemStack splitStack(int i, final int j) {
-        List<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            return ItemStack.a;
-        }
-
-        return list.get(i).isEmpty() ? ItemStack.a : ContainerUtil.a(list, i, j);
-    }
-
-    @Override
-    public ItemStack splitWithoutUpdate(int i) {
-        List<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            return ItemStack.a;
-        }
-
-        if (!list.get(i).isEmpty()) {
-            ItemStack itemstack = list.get(i);
-
-            list.set(i, ItemStack.a);
-            return itemstack;
-        }
-
-        return ItemStack.a;
-    }
-
-    @Override
-    public List<ItemStack> getContents() {
-        return this.f.stream().flatMap(List::stream).collect(Collectors.toList());
-    }
-
-    @Override
-    public List<ItemStack> getArmorContents() {
-        return this.armor;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        this.transaction.add(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        this.transaction.remove(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return this.transaction;
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.player.getBukkitEntity();
-    }
-
-    @Override
-    public Location getLocation() {
-        return this.player.getBukkitEntity().getLocation();
-    }
-
-    @Override
-    public ItemStack getItemInHand() {
-        return d(this.itemInHandIndex) ? this.items.get(this.itemInHandIndex) : ItemStack.a;
-    }
-
-    private boolean a(ItemStack itemstack, ItemStack itemstack1) {
-        return !itemstack.isEmpty() && this.b(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize();
-    }
-
-    private boolean b(ItemStack itemstack, ItemStack itemstack1) {
-        return itemstack.getItem() == itemstack1.getItem() && ItemStack.equals(itemstack, itemstack1);
-    }
-
-    @Override
-    public int canHold(ItemStack itemstack) {
-        int remains = itemstack.getCount();
-
-        for (int i = 0; i < this.items.size(); ++i) {
-            ItemStack itemstack1 = this.getItem(i);
-            if (itemstack1.isEmpty()) {
-                return itemstack.getCount();
-            }
-
-            if (!this.a(itemstack, itemstack1)) {
-                remains -= (itemstack1.getMaxStackSize() < this.getMaxStackSize() ? itemstack1.getMaxStackSize() : this.getMaxStackSize()) - itemstack1.getCount();
-            }
-
-            if (remains <= 0) {
-                return itemstack.getCount();
-            }
-        }
-
-        return itemstack.getCount() - remains;
-    }
-
-    @Override
-    public int getFirstEmptySlotIndex() {
-        for (int i = 0; i < this.items.size(); ++i) {
-            if (this.items.get(i).isEmpty()) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public void c(int i) {
-        this.itemInHandIndex = this.i();
-        ItemStack itemstack = this.items.get(this.itemInHandIndex);
-        this.items.set(this.itemInHandIndex, this.items.get(i));
-        this.items.set(i, itemstack);
-    }
-
-    @Override
-    public int c(ItemStack itemstack) {
-        for (int i = 0; i < this.items.size(); ++i) {
-            ItemStack itemstack1 = this.items.get(i);
-            if (!this.items.get(i).isEmpty() && this.b(itemstack, this.items.get(i)) && !this.items.get(i).f() && !itemstack1.hasEnchantments() && !itemstack1.hasName()) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public int i() {
-        int i;
-        int j;
-        for (j = 0; j < 9; ++j) {
-            i = (this.itemInHandIndex + j) % 9;
-            if (this.items.get(i).isEmpty()) {
-                return i;
-            }
-        }
-
-        for (j = 0; j < 9; ++j) {
-            i = (this.itemInHandIndex + j) % 9;
-            if (!this.items.get(i).hasEnchantments()) {
-                return i;
-            }
-        }
-
-        return this.itemInHandIndex;
-    }
-
-    @Override
-    public int a(Predicate<ItemStack> predicate, int i) {
-        int j = 0;
-
-        int k;
-        for (k = 0; k < this.getSize(); ++k) {
-            ItemStack itemstack = this.getItem(k);
-            if (!itemstack.isEmpty() && predicate.test(itemstack)) {
-                int l = i <= 0 ? itemstack.getCount() : Math.min(i - j, itemstack.getCount());
-                j += l;
-                if (i != 0) {
-                    itemstack.subtract(l);
-                    if (itemstack.isEmpty()) {
-                        this.setItem(k, ItemStack.a);
-                    }
-
-                    if (i > 0 && j >= i) {
-                        return j;
-                    }
-                }
-            }
-        }
-
-        if (!this.getCarried().isEmpty() && predicate.test(this.getCarried())) {
-            k = i <= 0 ? this.getCarried().getCount() : Math.min(i - j, this.getCarried().getCount());
-            j += k;
-            if (i != 0) {
-                this.getCarried().subtract(k);
-                if (this.getCarried().isEmpty()) {
-                    this.setCarried(ItemStack.a);
-                }
-
-                if (i > 0 && j >= i) {
-                    return j;
-                }
-            }
-        }
-
-        return j;
-    }
-
-    private int i(ItemStack itemstack) {
-        int i = this.firstPartial(itemstack);
-        if (i == -1) {
-            i = this.getFirstEmptySlotIndex();
-        }
-
-        return i == -1 ? itemstack.getCount() : this.d(i, itemstack);
-    }
-
-    private int d(int i, ItemStack itemstack) {
-        Item item = itemstack.getItem();
-        int j = itemstack.getCount();
-        ItemStack itemstack1 = this.getItem(i);
-        if (itemstack1.isEmpty()) {
-            itemstack1 = new ItemStack(item, 0);
-            if (itemstack.hasTag()) {
-                itemstack1.setTag(itemstack.getTag().clone());
-            }
-
-            this.setItem(i, itemstack1);
-        }
-
-        int k = j;
-        if (j > itemstack1.getMaxStackSize() - itemstack1.getCount()) {
-            k = itemstack1.getMaxStackSize() - itemstack1.getCount();
-        }
-
-        if (k > this.getMaxStackSize() - itemstack1.getCount()) {
-            k = this.getMaxStackSize() - itemstack1.getCount();
-        }
-
-        if (k == 0) {
-            return j;
-        } else {
-            j -= k;
-            itemstack1.add(k);
-            itemstack1.d(5);
-            return j;
-        }
-    }
-
-    @Override
-    public int firstPartial(ItemStack itemstack) {
-        if (this.a(this.getItem(this.itemInHandIndex), itemstack)) {
-            return this.itemInHandIndex;
-        } else if (this.a(this.getItem(40), itemstack)) {
-            return 40;
-        } else {
-            for (int i = 0; i < this.items.size(); ++i) {
-                if (this.a(this.items.get(i), itemstack)) {
-                    return i;
-                }
-            }
-
-            return -1;
-        }
-    }
-
-    @Override
-    public void j() {
-
-        for (List<ItemStack> itemStacks : this.f) {
-            for (int i = 0; i < itemStacks.size(); ++i) {
-                if (!itemStacks.get(i).isEmpty()) {
-                    itemStacks.get(i).a(this.player.world, this.player, i, this.itemInHandIndex == i);
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public boolean pickup(ItemStack itemstack) {
-        return this.c(-1, itemstack);
-    }
-
-    @Override
-    public boolean c(int i, ItemStack itemstack) {
-        if (itemstack.isEmpty()) {
-            return false;
-        } else {
-            try {
-                if (itemstack.f()) {
-                    if (i == -1) {
-                        i = this.getFirstEmptySlotIndex();
-                    }
-
-                    if (i >= 0) {
-                        this.items.set(i, itemstack.cloneItemStack());
-                        this.items.get(i).d(5);
-                        itemstack.setCount(0);
-                        return true;
-                    } else if (this.player.abilities.canInstantlyBuild) {
-                        itemstack.setCount(0);
-                        return true;
-                    } else {
-                        return false;
-                    }
-                } else {
-                    int j;
-                    do {
-                        j = itemstack.getCount();
-                        if (i == -1) {
-                            itemstack.setCount(this.i(itemstack));
-                        } else {
-                            itemstack.setCount(this.d(i, itemstack));
-                        }
-                    } while(!itemstack.isEmpty() && itemstack.getCount() < j);
-
-                    if (itemstack.getCount() == j && this.player.abilities.canInstantlyBuild) {
-                        itemstack.setCount(0);
-                        return true;
-                    } else {
-                        return itemstack.getCount() < j;
-                    }
-                }
-            } catch (Throwable var6) {
-                CrashReport crashreport = CrashReport.a(var6, "Adding item to inventory");
-                CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Item being added");
-                crashreportsystemdetails.a("Item ID", Item.getId(itemstack.getItem()));
-                crashreportsystemdetails.a("Item data", itemstack.getDamage());
-                crashreportsystemdetails.a("Item name", () -> itemstack.getName().getString());
-                throw new ReportedException(crashreport);
-            }
-        }
-    }
-
-    @Override
-    public void a(World world, ItemStack itemstack) {
-        if (!world.isClientSide) {
-            while(!itemstack.isEmpty()) {
-                int i = this.firstPartial(itemstack);
-                if (i == -1) {
-                    i = this.getFirstEmptySlotIndex();
-                }
-
-                if (i == -1) {
-                    this.player.drop(itemstack, false);
-                    break;
-                }
-
-                int j = itemstack.getMaxStackSize() - this.getItem(i).getCount();
-                if (this.c(i, itemstack.cloneAndSubtract(j))) {
-                    ((EntityPlayer)this.player).playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, i, this.getItem(i)));
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public void f(ItemStack itemstack) {
-
-        for (List<ItemStack> list : this.f) {
-            for (int i = 0; i < list.size(); ++i) {
-                if (list.get(i) == itemstack) {
-                    list.set(i, ItemStack.a);
-                    break;
-                }
-            }
-        }
-    }
-
-    @Override
-    public float a(IBlockData iblockdata) {
-        return this.items.get(this.itemInHandIndex).a(iblockdata);
-    }
-
-    @Override
-    public NBTTagList a(NBTTagList nbttaglist) {
-        NBTTagCompound nbttagcompound;
-        int i;
-        for (i = 0; i < this.items.size(); ++i) {
-            if (!this.items.get(i).isEmpty()) {
-                nbttagcompound = new NBTTagCompound();
-                nbttagcompound.setByte("Slot", (byte) i);
-                this.items.get(i).save(nbttagcompound);
-                nbttaglist.add(nbttagcompound);
-            }
-        }
-
-        for (i = 0; i < this.armor.size(); ++i) {
-            if (!this.armor.get(i).isEmpty()) {
-                nbttagcompound = new NBTTagCompound();
-                nbttagcompound.setByte("Slot", (byte) (i + 100));
-                this.armor.get(i).save(nbttagcompound);
-                nbttaglist.add(nbttagcompound);
-            }
-        }
-
-        for (i = 0; i < this.extraSlots.size(); ++i) {
-            if (!this.extraSlots.get(i).isEmpty()) {
-                nbttagcompound = new NBTTagCompound();
-                nbttagcompound.setByte("Slot", (byte) (i + 150));
-                this.extraSlots.get(i).save(nbttagcompound);
-                nbttaglist.add(nbttagcompound);
-            }
-        }
-
-        return nbttaglist;
-    }
-
-    @Override
-    public void b(NBTTagList nbttaglist) {
-        this.items.clear();
-        this.armor.clear();
-        this.extraSlots.clear();
-
-        for(int i = 0; i < nbttaglist.size(); ++i) {
-            NBTTagCompound nbttagcompound = nbttaglist.getCompound(i);
-            int j = nbttagcompound.getByte("Slot") & 255;
-            ItemStack itemstack = ItemStack.a(nbttagcompound);
-            if (!itemstack.isEmpty()) {
-                if (j < this.items.size()) {
-                    this.items.set(j, itemstack);
-                } else if (j >= 100 && j < this.armor.size() + 100) {
-                    this.armor.set(j - 100, itemstack);
-                } else if (j >= 150 && j < this.extraSlots.size() + 150) {
-                    this.extraSlots.set(j - 150, itemstack);
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public boolean isNotEmpty() {
-        Iterator iterator = this.items.iterator();
-
-        ItemStack itemstack;
-        while (iterator.hasNext()) {
-            itemstack = (ItemStack)iterator.next();
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        iterator = this.armor.iterator();
-
-        while (iterator.hasNext()) {
-            itemstack = (ItemStack)iterator.next();
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        iterator = this.extraSlots.iterator();
-
-        while (iterator.hasNext()) {
-            itemstack = (ItemStack)iterator.next();
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    @Nullable
-    @Override
-    public IChatBaseComponent getCustomName() {
-        return null;
-    }
-
-    @Override
-    public boolean b(IBlockData iblockdata) {
-        return this.getItem(this.itemInHandIndex).canDestroySpecialBlock(iblockdata);
-    }
-
-    @Override
-    public void a(float f) {
-        if (f > 0.0F) {
-            f /= 4.0F;
-            if (f < 1.0F) {
-                f = 1.0F;
-            }
-
-            for (int i = 0; i < this.armor.size(); ++i) {
-                ItemStack itemstack = this.armor.get(0);
-                int index = i;
-                if (itemstack.getItem() instanceof ItemArmor) {
-                    itemstack.damage((int) f, this.player, (entityhuman) -> entityhuman.c(EnumItemSlot.a(EnumItemSlot.Function.ARMOR, index)));
-                }
-            }
-        }
-    }
-
-    @Override
-    public void dropContents() {
-        for (List<ItemStack> itemStacks : this.f) {
-            for (int i = 0; i < itemStacks.size(); ++i) {
-                ItemStack itemstack = itemStacks.get(i);
-                if (!itemstack.isEmpty()) {
-                    itemStacks.set(i, ItemStack.a);
-                    this.player.a(itemstack, true, false);
-                }
-            }
-        }
-    }
-
-    @Override
-    public boolean h(ItemStack itemstack) {
-        return this.f.stream().flatMap(List::stream).anyMatch(itemStack1 -> !itemStack1.isEmpty() && itemStack1.doMaterialsMatch(itemstack));
-    }
-
-    @Override
-    public void a(PlayerInventory playerinventory) {
-        for (int i = 0; i < playerinventory.getSize(); ++i) {
-            this.setItem(i, playerinventory.getItem(i));
-        }
-
-        this.itemInHandIndex = playerinventory.itemInHandIndex;
-    }
-
-    @Override
-    public void clear() {
-        this.f.forEach(List::clear);
-    }
-
-    @Override
-    public void a(AutoRecipeStackManager autorecipestackmanager) {
-        for (ItemStack itemstack : this.items) {
-            autorecipestackmanager.a(itemstack);
-        }
-    }
-
-}

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

@@ -1,296 +0,0 @@
-/*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_16_R1;
-
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.mojang.authlib.GameProfile;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.lang.reflect.Field;
-import net.minecraft.server.v1_16_R1.ChatComponentText;
-import net.minecraft.server.v1_16_R1.ChatMessageType;
-import net.minecraft.server.v1_16_R1.Container;
-import net.minecraft.server.v1_16_R1.Containers;
-import net.minecraft.server.v1_16_R1.Entity;
-import net.minecraft.server.v1_16_R1.EntityHuman;
-import net.minecraft.server.v1_16_R1.EntityPlayer;
-import net.minecraft.server.v1_16_R1.MinecraftServer;
-import net.minecraft.server.v1_16_R1.NBTCompressedStreamTools;
-import net.minecraft.server.v1_16_R1.NBTTagCompound;
-import net.minecraft.server.v1_16_R1.PacketPlayOutChat;
-import net.minecraft.server.v1_16_R1.PacketPlayOutOpenWindow;
-import net.minecraft.server.v1_16_R1.PlayerInteractManager;
-import net.minecraft.server.v1_16_R1.PlayerInventory;
-import net.minecraft.server.v1_16_R1.SystemUtils;
-import net.minecraft.server.v1_16_R1.World;
-import net.minecraft.server.v1_16_R1.WorldNBTStorage;
-import net.minecraft.server.v1_16_R1.WorldServer;
-import org.apache.logging.log4j.LogManager;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_16_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_16_R1.event.CraftEventFactory;
-import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftContainer;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    private @Nullable Field bukkitEntity;
-
-    public PlayerDataManager() {
-        try {
-            bukkitEntity = Entity.class.getDeclaredField("bukkitEntity");
-        } catch (NoSuchFieldException e) {
-            System.out.println("Unable to obtain field to inject custom save process - players' mounts may be deleted when loaded.");
-            e.printStackTrace();
-            bukkitEntity = null;
-        }
-    }
-
-    @NotNull
-    public static EntityPlayer getHandle(final Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
-    @Nullable
-    @Override
-    public Player loadPlayer(@NotNull final OfflinePlayer offline) {
-        // Ensure player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        // Create a profile and entity to load the player data
-        // 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.OVERWORLD);
-
-        if (worldServer == null) {
-            return null;
-        }
-
-        EntityPlayer entity = new EntityPlayer(server, worldServer, profile, new PlayerInteractManager(worldServer));
-
-        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 CraftPlayer(player.server.server, player) {
-            @Override
-            public void saveData() {
-                super.saveData();
-                // See net.minecraft.server.WorldNBTStorage#save(EntityPlayer)
-                try {
-                    WorldNBTStorage worldNBTStorage = player.server.getPlayerList().playerFileData;
-
-                    NBTTagCompound playerData = player.save(new NBTTagCompound());
-
-                    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);
-                } catch (Exception e) {
-                    LogManager.getLogger().warn("Failed to save player data for {}", player.getDisplayName().getString());
-                }
-            }
-        });
-    }
-
-    @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.playerConnection == null) {
-            return null;
-        }
-
-        String title;
-        if (inventory instanceof SpecialEnderChest) {
-            HumanEntity owner = (HumanEntity) ((SpecialEnderChest) inventory).getBukkitOwner();
-            title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.enderchest", "%player%", owner.getName());
-            if (title == null) {
-                title = owner.getName() + "'s Ender Chest";
-            }
-        } else if (inventory instanceof SpecialPlayerInventory) {
-            EntityHuman owner = ((PlayerInventory) inventory).player;
-            title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.player", "%player%", owner.getName());
-            if (title == null) {
-                title = owner.getName() + "'s Inventory";
-            }
-        } else {
-            return player.openInventory(inventory.getBukkitInventory());
-        }
-
-        String finalTitle = title;
-        Container container = new CraftContainer(new InventoryView() {
-            @Override
-            public @NotNull Inventory getTopInventory() {
-                return inventory.getBukkitInventory();
-            }
-            @Override
-            public @NotNull Inventory getBottomInventory() {
-                return player.getInventory();
-            }
-            @Override
-            public @NotNull HumanEntity getPlayer() {
-                return player;
-            }
-            @Override
-            public @NotNull InventoryType getType() {
-                return inventory.getBukkitInventory().getType();
-            }
-            @Override
-            public @NotNull String getTitle() {
-                return finalTitle;
-            }
-        }, nmsPlayer, nmsPlayer.nextContainerCounter()) {
-            @Override
-            public Containers<?> getType() {
-                switch (inventory.getBukkitInventory().getSize()) {
-                    case 9:
-                        return Containers.GENERIC_9X1;
-                    case 18:
-                        return Containers.GENERIC_9X2;
-                    case 27:
-                    default:
-                        return Containers.GENERIC_9X3;
-                    case 36:
-                        return Containers.GENERIC_9X4;
-                    case 41: // PLAYER
-                    case 45:
-                        return Containers.GENERIC_9X5;
-                    case 54:
-                        return Containers.GENERIC_9X6;
-                }
-            }
-        };
-
-        container.setTitle(new ChatComponentText(title));
-        container = CraftEventFactory.callInventoryOpenEvent(nmsPlayer, container);
-
-        if (container == null) {
-            return null;
-        }
-
-        nmsPlayer.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, container.getType(),
-                new ChatComponentText(container.getBukkitView().getTitle())));
-        nmsPlayer.activeContainer = container;
-        container.addSlotListener(nmsPlayer);
-
-        return container.getBukkitView();
-
-    }
-
-    @Override
-    public void sendSystemMessage(@NotNull Player player, @NotNull String message) {
-        int newline = message.indexOf('\n');
-        if (newline != -1) {
-            // No newlines in action bar chat.
-            message = message.substring(0, newline);
-        }
-
-        if (message.isEmpty()) {
-            return;
-        }
-
-        EntityPlayer nmsPlayer = getHandle(player);
-
-        // For action bar chat, color codes are still supported but JSON text color is not allowed. Do not convert text.
-        if (nmsPlayer.playerConnection != null) {
-            nmsPlayer.playerConnection.sendPacket(new PacketPlayOutChat(new ChatComponentText(message), ChatMessageType.GAME_INFO, SystemUtils.b));
-        }
-    }
-
-}

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

@@ -1,733 +0,0 @@
-/*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_16_R1;
-
-import com.google.common.collect.ImmutableList;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import net.minecraft.server.v1_16_R1.AutoRecipeStackManager;
-import net.minecraft.server.v1_16_R1.ChatMessage;
-import net.minecraft.server.v1_16_R1.ContainerUtil;
-import net.minecraft.server.v1_16_R1.CrashReport;
-import net.minecraft.server.v1_16_R1.CrashReportSystemDetails;
-import net.minecraft.server.v1_16_R1.DamageSource;
-import net.minecraft.server.v1_16_R1.EntityHuman;
-import net.minecraft.server.v1_16_R1.EntityPlayer;
-import net.minecraft.server.v1_16_R1.EnumItemSlot;
-import net.minecraft.server.v1_16_R1.IBlockData;
-import net.minecraft.server.v1_16_R1.IChatBaseComponent;
-import net.minecraft.server.v1_16_R1.IInventory;
-import net.minecraft.server.v1_16_R1.Item;
-import net.minecraft.server.v1_16_R1.ItemArmor;
-import net.minecraft.server.v1_16_R1.ItemStack;
-import net.minecraft.server.v1_16_R1.NBTTagCompound;
-import net.minecraft.server.v1_16_R1.NBTTagList;
-import net.minecraft.server.v1_16_R1.NonNullList;
-import net.minecraft.server.v1_16_R1.PacketPlayOutSetSlot;
-import net.minecraft.server.v1_16_R1.PlayerInventory;
-import net.minecraft.server.v1_16_R1.ReportedException;
-import net.minecraft.server.v1_16_R1.World;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_16_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-
-    private final CraftInventory inventory;
-    private boolean playerOnline;
-    private EntityHuman player;
-    private NonNullList<ItemStack> items, armor, extraSlots;
-    private List<NonNullList<ItemStack>> f;
-
-    public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
-        this.inventory = new CraftInventory(this);
-        this.playerOnline = online;
-        this.player = super.player;
-        this.items = this.player.inventory.items;
-        this.armor = this.player.inventory.armor;
-        this.extraSlots = this.player.inventory.extraSlots;
-        this.f = ImmutableList.of(this.items, this.armor, this.extraSlots);
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull final Player player) {
-        if (!this.playerOnline) {
-            EntityPlayer entityPlayer = PlayerDataManager.getHandle(player);
-            entityPlayer.inventory.transaction.addAll(this.transaction);
-            this.player = entityPlayer;
-            for (int i = 0; i < getSize(); ++i) {
-                this.player.inventory.setItem(i, getRawItem(i));
-            }
-            this.player.inventory.itemInHandIndex = this.itemInHandIndex;
-            this.items = this.player.inventory.items;
-            this.armor = this.player.inventory.armor;
-            this.extraSlots = this.player.inventory.extraSlots;
-            this.f = ImmutableList.of(this.items, this.armor, this.extraSlots);
-            this.playerOnline = true;
-        }
-    }
-
-    @Override
-    public boolean a(final EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public @NotNull CraftInventory getBukkitInventory() {
-        return this.inventory;
-    }
-
-    @Override
-    public ItemStack getItem(int i) {
-        List<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            return ItemStack.b;
-        }
-
-        return list.get(i);
-    }
-
-    private ItemStack getRawItem(int i) {
-        NonNullList<ItemStack> list = null;
-        for (NonNullList<ItemStack> next : this.f) {
-            if (i < next.size()) {
-                list = next;
-                break;
-            }
-            i -= next.size();
-        }
-
-        return list == null ? ItemStack.b : list.get(i);
-    }
-
-    @Override
-    public IChatBaseComponent getDisplayName() {
-        return new ChatMessage(this.player.getName());
-    }
-
-    @Override
-    public boolean hasCustomName() {
-        return false;
-    }
-
-    private int getReversedArmorSlotNum(final int i) {
-        if (i == 0) {
-            return 3;
-        }
-        if (i == 1) {
-            return 2;
-        }
-        if (i == 2) {
-            return 1;
-        }
-        if (i == 3) {
-            return 0;
-        }
-        return i;
-    }
-
-    private int getReversedItemSlotNum(final int i) {
-        if (i >= 27) {
-            return i - 27;
-        }
-        return i + 9;
-    }
-
-    @Override
-    public int getSize() {
-        return 45;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
-    @Override
-    public void setItem(int i, final ItemStack itemstack) {
-        List<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            this.player.drop(itemstack, true);
-            return;
-        }
-
-        list.set(i, itemstack);
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        this.playerOnline = false;
-    }
-
-    @Override
-    public ItemStack splitStack(int i, final int j) {
-        List<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            return ItemStack.b;
-        }
-
-        return list.get(i).isEmpty() ? ItemStack.b : ContainerUtil.a(list, i, j);
-    }
-
-    @Override
-    public ItemStack splitWithoutUpdate(int i) {
-        List<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            return ItemStack.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.f.stream().flatMap(List::stream).collect(Collectors.toList());
-    }
-
-    @Override
-    public List<ItemStack> getArmorContents() {
-        return this.armor;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        this.transaction.add(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        this.transaction.remove(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return this.transaction;
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.player.getBukkitEntity();
-    }
-
-    @Override
-    public Location getLocation() {
-        return this.player.getBukkitEntity().getLocation();
-    }
-
-    @Override
-    public ItemStack getItemInHand() {
-        return d(this.itemInHandIndex) ? this.items.get(this.itemInHandIndex) : ItemStack.b;
-    }
-
-    private boolean isSimilarAndNotFull(ItemStack itemstack, ItemStack itemstack1) {
-        return !itemstack.isEmpty() && this.b(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize();
-    }
-
-    private boolean b(ItemStack itemstack, ItemStack itemstack1) {
-        return itemstack.getItem() == itemstack1.getItem() && ItemStack.equals(itemstack, itemstack1);
-    }
-
-    @Override
-    public int canHold(ItemStack itemstack) {
-        int remains = itemstack.getCount();
-
-        for (int i = 0; i < this.items.size(); ++i) {
-            ItemStack itemstack1 = this.getItem(i);
-            if (itemstack1.isEmpty()) {
-                return itemstack.getCount();
-            }
-
-            if (!this.isSimilarAndNotFull(itemstack, itemstack1)) {
-                remains -= Math.min(itemstack1.getMaxStackSize(), this.getMaxStackSize()) - itemstack1.getCount();
-            }
-
-            if (remains <= 0) {
-                return itemstack.getCount();
-            }
-        }
-
-        ItemStack offhandItemStack = this.getItem(this.items.size() + this.armor.size());
-        if (this.isSimilarAndNotFull(offhandItemStack, itemstack)) {
-            remains -= Math.min(offhandItemStack.getMaxStackSize(), this.getMaxStackSize()) - offhandItemStack.getCount();
-        }
-
-        return itemstack.getCount() - remains;
-    }
-
-    @Override
-    public int getFirstEmptySlotIndex() {
-        for (int i = 0; i < this.items.size(); ++i) {
-            if (this.items.get(i).isEmpty()) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public void c(int i) {
-        this.itemInHandIndex = this.i();
-        ItemStack itemstack = this.items.get(this.itemInHandIndex);
-        this.items.set(this.itemInHandIndex, this.items.get(i));
-        this.items.set(i, itemstack);
-    }
-
-    @Override
-    public int c(ItemStack itemstack) {
-        for (int i = 0; i < this.items.size(); ++i) {
-            ItemStack itemstack1 = this.items.get(i);
-            if (!this.items.get(i).isEmpty() && this.b(itemstack, this.items.get(i)) && !this.items.get(i).f() && !itemstack1.hasEnchantments() && !itemstack1.hasName()) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public int i() {
-        int i;
-        int j;
-        for (j = 0; j < 9; ++j) {
-            i = (this.itemInHandIndex + j) % 9;
-            if (this.items.get(i).isEmpty()) {
-                return i;
-            }
-        }
-
-        for (j = 0; j < 9; ++j) {
-            i = (this.itemInHandIndex + j) % 9;
-            if (!this.items.get(i).hasEnchantments()) {
-                return i;
-            }
-        }
-
-        return this.itemInHandIndex;
-    }
-
-    @Override
-    public int a(Predicate<ItemStack> predicate, int i, 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);
-        j += ContainerUtil.a(this.getCarried(), predicate, i - j, flag);
-        if (this.getCarried().isEmpty()) {
-            this.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);
-            NBTTagCompound tag = itemstack.getTag();
-            if (tag != null) {
-                itemstack1.setTag(tag.clone());
-            }
-
-            this.setItem(i, itemstack1);
-        }
-
-        int k = j;
-        if (j > itemstack1.getMaxStackSize() - itemstack1.getCount()) {
-            k = itemstack1.getMaxStackSize() - itemstack1.getCount();
-        }
-
-        if (k > this.getMaxStackSize() - itemstack1.getCount()) {
-            k = this.getMaxStackSize() - itemstack1.getCount();
-        }
-
-        if (k != 0) {
-            j -= k;
-            itemstack1.add(k);
-            itemstack1.d(5);
-        }
-        return j;
-    }
-
-    @Override
-    public int firstPartial(ItemStack itemstack) {
-        if (this.isSimilarAndNotFull(this.getItem(this.itemInHandIndex), itemstack)) {
-            return this.itemInHandIndex;
-        } else if (this.isSimilarAndNotFull(this.getItem(40), itemstack)) {
-            return 40;
-        } else {
-            for (int i = 0; i < this.items.size(); ++i) {
-                if (this.isSimilarAndNotFull(this.items.get(i), itemstack)) {
-                    return i;
-                }
-            }
-
-            return -1;
-        }
-    }
-
-    @Override
-    public void j() {
-
-        for (List<ItemStack> itemStacks : this.f) {
-            for (int i = 0; i < itemStacks.size(); ++i) {
-                if (!itemStacks.get(i).isEmpty()) {
-                    itemStacks.get(i).a(this.player.world, this.player, i, this.itemInHandIndex == i);
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public boolean pickup(ItemStack itemstack) {
-        return this.c(-1, itemstack);
-    }
-
-    @Override
-    public boolean c(int i, ItemStack itemstack) {
-        if (itemstack.isEmpty()) {
-            return false;
-        } else {
-            try {
-                if (itemstack.f()) {
-                    if (i == -1) {
-                        i = this.getFirstEmptySlotIndex();
-                    }
-
-                    if (i >= 0) {
-                        this.items.set(i, itemstack.cloneItemStack());
-                        this.items.get(i).d(5);
-                        itemstack.setCount(0);
-                        return true;
-                    } else if (this.player.abilities.canInstantlyBuild) {
-                        itemstack.setCount(0);
-                        return true;
-                    } else {
-                        return false;
-                    }
-                } else {
-                    int j;
-                    do {
-                        j = itemstack.getCount();
-                        if (i == -1) {
-                            itemstack.setCount(this.i(itemstack));
-                        } else {
-                            itemstack.setCount(this.d(i, itemstack));
-                        }
-                    } while(!itemstack.isEmpty() && itemstack.getCount() < j);
-
-                    if (itemstack.getCount() == j && this.player.abilities.canInstantlyBuild) {
-                        itemstack.setCount(0);
-                        return true;
-                    } else {
-                        return itemstack.getCount() < j;
-                    }
-                }
-            } catch (Throwable var6) {
-                CrashReport crashreport = CrashReport.a(var6, "Adding item to inventory");
-                CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Item being added");
-                crashreportsystemdetails.a("Item ID", Item.getId(itemstack.getItem()));
-                crashreportsystemdetails.a("Item data", itemstack.getDamage());
-                crashreportsystemdetails.a("Item name", () -> itemstack.getName().getString());
-                throw new ReportedException(crashreport);
-            }
-        }
-    }
-
-    @Override
-    public void a(World world, ItemStack itemstack) {
-        if (!world.isClientSide) {
-            while(!itemstack.isEmpty()) {
-                int i = this.firstPartial(itemstack);
-                if (i == -1) {
-                    i = this.getFirstEmptySlotIndex();
-                }
-
-                if (i == -1) {
-                    this.player.drop(itemstack, false);
-                    break;
-                }
-
-                int j = itemstack.getMaxStackSize() - this.getItem(i).getCount();
-                if (this.c(i, itemstack.cloneAndSubtract(j))) {
-                    ((EntityPlayer)this.player).playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, i, this.getItem(i)));
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public void f(ItemStack itemstack) {
-
-        for (List<ItemStack> list : this.f) {
-            for (int i = 0; i < list.size(); ++i) {
-                if (list.get(i) == itemstack) {
-                    list.set(i, ItemStack.b);
-                    break;
-                }
-            }
-        }
-    }
-
-    @Override
-    public float a(IBlockData iblockdata) {
-        return this.items.get(this.itemInHandIndex).a(iblockdata);
-    }
-
-    @Override
-    public NBTTagList a(NBTTagList nbttaglist) {
-        NBTTagCompound nbttagcompound;
-        int i;
-        for (i = 0; i < this.items.size(); ++i) {
-            if (!this.items.get(i).isEmpty()) {
-                nbttagcompound = new NBTTagCompound();
-                nbttagcompound.setByte("Slot", (byte) i);
-                this.items.get(i).save(nbttagcompound);
-                nbttaglist.add(nbttagcompound);
-            }
-        }
-
-        for (i = 0; i < this.armor.size(); ++i) {
-            if (!this.armor.get(i).isEmpty()) {
-                nbttagcompound = new NBTTagCompound();
-                nbttagcompound.setByte("Slot", (byte) (i + 100));
-                this.armor.get(i).save(nbttagcompound);
-                nbttaglist.add(nbttagcompound);
-            }
-        }
-
-        for (i = 0; i < this.extraSlots.size(); ++i) {
-            if (!this.extraSlots.get(i).isEmpty()) {
-                nbttagcompound = new NBTTagCompound();
-                nbttagcompound.setByte("Slot", (byte) (i + 150));
-                this.extraSlots.get(i).save(nbttagcompound);
-                nbttaglist.add(nbttagcompound);
-            }
-        }
-
-        return nbttaglist;
-    }
-
-    @Override
-    public void b(NBTTagList nbttaglist) {
-        this.items.clear();
-        this.armor.clear();
-        this.extraSlots.clear();
-
-        for(int i = 0; i < nbttaglist.size(); ++i) {
-            NBTTagCompound nbttagcompound = nbttaglist.getCompound(i);
-            int j = nbttagcompound.getByte("Slot") & 255;
-            ItemStack itemstack = ItemStack.a(nbttagcompound);
-            if (!itemstack.isEmpty()) {
-                if (j < this.items.size()) {
-                    this.items.set(j, itemstack);
-                } else if (j >= 100 && j < this.armor.size() + 100) {
-                    this.armor.set(j - 100, itemstack);
-                } else if (j >= 150 && j < this.extraSlots.size() + 150) {
-                    this.extraSlots.set(j - 150, itemstack);
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public boolean isEmpty() {
-        Iterator<ItemStack> iterator = this.items.iterator();
-
-        ItemStack itemstack;
-        while (iterator.hasNext()) {
-            itemstack = iterator.next();
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        iterator = this.armor.iterator();
-
-        while (iterator.hasNext()) {
-            itemstack = iterator.next();
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        iterator = this.extraSlots.iterator();
-
-        while (iterator.hasNext()) {
-            itemstack = iterator.next();
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    @Nullable
-    @Override
-    public IChatBaseComponent getCustomName() {
-        return null;
-    }
-
-    @Override
-    public void a(DamageSource damagesource, float f) {
-        if (f > 0.0F) {
-            f /= 4.0F;
-            if (f < 1.0F) {
-                f = 1.0F;
-            }
-
-            for (int i = 0; i < this.armor.size(); ++i) {
-                ItemStack itemstack = this.armor.get(0);
-                int index = i;
-                if ((!damagesource.isFire() || !itemstack.getItem().u()) && itemstack.getItem() instanceof ItemArmor) {
-                    itemstack.damage((int) f, this.player, (entityHuman) -> entityHuman.broadcastItemBreak(EnumItemSlot.a(EnumItemSlot.Function.ARMOR, index)));
-                }
-            }
-        }
-    }
-
-    @Override
-    public void dropContents() {
-        for (List<ItemStack> itemStacks : this.f) {
-            for (int i = 0; i < itemStacks.size(); ++i) {
-                ItemStack itemstack = itemStacks.get(i);
-                if (!itemstack.isEmpty()) {
-                    itemStacks.set(i, ItemStack.b);
-                    this.player.a(itemstack, true, false);
-                }
-            }
-        }
-    }
-
-    @Override
-    public boolean h(ItemStack itemstack) {
-        return this.f.stream().flatMap(List::stream).anyMatch(itemStack1 -> !itemStack1.isEmpty() && itemStack1.doMaterialsMatch(itemstack));
-    }
-
-    @Override
-    public void a(PlayerInventory playerinventory) {
-        for (int i = 0; i < playerinventory.getSize(); ++i) {
-            this.setItem(i, playerinventory.getItem(i));
-        }
-
-        this.itemInHandIndex = playerinventory.itemInHandIndex;
-    }
-
-    @Override
-    public void clear() {
-        this.f.forEach(List::clear);
-    }
-
-    @Override
-    public void a(AutoRecipeStackManager autorecipestackmanager) {
-        for (ItemStack itemstack : this.items) {
-            autorecipestackmanager.a(itemstack);
-        }
-    }
-
-}

internal/v1_16_R2/pom.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, version 3.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
-    <version>4.1.4</version>
-  </parent>
-
-  <artifactId>openinvadapter1_16_R2</artifactId>
-  <name>OpenInvAdapter1_16_R2</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
-      <version>1.16.2-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugincore</artifactId>
-      <version>4.1.4</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.2</version>
-        <configuration>
-          <minimizeJar>true</minimizeJar>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

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

@@ -1,295 +0,0 @@
-/*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_16_R2;
-
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.mojang.authlib.GameProfile;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.lang.reflect.Field;
-import net.minecraft.server.v1_16_R2.ChatComponentText;
-import net.minecraft.server.v1_16_R2.ChatMessageType;
-import net.minecraft.server.v1_16_R2.Container;
-import net.minecraft.server.v1_16_R2.Containers;
-import net.minecraft.server.v1_16_R2.Entity;
-import net.minecraft.server.v1_16_R2.EntityHuman;
-import net.minecraft.server.v1_16_R2.EntityPlayer;
-import net.minecraft.server.v1_16_R2.MinecraftServer;
-import net.minecraft.server.v1_16_R2.NBTCompressedStreamTools;
-import net.minecraft.server.v1_16_R2.NBTTagCompound;
-import net.minecraft.server.v1_16_R2.PacketPlayOutChat;
-import net.minecraft.server.v1_16_R2.PacketPlayOutOpenWindow;
-import net.minecraft.server.v1_16_R2.PlayerInteractManager;
-import net.minecraft.server.v1_16_R2.PlayerInventory;
-import net.minecraft.server.v1_16_R2.SystemUtils;
-import net.minecraft.server.v1_16_R2.World;
-import net.minecraft.server.v1_16_R2.WorldNBTStorage;
-import net.minecraft.server.v1_16_R2.WorldServer;
-import org.apache.logging.log4j.LogManager;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_16_R2.event.CraftEventFactory;
-import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftContainer;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    private @Nullable Field bukkitEntity;
-
-    public PlayerDataManager() {
-        try {
-            bukkitEntity = Entity.class.getDeclaredField("bukkitEntity");
-        } catch (NoSuchFieldException e) {
-            System.out.println("Unable to obtain field to inject custom save process - players' mounts may be deleted when loaded.");
-            e.printStackTrace();
-            bukkitEntity = null;
-        }
-    }
-
-    @NotNull
-    public static EntityPlayer getHandle(final Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
-    @Nullable
-    @Override
-    public Player loadPlayer(@NotNull final OfflinePlayer offline) {
-        // Ensure player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        // Create a profile and entity to load the player data
-        // 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.OVERWORLD);
-
-        if (worldServer == null) {
-            return null;
-        }
-
-        EntityPlayer entity = new EntityPlayer(server, worldServer, profile, new PlayerInteractManager(worldServer));
-
-        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 CraftPlayer(player.server.server, player) {
-            @Override
-            public void saveData() {
-                super.saveData();
-                // See net.minecraft.server.WorldNBTStorage#save(EntityPlayer)
-                try {
-                    WorldNBTStorage worldNBTStorage = player.server.getPlayerList().playerFileData;
-
-                    NBTTagCompound playerData = player.save(new NBTTagCompound());
-
-                    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());
-                }
-            }
-        });
-    }
-
-    @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.playerConnection == null) {
-            return null;
-        }
-
-        String title;
-        if (inventory instanceof SpecialEnderChest) {
-            HumanEntity owner = (HumanEntity) ((SpecialEnderChest) inventory).getBukkitOwner();
-            title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.enderchest", "%player%", owner.getName());
-            if (title == null) {
-                title = owner.getName() + "'s Ender Chest";
-            }
-        } else if (inventory instanceof SpecialPlayerInventory) {
-            EntityHuman owner = ((PlayerInventory) inventory).player;
-            title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.player", "%player%", owner.getName());
-            if (title == null) {
-                title = owner.getName() + "'s Inventory";
-            }
-        } else {
-            return player.openInventory(inventory.getBukkitInventory());
-        }
-
-        String finalTitle = title;
-        Container container = new CraftContainer(new InventoryView() {
-            @Override
-            public @NotNull Inventory getTopInventory() {
-                return inventory.getBukkitInventory();
-            }
-            @Override
-            public @NotNull Inventory getBottomInventory() {
-                return player.getInventory();
-            }
-            @Override
-            public @NotNull HumanEntity getPlayer() {
-                return player;
-            }
-            @Override
-            public @NotNull InventoryType getType() {
-                return inventory.getBukkitInventory().getType();
-            }
-            @Override
-            public @NotNull String getTitle() {
-                return finalTitle;
-            }
-        }, nmsPlayer, nmsPlayer.nextContainerCounter()) {
-            @Override
-            public Containers<?> getType() {
-                switch (inventory.getBukkitInventory().getSize()) {
-                    case 9:
-                        return Containers.GENERIC_9X1;
-                    case 18:
-                        return Containers.GENERIC_9X2;
-                    case 27:
-                    default:
-                        return Containers.GENERIC_9X3;
-                    case 36:
-                        return Containers.GENERIC_9X4;
-                    case 41: // PLAYER
-                    case 45:
-                        return Containers.GENERIC_9X5;
-                    case 54:
-                        return Containers.GENERIC_9X6;
-                }
-            }
-        };
-
-        container.setTitle(new ChatComponentText(title));
-        container = CraftEventFactory.callInventoryOpenEvent(nmsPlayer, container);
-
-        if (container == null) {
-            return null;
-        }
-
-        nmsPlayer.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, container.getType(),
-                new ChatComponentText(container.getBukkitView().getTitle())));
-        nmsPlayer.activeContainer = container;
-        container.addSlotListener(nmsPlayer);
-
-        return container.getBukkitView();
-
-    }
-
-    @Override
-    public void sendSystemMessage(@NotNull Player player, @NotNull String message) {
-        int newline = message.indexOf('\n');
-        if (newline != -1) {
-            // No newlines in action bar chat.
-            message = message.substring(0, newline);
-        }
-
-        if (message.isEmpty()) {
-            return;
-        }
-
-        EntityPlayer nmsPlayer = getHandle(player);
-
-        // For action bar chat, color codes are still supported but JSON text color is not allowed. Do not convert text.
-        if (nmsPlayer.playerConnection != null) {
-            nmsPlayer.playerConnection.sendPacket(new PacketPlayOutChat(new ChatComponentText(message), ChatMessageType.GAME_INFO, SystemUtils.b));
-        }
-    }
-
-}

internal/v1_16_R3/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2021 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -20,56 +20,45 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
+    <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
-    <version>4.1.4</version>
+    <relativePath>../../pom.xml</relativePath>
+    <version>4.1.8</version>
   </parent>
 
-  <artifactId>openinvadapter1_16_R1</artifactId>
-  <name>OpenInvAdapter1_16_R1</name>
+  <artifactId>openinvadapter1_16_R3</artifactId>
+  <name>OpenInvAdapter1_16_R3</name>
 
   <dependencies>
     <dependency>
-      <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
-      <version>1.16.1-R0.1-SNAPSHOT</version>
+      <groupId>org.spigotmc</groupId>
       <scope>provided</scope>
+      <version>1.16.5-R0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
+      <artifactId>openinvapi</artifactId>
       <groupId>com.lishid</groupId>
+    </dependency>
+    <dependency>
       <artifactId>openinvplugincore</artifactId>
-      <version>4.1.4</version>
+      <groupId>com.lishid</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>annotations</artifactId>
+      <groupId>org.jetbrains</groupId>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.2</version>
-        <configuration>
-          <minimizeJar>true</minimizeJar>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
-
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
       </plugin>
     </plugins>
   </build>
 
-</project>
+</project>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,38 +14,38 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_16_R2;
+package com.lishid.openinv.internal.v1_16_R3;
 
 import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IAnySilentContainer;
 import java.lang.reflect.Field;
-import net.minecraft.server.v1_16_R2.Block;
-import net.minecraft.server.v1_16_R2.BlockBarrel;
-import net.minecraft.server.v1_16_R2.BlockChest;
-import net.minecraft.server.v1_16_R2.BlockChestTrapped;
-import net.minecraft.server.v1_16_R2.BlockPosition;
-import net.minecraft.server.v1_16_R2.BlockPropertyChestType;
-import net.minecraft.server.v1_16_R2.BlockShulkerBox;
-import net.minecraft.server.v1_16_R2.ChatMessage;
-import net.minecraft.server.v1_16_R2.Container;
-import net.minecraft.server.v1_16_R2.ContainerChest;
-import net.minecraft.server.v1_16_R2.Containers;
-import net.minecraft.server.v1_16_R2.EntityHuman;
-import net.minecraft.server.v1_16_R2.EntityPlayer;
-import net.minecraft.server.v1_16_R2.EnumGamemode;
-import net.minecraft.server.v1_16_R2.IBlockData;
-import net.minecraft.server.v1_16_R2.IChatBaseComponent;
-import net.minecraft.server.v1_16_R2.ITileInventory;
-import net.minecraft.server.v1_16_R2.InventoryEnderChest;
-import net.minecraft.server.v1_16_R2.InventoryLargeChest;
-import net.minecraft.server.v1_16_R2.PlayerInteractManager;
-import net.minecraft.server.v1_16_R2.PlayerInventory;
-import net.minecraft.server.v1_16_R2.TileEntity;
-import net.minecraft.server.v1_16_R2.TileEntityChest;
-import net.minecraft.server.v1_16_R2.TileEntityEnderChest;
-import net.minecraft.server.v1_16_R2.TileEntityLootable;
-import net.minecraft.server.v1_16_R2.TileInventory;
-import net.minecraft.server.v1_16_R2.World;
+import net.minecraft.server.v1_16_R3.Block;
+import net.minecraft.server.v1_16_R3.BlockBarrel;
+import net.minecraft.server.v1_16_R3.BlockChest;
+import net.minecraft.server.v1_16_R3.BlockChestTrapped;
+import net.minecraft.server.v1_16_R3.BlockPosition;
+import net.minecraft.server.v1_16_R3.BlockPropertyChestType;
+import net.minecraft.server.v1_16_R3.BlockShulkerBox;
+import net.minecraft.server.v1_16_R3.ChatMessage;
+import net.minecraft.server.v1_16_R3.Container;
+import net.minecraft.server.v1_16_R3.ContainerChest;
+import net.minecraft.server.v1_16_R3.Containers;
+import net.minecraft.server.v1_16_R3.EntityHuman;
+import net.minecraft.server.v1_16_R3.EntityPlayer;
+import net.minecraft.server.v1_16_R3.EnumGamemode;
+import net.minecraft.server.v1_16_R3.IBlockData;
+import net.minecraft.server.v1_16_R3.IChatBaseComponent;
+import net.minecraft.server.v1_16_R3.ITileInventory;
+import net.minecraft.server.v1_16_R3.InventoryEnderChest;
+import net.minecraft.server.v1_16_R3.InventoryLargeChest;
+import net.minecraft.server.v1_16_R3.PlayerInteractManager;
+import net.minecraft.server.v1_16_R3.PlayerInventory;
+import net.minecraft.server.v1_16_R3.TileEntity;
+import net.minecraft.server.v1_16_R3.TileEntityChest;
+import net.minecraft.server.v1_16_R3.TileEntityEnderChest;
+import net.minecraft.server.v1_16_R3.TileEntityLootable;
+import net.minecraft.server.v1_16_R3.TileInventory;
+import net.minecraft.server.v1_16_R3.World;
 import org.bukkit.Material;
 import org.bukkit.Statistic;
 import org.bukkit.block.Barrel;
@@ -148,7 +148,7 @@ public class AnySilentContainer implements IAnySilentContainer {
         if (!(relativeData instanceof Chest)) {
             return false;
         }
-        
+
         Chest relativeChest = (Chest) relativeData;
         if (relativeChest.getFacing() != chest.getFacing()
                 || relativeChest.getType() != (chest.getType() == Chest.Type.RIGHT ? Chest.Type.LEFT : Chest.Type.RIGHT)) {
@@ -190,29 +190,8 @@ public class AnySilentContainer implements IAnySilentContainer {
             InventoryEnderChest enderChest = player.getEnderChest();
             enderChest.a((TileEntityEnderChest) tile);
             player.openContainer(new TileInventory((containerCounter, playerInventory, ignored) -> {
-                Containers<?> containers;
+                Containers<?> containers = PlayerDataManager.getContainers(enderChest.getSize());
                 int rows = enderChest.getSize() / 9;
-                switch (rows) {
-                    case 1:
-                        containers = Containers.GENERIC_9X1;
-                        break;
-                    case 2:
-                        containers = Containers.GENERIC_9X2;
-                        break;
-                    case 3:
-                    default:
-                        containers = Containers.GENERIC_9X3;
-                        break;
-                    case 4:
-                        containers = Containers.GENERIC_9X4;
-                        break;
-                    case 5:
-                        containers = Containers.GENERIC_9X5;
-                        break;
-                    case 6:
-                        containers = Containers.GENERIC_9X6;
-                        break;
-                }
                 return new ContainerChest(containers, containerCounter, playerInventory, enderChest, rows);
             }, new ChatMessage("container.enderchest")));
             bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
@@ -262,6 +241,12 @@ public class AnySilentContainer implements IAnySilentContainer {
                                 }
 
                                 public IChatBaseComponent getScoreboardDisplayName() {
+                                    if (leftChest.hasCustomName()) {
+                                        return leftChest.getScoreboardDisplayName();
+                                    }
+                                    if (rightChest.hasCustomName()) {
+                                        return rightChest.getScoreboardDisplayName();
+                                    }
                                     return new ChatMessage("container.chestDouble");
                                 }
                             };
@@ -323,9 +308,9 @@ public class AnySilentContainer implements IAnySilentContainer {
             case ENDER_CHEST:
             case SHULKER_BOX:
             case BARREL:
-            break;
-        default:
-            return;
+                break;
+            default:
+                return;
         }
 
         EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);

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

@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_16_R3;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import net.minecraft.server.v1_16_R3.EntityPlayer;
+import net.minecraft.server.v1_16_R3.NBTCompressedStreamTools;
+import net.minecraft.server.v1_16_R3.NBTTagCompound;
+import net.minecraft.server.v1_16_R3.WorldNBTStorage;
+import org.apache.logging.log4j.LogManager;
+import org.bukkit.craftbukkit.v1_16_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_16_R3.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().playerFileData.load(this.getHandle());
+        if (loaded != null) {
+            readExtraData(loaded);
+        }
+    }
+
+    @Override
+    public void 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
+                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());
+        }
+    }
+
+}

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

@@ -0,0 +1,235 @@
+/*
+ * 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_16_R3;
+
+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 net.minecraft.server.v1_16_R3.ChatComponentText;
+import net.minecraft.server.v1_16_R3.Container;
+import net.minecraft.server.v1_16_R3.Containers;
+import net.minecraft.server.v1_16_R3.Entity;
+import net.minecraft.server.v1_16_R3.EntityPlayer;
+import net.minecraft.server.v1_16_R3.MinecraftServer;
+import net.minecraft.server.v1_16_R3.PacketPlayOutOpenWindow;
+import net.minecraft.server.v1_16_R3.PlayerInteractManager;
+import net.minecraft.server.v1_16_R3.World;
+import net.minecraft.server.v1_16_R3.WorldServer;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
+import org.bukkit.craftbukkit.v1_16_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_16_R3.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v1_16_R3.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) {
+            System.out.println("Unable to obtain field to inject custom save process - players' mounts may be deleted when loaded.");
+            e.printStackTrace();
+            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.OVERWORLD);
+
+        if (worldServer == null) {
+            return null;
+        }
+
+        EntityPlayer entity = new EntityPlayer(server, worldServer, profile, new PlayerInteractManager(worldServer));
+
+        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.server.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.playerConnection == 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.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, container.getType(),
+                new ChatComponentText(container.getBukkitView().getTitle())));
+        nmsPlayer.activeContainer = container;
+        container.addSlotListener(nmsPlayer);
+
+        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) {
+        switch (inventorySize) {
+            case 9:
+                return Containers.GENERIC_9X1;
+            case 18:
+                return Containers.GENERIC_9X2;
+            case 36:
+                return Containers.GENERIC_9X4;
+            case 41: // PLAYER
+            case 45:
+                return Containers.GENERIC_9X5;
+            case 54:
+                return Containers.GENERIC_9X6;
+            case 27:
+            default:
+                return Containers.GENERIC_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;
+    }
+
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,21 +14,21 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_16_R2;
+package com.lishid.openinv.internal.v1_16_R3;
 
 import com.lishid.openinv.internal.ISpecialEnderChest;
 import java.util.List;
-import net.minecraft.server.v1_16_R2.AutoRecipeStackManager;
-import net.minecraft.server.v1_16_R2.ContainerUtil;
-import net.minecraft.server.v1_16_R2.EntityHuman;
-import net.minecraft.server.v1_16_R2.EntityPlayer;
-import net.minecraft.server.v1_16_R2.IInventoryListener;
-import net.minecraft.server.v1_16_R2.InventoryEnderChest;
-import net.minecraft.server.v1_16_R2.ItemStack;
-import net.minecraft.server.v1_16_R2.NonNullList;
+import net.minecraft.server.v1_16_R3.AutoRecipeStackManager;
+import net.minecraft.server.v1_16_R3.ContainerUtil;
+import net.minecraft.server.v1_16_R3.EntityHuman;
+import net.minecraft.server.v1_16_R3.EntityPlayer;
+import net.minecraft.server.v1_16_R3.IInventoryListener;
+import net.minecraft.server.v1_16_R3.InventoryEnderChest;
+import net.minecraft.server.v1_16_R3.ItemStack;
+import net.minecraft.server.v1_16_R3.NonNullList;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_16_R2.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_16_R3.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftInventory;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryHolder;
@@ -80,6 +80,11 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
         }
     }
 
+    @Override
+    public @NotNull Player getPlayer() {
+        return owner.getBukkitEntity();
+    }
+
     @Override
     public void update() {
         this.owner.getEnderChest().update();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_16_R2;
+package com.lishid.openinv.internal.v1_16_R3;
 
 import com.google.common.collect.ImmutableList;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
@@ -22,31 +22,31 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import net.minecraft.server.v1_16_R2.AutoRecipeStackManager;
-import net.minecraft.server.v1_16_R2.ChatMessage;
-import net.minecraft.server.v1_16_R2.ContainerUtil;
-import net.minecraft.server.v1_16_R2.CrashReport;
-import net.minecraft.server.v1_16_R2.CrashReportSystemDetails;
-import net.minecraft.server.v1_16_R2.DamageSource;
-import net.minecraft.server.v1_16_R2.EntityHuman;
-import net.minecraft.server.v1_16_R2.EntityPlayer;
-import net.minecraft.server.v1_16_R2.EnumItemSlot;
-import net.minecraft.server.v1_16_R2.IBlockData;
-import net.minecraft.server.v1_16_R2.IChatBaseComponent;
-import net.minecraft.server.v1_16_R2.IInventory;
-import net.minecraft.server.v1_16_R2.Item;
-import net.minecraft.server.v1_16_R2.ItemArmor;
-import net.minecraft.server.v1_16_R2.ItemStack;
-import net.minecraft.server.v1_16_R2.NBTTagCompound;
-import net.minecraft.server.v1_16_R2.NBTTagList;
-import net.minecraft.server.v1_16_R2.NonNullList;
-import net.minecraft.server.v1_16_R2.PacketPlayOutSetSlot;
-import net.minecraft.server.v1_16_R2.PlayerInventory;
-import net.minecraft.server.v1_16_R2.ReportedException;
-import net.minecraft.server.v1_16_R2.World;
+import net.minecraft.server.v1_16_R3.AutoRecipeStackManager;
+import net.minecraft.server.v1_16_R3.ChatMessage;
+import net.minecraft.server.v1_16_R3.ContainerUtil;
+import net.minecraft.server.v1_16_R3.CrashReport;
+import net.minecraft.server.v1_16_R3.CrashReportSystemDetails;
+import net.minecraft.server.v1_16_R3.DamageSource;
+import net.minecraft.server.v1_16_R3.EntityHuman;
+import net.minecraft.server.v1_16_R3.EntityPlayer;
+import net.minecraft.server.v1_16_R3.EnumItemSlot;
+import net.minecraft.server.v1_16_R3.IBlockData;
+import net.minecraft.server.v1_16_R3.IChatBaseComponent;
+import net.minecraft.server.v1_16_R3.IInventory;
+import net.minecraft.server.v1_16_R3.Item;
+import net.minecraft.server.v1_16_R3.ItemArmor;
+import net.minecraft.server.v1_16_R3.ItemStack;
+import net.minecraft.server.v1_16_R3.NBTTagCompound;
+import net.minecraft.server.v1_16_R3.NBTTagList;
+import net.minecraft.server.v1_16_R3.NonNullList;
+import net.minecraft.server.v1_16_R3.PacketPlayOutSetSlot;
+import net.minecraft.server.v1_16_R3.PlayerInventory;
+import net.minecraft.server.v1_16_R3.ReportedException;
+import net.minecraft.server.v1_16_R3.World;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_16_R2.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_16_R3.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftInventory;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryHolder;
@@ -212,6 +212,11 @@ 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;

internal/v1_17_R1/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2021 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -20,56 +20,54 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
+    <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
-    <version>4.1.4</version>
+    <relativePath>../../pom.xml</relativePath>
+    <version>4.1.8</version>
   </parent>
 
-  <artifactId>openinvadapter1_15_R1</artifactId>
-  <name>OpenInvAdapter1_15_R1</name>
+  <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>
-      <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
-      <version>1.15.1-R0.1-SNAPSHOT</version>
+      <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>
-      <version>4.1.4</version>
+      <groupId>com.lishid</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>annotations</artifactId>
+      <groupId>org.jetbrains</groupId>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.2</version>
+        <!-- Cannot use minimizeJar until maven-shade-plugin 3.3.0 releases; ASM used does not support Java 16. -->
         <configuration>
-          <minimizeJar>true</minimizeJar>
+          <minimizeJar>false</minimizeJar>
         </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
-
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
       </plugin>
     </plugins>
   </build>
 
-</project>
+</project>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,39 +14,40 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_16_R1;
+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 net.minecraft.server.v1_16_R1.Block;
-import net.minecraft.server.v1_16_R1.BlockBarrel;
-import net.minecraft.server.v1_16_R1.BlockChest;
-import net.minecraft.server.v1_16_R1.BlockChestTrapped;
-import net.minecraft.server.v1_16_R1.BlockEnderChest;
-import net.minecraft.server.v1_16_R1.BlockPosition;
-import net.minecraft.server.v1_16_R1.BlockPropertyChestType;
-import net.minecraft.server.v1_16_R1.BlockShulkerBox;
-import net.minecraft.server.v1_16_R1.ChatMessage;
-import net.minecraft.server.v1_16_R1.Container;
-import net.minecraft.server.v1_16_R1.ContainerChest;
-import net.minecraft.server.v1_16_R1.Containers;
-import net.minecraft.server.v1_16_R1.EntityHuman;
-import net.minecraft.server.v1_16_R1.EntityPlayer;
-import net.minecraft.server.v1_16_R1.EnumGamemode;
-import net.minecraft.server.v1_16_R1.IBlockData;
-import net.minecraft.server.v1_16_R1.IChatBaseComponent;
-import net.minecraft.server.v1_16_R1.ITileInventory;
-import net.minecraft.server.v1_16_R1.InventoryEnderChest;
-import net.minecraft.server.v1_16_R1.InventoryLargeChest;
-import net.minecraft.server.v1_16_R1.PlayerInteractManager;
-import net.minecraft.server.v1_16_R1.PlayerInventory;
-import net.minecraft.server.v1_16_R1.TileEntity;
-import net.minecraft.server.v1_16_R1.TileEntityChest;
-import net.minecraft.server.v1_16_R1.TileEntityEnderChest;
-import net.minecraft.server.v1_16_R1.TileEntityLootable;
-import net.minecraft.server.v1_16_R1.TileInventory;
-import net.minecraft.server.v1_16_R1.World;
+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;
@@ -69,11 +70,12 @@ public class AnySilentContainer implements IAnySilentContainer {
 
     public AnySilentContainer() {
         try {
-            this.playerInteractManagerGamemode = PlayerInteractManager.class.getDeclaredField("gamemode");
+            this.playerInteractManagerGamemode = PlayerInteractManager.class.getDeclaredField("b");
             this.playerInteractManagerGamemode.setAccessible(true);
         } catch (NoSuchFieldException | SecurityException e) {
-            System.err.println("[OpenInv] Unable to directly write player gamemode! SilentChest will fail.");
-            e.printStackTrace();
+            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);
         }
     }
 
@@ -111,12 +113,11 @@ public class AnySilentContainer implements IAnySilentContainer {
             }
 
             BlockData blockData = block.getBlockData();
-            if (!(blockData instanceof Directional)) {
+            if (!(blockData instanceof Directional directional)) {
                 // Shouldn't be possible. Just in case, demand AnyChest.
                 return true;
             }
 
-            Directional directional = (Directional) blockData;
             BlockFace face = directional.getFacing();
             boundingBox.shift(face.getDirection());
             // Return whether or not bounding boxes overlap.
@@ -132,11 +133,10 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         BlockData blockData = block.getBlockData();
-        if (!(blockData instanceof Chest) || ((Chest) blockData).getType() == Chest.Type.SINGLE) {
+        if (!(blockData instanceof Chest chest) || ((Chest) blockData).getType() == Chest.Type.SINGLE) {
             return false;
         }
 
-        Chest chest = (Chest) blockData;
         int ordinal = (chest.getFacing().ordinal() + 4 + (chest.getType() == Chest.Type.RIGHT ? -1 : 1)) % 4;
         BlockFace relativeFace = BlockFace.values()[ordinal];
         org.bukkit.block.Block relative = block.getRelative(relativeFace);
@@ -146,11 +146,10 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         BlockData relativeData = relative.getBlockData();
-        if (!(relativeData instanceof Chest)) {
+        if (!(relativeData instanceof Chest relativeChest)) {
             return false;
         }
-        
-        Chest relativeChest = (Chest) relativeData;
+
         if (relativeChest.getFacing() != chest.getFacing()
                 || relativeChest.getType() != (chest.getType() == Chest.Type.RIGHT ? Chest.Type.LEFT : Chest.Type.RIGHT)) {
             return false;
@@ -166,8 +165,10 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(@NotNull final Player bukkitPlayer, final boolean silentchest,
-                                     @NotNull final org.bukkit.block.Block bukkitBlock) {
+    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) {
@@ -178,7 +179,7 @@ public class AnySilentContainer implements IAnySilentContainer {
 
         EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
-        final World world = player.world;
+        final World world = player.getWorld();
         final BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
         final TileEntity tile = world.getTileEntity(blockPosition);
 
@@ -187,44 +188,22 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         if (tile instanceof TileEntityEnderChest) {
-            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            // 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;
+                Containers<?> containers = PlayerDataManager.getContainers(enderChest.getSize());
                 int rows = enderChest.getSize() / 9;
-                switch (rows) {
-                    case 1:
-                        containers = Containers.GENERIC_9X1;
-                        break;
-                    case 2:
-                        containers = Containers.GENERIC_9X2;
-                        break;
-                    case 3:
-                    default:
-                        containers = Containers.GENERIC_9X3;
-                        break;
-                    case 4:
-                        containers = Containers.GENERIC_9X4;
-                        break;
-                    case 5:
-                        containers = Containers.GENERIC_9X5;
-                        break;
-                    case 6:
-                        containers = Containers.GENERIC_9X6;
-                        break;
-                }
                 return new ContainerChest(containers, containerCounter, playerInventory, enderChest, rows);
-            }, BlockEnderChest.e));
+            }, new ChatMessage("container.enderchest")));
             bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
             return true;
         }
 
-        if (!(tile instanceof ITileInventory)) {
+        if (!(tile instanceof ITileInventory tileInventory)) {
             return false;
         }
 
-        ITileInventory tileInventory = (ITileInventory) tile;
         IBlockData blockData = world.getType(blockPosition);
         Block block = blockData.getBlock();
 
@@ -232,7 +211,7 @@ public class AnySilentContainer implements IAnySilentContainer {
 
             BlockPropertyChestType chestType = blockData.get(BlockChest.c);
 
-            if (chestType != BlockPropertyChestType.SINGLE) {
+            if (chestType != BlockPropertyChestType.a) {
 
                 BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.h(blockData));
                 IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
@@ -241,28 +220,34 @@ public class AnySilentContainer implements IAnySilentContainer {
 
                     BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.c);
 
-                    if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
-                            && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
+                    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.RIGHT ? ((TileEntityChest) tileInventory) : (TileEntityChest) adjacentTile;
-                            TileEntityChest leftChest = chestType == BlockPropertyChestType.RIGHT ? (TileEntityChest) adjacentTile : ((TileEntityChest) tileInventory);
+                            TileEntityChest rightChest = chestType == BlockPropertyChestType.c ? ((TileEntityChest) tileInventory) : (TileEntityChest) adjacentTile;
+                            TileEntityChest leftChest = chestType == BlockPropertyChestType.c ? (TileEntityChest) adjacentTile : ((TileEntityChest) tileInventory);
 
-                            if (silentchest && (rightChest.lootTable != null || leftChest.lootTable != null)) {
+                            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.player);
-                                    rightChest.d(playerInventory.player);
+                                    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");
                                 }
                             };
@@ -287,7 +272,7 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
-        if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
+        if (!silentchest || player.d.getGameMode() == EnumGamemode.d) {
             player.openContainer(tileInventory);
             return true;
         }
@@ -297,16 +282,15 @@ public class AnySilentContainer implements IAnySilentContainer {
             return false;
         }
 
-        if (tile instanceof TileEntityLootable) {
-            TileEntityLootable lootable = (TileEntityLootable) tile;
-            if (lootable.lootTable != null) {
+        if (tile instanceof TileEntityLootable lootable) {
+            if (lootable.g != null) {
                 OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
                 return false;
             }
         }
 
-        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
-        this.forceGameMode(player, EnumGamemode.SPECTATOR);
+        EnumGamemode gamemode = player.d.getGameMode();
+        this.forceGameMode(player, EnumGamemode.d);
         player.openContainer(tileInventory);
         this.forceGameMode(player, gamemode);
         return true;
@@ -324,19 +308,23 @@ public class AnySilentContainer implements IAnySilentContainer {
             case ENDER_CHEST:
             case SHULKER_BOX:
             case BARREL:
-            break;
-        default:
-            return;
+                break;
+            default:
+                return;
         }
 
         EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
-        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
-        this.forceGameMode(player, EnumGamemode.SPECTATOR);
-        player.activeContainer.b(player);
-        player.activeContainer.a(player, false);
-        player.activeContainer.transferTo(player.defaultContainer, player.getBukkitEntity());
-        player.activeContainer = player.defaultContainer;
+        // 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);
     }
 
@@ -346,11 +334,12 @@ public class AnySilentContainer implements IAnySilentContainer {
             return;
         }
         try {
-            if (!this.playerInteractManagerGamemode.isAccessible()) {
-                // Just in case, ensure accessible.
-                this.playerInteractManagerGamemode.setAccessible(true);
-            }
-            this.playerInteractManagerGamemode.set(player.playerInteractManager, gameMode);
+            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();
         }

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

@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.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());
+        }
+    }
+
+}

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

@@ -0,0 +1,231 @@
+/*
+ * 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;
+    }
+
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,21 +14,26 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_16_R1;
+package com.lishid.openinv.internal.v1_17_R1;
 
 import com.lishid.openinv.internal.ISpecialEnderChest;
 import java.util.List;
-import net.minecraft.server.v1_16_R1.AutoRecipeStackManager;
-import net.minecraft.server.v1_16_R1.ContainerUtil;
-import net.minecraft.server.v1_16_R1.EntityHuman;
-import net.minecraft.server.v1_16_R1.EntityPlayer;
-import net.minecraft.server.v1_16_R1.IInventoryListener;
-import net.minecraft.server.v1_16_R1.InventoryEnderChest;
-import net.minecraft.server.v1_16_R1.ItemStack;
-import net.minecraft.server.v1_16_R1.NonNullList;
+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_16_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftInventory;
+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;
@@ -39,7 +44,7 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
 
     private final CraftInventory inventory;
     private EntityPlayer owner;
-    private NonNullList<ItemStack> items;
+    private NonNullList<ItemStack> c;
     private boolean playerOnline;
 
     public SpecialEnderChest(final Player player, final Boolean online) {
@@ -47,7 +52,7 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
         this.inventory = new CraftInventory(this);
         this.owner = PlayerDataManager.getHandle(player);
         this.playerOnline = online;
-        this.items = this.owner.getEnderChest().items;
+        this.c = this.owner.getEnderChest().c;
     }
 
     @Override
@@ -72,14 +77,20 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
                 this.owner = PlayerDataManager.getHandle(player);
                 InventoryEnderChest enderChest = owner.getEnderChest();
                 for (int i = 0; i < enderChest.getSize(); ++i) {
-                    enderChest.setItem(i, this.items.get(i));
+                    enderChest.setItem(i, this.c.get(i));
                 }
-                this.items = enderChest.items;
+                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();
@@ -87,16 +98,18 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
 
     @Override
     public List<ItemStack> getContents() {
-        return this.items;
+        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);
     }
 
@@ -105,6 +118,26 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
         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);
@@ -132,12 +165,12 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
 
     @Override
     public ItemStack getItem(int i) {
-        return i >= 0 && i < this.items.size() ? this.items.get(i) : ItemStack.b;
+        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.items, i, j);
+        ItemStack itemstack = ContainerUtil.a(this.c, i, j);
         if (!itemstack.isEmpty()) {
             this.update();
         }
@@ -148,50 +181,62 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
     @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;
+        }
+    }
 
-        for (int i = 0; i < this.getSize(); ++i) {
-            ItemStack itemstack2 = this.getItem(i);
-            if (itemstack2.isEmpty()) {
-                this.setItem(i, itemstack1);
-                this.update();
-                return ItemStack.b;
+    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;
             }
+        }
+    }
 
-            if (ItemStack.c(itemstack2, itemstack1)) {
-                int j = Math.min(this.getMaxStackSize(), itemstack2.getMaxStackSize());
-                int k = Math.min(itemstack1.getCount(), j - itemstack2.getCount());
-                if (k > 0) {
-                    itemstack2.add(k);
-                    itemstack1.subtract(k);
-                    if (itemstack1.isEmpty()) {
-                        this.update();
-                        return ItemStack.b;
-                    }
+    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;
                 }
             }
         }
+    }
 
-        if (itemstack1.getCount() != itemstack.getCount()) {
+    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();
         }
-
-        return itemstack1;
     }
 
     @Override
     public ItemStack splitWithoutUpdate(int i) {
-        ItemStack itemstack = this.items.get(i);
+        ItemStack itemstack = this.c.get(i);
         if (itemstack.isEmpty()) {
             return ItemStack.b;
         } else {
-            this.items.set(i, ItemStack.b);
+            this.c.set(i, ItemStack.b);
             return itemstack;
         }
     }
 
     @Override
     public void setItem(int i, ItemStack itemstack) {
-        this.items.set(i, itemstack);
+        this.c.set(i, itemstack);
         if (!itemstack.isEmpty() && itemstack.getCount() > this.getMaxStackSize()) {
             itemstack.setCount(this.getMaxStackSize());
         }
@@ -206,24 +251,7 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
 
     @Override
     public boolean isEmpty() {
-
-        for (ItemStack itemstack : this.items) {
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return 64;
-    }
-
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
+        return this.c.stream().allMatch(ItemStack::isEmpty);
     }
 
     @Override
@@ -241,16 +269,73 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
 
     @Override
     public void clear() {
-        this.items.clear();
+        this.c.clear();
+        this.update();
     }
 
     @Override
     public void a(AutoRecipeStackManager autorecipestackmanager) {
-
-        for (ItemStack itemstack : this.items) {
+        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);
+            }
+        }
+
+    }
+
 }

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

@@ -0,0 +1,777 @@
+/*
+ * 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);
+        }
+    }
+
+}

internal/v1_8_R3/pom.xml

@@ -1,74 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, version 3.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
-    <version>4.1.4</version>
-  </parent>
-
-  <artifactId>openinvadapter1_8_R3</artifactId>
-  <name>OpenInvAdapter1_8_R3</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
-      <version>1.8.8-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugincore</artifactId>
-      <version>4.1.4</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.2</version>
-        <configuration>
-          <minimizeJar>true</minimizeJar>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

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

@@ -1,250 +0,0 @@
-/*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_8_R3;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import java.lang.reflect.Field;
-import net.minecraft.server.v1_8_R3.AxisAlignedBB;
-import net.minecraft.server.v1_8_R3.Block;
-import net.minecraft.server.v1_8_R3.BlockChest;
-import net.minecraft.server.v1_8_R3.BlockEnderChest;
-import net.minecraft.server.v1_8_R3.BlockPosition;
-import net.minecraft.server.v1_8_R3.Entity;
-import net.minecraft.server.v1_8_R3.EntityOcelot;
-import net.minecraft.server.v1_8_R3.EntityPlayer;
-import net.minecraft.server.v1_8_R3.EnumDirection;
-import net.minecraft.server.v1_8_R3.ITileInventory;
-import net.minecraft.server.v1_8_R3.InventoryEnderChest;
-import net.minecraft.server.v1_8_R3.InventoryLargeChest;
-import net.minecraft.server.v1_8_R3.PlayerInteractManager;
-import net.minecraft.server.v1_8_R3.StatisticList;
-import net.minecraft.server.v1_8_R3.TileEntity;
-import net.minecraft.server.v1_8_R3.TileEntityChest;
-import net.minecraft.server.v1_8_R3.TileEntityEnderChest;
-import net.minecraft.server.v1_8_R3.World;
-import net.minecraft.server.v1_8_R3.WorldSettings.EnumGamemode;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-public class AnySilentContainer implements IAnySilentContainer {
-
-    private Field playerInteractManagerGamemode;
-
-    public AnySilentContainer() {
-        try {
-            this.playerInteractManagerGamemode = PlayerInteractManager.class.getDeclaredField("gamemode");
-            this.playerInteractManagerGamemode.setAccessible(true);
-        } catch (Exception e) {
-            System.err.println("[OpenInv] Unable to directly write player gamemode! SilentChest will fail.");
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public boolean isAnySilentContainer(@NotNull org.bukkit.block.Block bukkitBlock) {
-        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull org.bukkit.block.Block bukkitBlock) {
-
-        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
-        BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        Block block = world.getType(blockPosition).getBlock();
-
-        if (block instanceof BlockEnderChest) {
-            // Ender chests are not blocked by ocelots.
-            return world.getType(blockPosition.up()).getBlock().c();
-        }
-
-        // Check if chest is blocked or has an ocelot on top
-        if (isBlockedChest(world, blockPosition)) {
-            return true;
-        }
-
-        // Check for matching adjacent chests that are blocked or have an ocelot on top
-        for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
-            BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
-            Block localBlock = world.getType(localBlockPosition).getBlock();
-
-            if (localBlock != block) {
-                continue;
-            }
-
-            TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
-            if (!(localTileEntity instanceof TileEntityChest)) {
-                continue;
-            }
-
-            if (isBlockedChest(world, localBlockPosition)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedChest(World world, BlockPosition blockPosition) {
-        // For reference, loot at net.minecraft.server.BlockChest
-        return world.getType(blockPosition.up()).getBlock().c() || hasOcelotOnTop(world, blockPosition);
-    }
-
-    private boolean hasOcelotOnTop(World world, BlockPosition blockPosition) {
-        for (Entity localEntity : world.a(EntityOcelot.class,
-                new AxisAlignedBB(blockPosition.getX(), blockPosition.getY() + 1,
-                        blockPosition.getZ(), blockPosition.getX() + 1, blockPosition.getY() + 2,
-                        blockPosition.getZ() + 1))) {
-            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
-            if (localEntityOcelot.isSitting()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull org.bukkit.block.Block bukkitBlock) {
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        // Silent ender chest is pretty much API-only
-        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            player.b(StatisticList.V);
-            return true;
-        }
-
-        World world = player.world;
-        BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        Object tile = world.getTileEntity(blockPosition);
-
-        if (tile == null) {
-            return false;
-        }
-
-        if (tile instanceof TileEntityEnderChest) {
-            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
-            InventoryEnderChest enderChest = player.getEnderChest();
-            enderChest.a((TileEntityEnderChest) tile);
-            player.openContainer(enderChest);
-            player.b(StatisticList.V);
-            return true;
-        }
-
-        if (!(tile instanceof ITileInventory)) {
-            return false;
-        }
-
-        ITileInventory tileInventory = (ITileInventory) tile;
-        Block block = world.getType(blockPosition).getBlock();
-
-        if (block instanceof BlockChest) {
-            for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
-                BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
-                Block localBlock = world.getType(localBlockPosition).getBlock();
-
-                if (localBlock != block) {
-                    continue;
-                }
-
-                TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
-                if (!(localTileEntity instanceof TileEntityChest)) {
-                    continue;
-                }
-
-                if ((localEnumDirection == EnumDirection.WEST) || (localEnumDirection == EnumDirection.NORTH)) {
-                    tileInventory = new InventoryLargeChest("container.chestDouble",
-                            (TileEntityChest) localTileEntity, tileInventory);
-                } else {
-                    tileInventory = new InventoryLargeChest("container.chestDouble",
-                            tileInventory, (TileEntityChest) localTileEntity);
-                }
-                break;
-            }
-
-            BlockChest blockChest = (BlockChest) block;
-            if (blockChest.b == 0) {
-                player.b(StatisticList.aa);
-            } else if (blockChest.b == 1) {
-                player.b(StatisticList.U);
-            }
-        }
-
-        // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
-        if (!silent || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
-            player.openContainer(tileInventory);
-            return true;
-        }
-
-        // SilentChest requires access to setting players' gamemode directly.
-        if (this.playerInteractManagerGamemode == null) {
-            return false;
-        }
-
-        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
-        this.forceGameMode(player, EnumGamemode.SPECTATOR);
-        player.openContainer(tileInventory);
-        this.forceGameMode(player, gamemode);
-        return true;
-    }
-
-    @Override
-    public void deactivateContainer(@NotNull final Player bukkitPlayer) {
-        if (this.playerInteractManagerGamemode == null) {
-            return;
-        }
-
-        InventoryView view = bukkitPlayer.getOpenInventory();
-        switch (view.getType()) {
-            case CHEST:
-            case ENDER_CHEST:
-                break;
-            default:
-                return;
-        }
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
-        this.forceGameMode(player, EnumGamemode.SPECTATOR);
-        player.activeContainer.b(player);
-        player.activeContainer.a(player, false);
-        player.activeContainer.transferTo(player.defaultContainer, player.getBukkitEntity());
-        player.activeContainer = player.defaultContainer;
-        this.forceGameMode(player, gamemode);
-    }
-
-    private void forceGameMode(final EntityPlayer player, final EnumGamemode gameMode) {
-        if (this.playerInteractManagerGamemode == null) {
-            // No need to warn repeatedly, error on startup and lack of function should be enough.
-            return;
-        }
-        try {
-            if (!this.playerInteractManagerGamemode.isAccessible()) {
-                // Just in case, ensure accessible.
-                this.playerInteractManagerGamemode.setAccessible(true);
-            }
-            this.playerInteractManagerGamemode.set(player.playerInteractManager, gameMode);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-}

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

@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_8_R3;
-
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.mojang.authlib.GameProfile;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.lang.reflect.Field;
-import net.minecraft.server.v1_8_R3.ChatComponentText;
-import net.minecraft.server.v1_8_R3.Entity;
-import net.minecraft.server.v1_8_R3.EntityPlayer;
-import net.minecraft.server.v1_8_R3.MinecraftServer;
-import net.minecraft.server.v1_8_R3.NBTCompressedStreamTools;
-import net.minecraft.server.v1_8_R3.NBTTagCompound;
-import net.minecraft.server.v1_8_R3.PacketPlayOutChat;
-import net.minecraft.server.v1_8_R3.PlayerInteractManager;
-import net.minecraft.server.v1_8_R3.WorldNBTStorage;
-import org.apache.logging.log4j.LogManager;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    private Field bukkitEntity;
-
-    public PlayerDataManager() {
-        try {
-            bukkitEntity = Entity.class.getDeclaredField("bukkitEntity");
-        } catch (NoSuchFieldException e) {
-            System.out.println("Unable to obtain field to inject custom save process - players' mounts may be deleted when loaded.");
-            e.printStackTrace();
-            bukkitEntity = null;
-        }
-    }
-
-    @NotNull
-    public static EntityPlayer getHandle(Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
-    @Nullable
-    @Override
-    public Player loadPlayer(@NotNull OfflinePlayer offline) {
-        // Ensure the player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        // Create a profile and entity to load the player data
-        GameProfile profile = new GameProfile(offline.getUniqueId(),
-                offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
-                new PlayerInteractManager(server.getWorldServer(0)));
-
-        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 CraftPlayer(player.server.server, player) {
-            @Override
-            public void saveData() {
-                super.saveData();
-                // See net.minecraft.server.WorldNBTStorage#save(EntityHuman)
-                try {
-                    WorldNBTStorage worldNBTStorage = (WorldNBTStorage) player.server.getPlayerList().playerFileData;
-
-                    NBTTagCompound playerData = new NBTTagCompound();
-                    player.e(playerData);
-
-                    if (!isOnline()) {
-                        // Special case: save old vehicle data
-                        NBTTagCompound oldData = worldNBTStorage.load(player);
-
-                        if (oldData != null && oldData.hasKeyOfType("Riding", 10)) {
-                            // See net.minecraft.server.PlayerList#a(NetworkManager, EntityPlayer) and net.minecraft.server.EntityPlayer#b(NBTTagCompound)
-                            playerData.set("Riding", oldData.getCompound("Riding"));
-                        }
-                    }
-
-                    File file = new File(worldNBTStorage.getPlayerDir(), player.getUniqueID().toString() + ".dat.tmp");
-                    File file1 = new File(worldNBTStorage.getPlayerDir(), player.getUniqueID().toString() + ".dat");
-
-                    NBTCompressedStreamTools.a(playerData, new FileOutputStream(file));
-
-                    if (file1.exists()) {
-                        file1.delete();
-                    }
-
-                    file.renameTo(file1);
-                } catch (Exception e) {
-                    LogManager.getLogger().warn("Failed to save player data for {}", player.getName());
-                }
-            }
-        });
-    }
-
-    @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) {
-        return player.openInventory(inventory.getBukkitInventory());
-    }
-
-    @Override
-    public void sendSystemMessage(@NotNull Player player, @NotNull String message) {
-        int newline = message.indexOf('\n');
-        if (newline != -1) {
-            // No newlines in action bar chat.
-            message = message.substring(0, newline);
-        }
-
-        if (message.isEmpty()) {
-            return;
-        }
-
-        EntityPlayer nmsPlayer = getHandle(player);
-
-        // For action bar chat, color codes are still supported but JSON text color is not allowed. Do not convert text.
-        if (nmsPlayer.playerConnection != null) {
-            nmsPlayer.playerConnection.sendPacket(new PacketPlayOutChat(new ChatComponentText(message), (byte) 2));
-        }
-    }
-
-    @NotNull
-    @Override
-    public String getLocale(Player player) {
-        return getHandle(player).locale;
-    }
-
-}

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

@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_8_R3;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.lang.reflect.Field;
-import net.minecraft.server.v1_8_R3.EntityPlayer;
-import net.minecraft.server.v1_8_R3.IInventory;
-import net.minecraft.server.v1_8_R3.InventoryEnderChest;
-import net.minecraft.server.v1_8_R3.InventorySubcontainer;
-import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftInventory;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
-
-    private final InventoryEnderChest enderChest;
-    private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline;
-
-    public SpecialEnderChest(Player player, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
-                PlayerDataManager.getHandle(player).getEnderChest().hasCustomName(),
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
-        this.playerOnline = online;
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.bukkitOwner = nmsPlayer.getBukkitEntity();
-        this.items = enderChest.getContents();
-    }
-
-    @Override
-    public @NotNull Inventory getBukkitInventory() {
-        return inventory;
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull Player player) {
-        if (!playerOnline) {
-            try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
-                this.bukkitOwner = nmsPlayer.getBukkitEntity();
-                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
-                Field field = playerEnderChest.getClass().getField("items");
-                field.setAccessible(true);
-                field.set(playerEnderChest, this.items);
-            } catch (Exception ignored) {}
-            playerOnline = true;
-        }
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        playerOnline = false;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
-    @Override
-    public void update() {
-        super.update();
-        enderChest.update();
-    }
-
-}

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

@@ -1,230 +0,0 @@
-/*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_8_R3;
-
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import net.minecraft.server.v1_8_R3.ItemStack;
-import net.minecraft.server.v1_8_R3.PlayerInventory;
-import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftInventory;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-
-    private final ItemStack[] extra = new ItemStack[5];
-    private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline;
-
-    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
-        this.playerOnline = online;
-        this.items = player.inventory.items;
-        this.armor = player.inventory.armor;
-    }
-
-    @Override
-    public @NotNull Inventory getBukkitInventory() {
-        return inventory;
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull Player player) {
-        if (!playerOnline) {
-            this.player = PlayerDataManager.getHandle(player);
-            this.player.inventory.items = this.items;
-            this.player.inventory.armor = this.armor;
-            playerOnline = true;
-        }
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        playerOnline = false;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
-    @Override
-    public ItemStack[] getContents() {
-        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return contents;
-    }
-
-    @Override
-    public int getSize() {
-        return super.getSize() + 5;
-    }
-
-    @Override
-    public ItemStack getItem(int i) {
-        ItemStack[] is = this.items;
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.armor;
-        } else {
-            i = getReversedItemSlotNum(i);
-        }
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.extra;
-        } else if (is == this.armor) {
-            i = getReversedArmorSlotNum(i);
-        }
-
-        return is[i];
-    }
-
-    @Override
-    public ItemStack splitStack(int i, int j) {
-        ItemStack[] is = this.items;
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.armor;
-        } else {
-            i = getReversedItemSlotNum(i);
-        }
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.extra;
-        } else if (is == this.armor) {
-            i = getReversedArmorSlotNum(i);
-        }
-
-        if (is[i] != null) {
-            ItemStack itemstack;
-
-            if (is[i].count <= j) {
-                itemstack = is[i];
-                is[i] = null;
-                return itemstack;
-            } else {
-                itemstack = is[i].cloneAndSubtract(j);
-                if (is[i].count == 0) {
-                    is[i] = null;
-                }
-
-                return itemstack;
-            }
-        }
-
-        return null;
-    }
-
-    @Override
-    public ItemStack splitWithoutUpdate(int i) {
-        ItemStack[] is = this.items;
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.armor;
-        } else {
-            i = getReversedItemSlotNum(i);
-        }
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.extra;
-        } else if (is == this.armor) {
-            i = getReversedArmorSlotNum(i);
-        }
-
-        if (is[i] != null) {
-            ItemStack itemstack = is[i];
-
-            is[i] = null;
-            return itemstack;
-        }
-
-        return null;
-    }
-
-    @Override
-    public void setItem(int i, ItemStack itemstack) {
-        ItemStack[] is = this.items;
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.armor;
-        } else {
-            i = getReversedItemSlotNum(i);
-        }
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.extra;
-        } else if (is == this.armor) {
-            i = getReversedArmorSlotNum(i);
-        }
-
-        // Effects
-        if (is == this.extra) {
-            player.drop(itemstack, true);
-            itemstack = null;
-        }
-
-        is[i] = itemstack;
-
-        player.defaultContainer.b();
-    }
-
-    private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
-            return i - 27;
-        }
-        return i + 9;
-    }
-
-    private int getReversedArmorSlotNum(int i) {
-        if (i == 0) {
-            return 3;
-        }
-        if (i == 1) {
-            return 2;
-        }
-        if (i == 2) {
-            return 1;
-        }
-        if (i == 3) {
-            return 0;
-        }
-        return i;
-    }
-
-    @Override
-    public String getName() {
-        if (player.getName().length() > 16) {
-            return player.getName().substring(0, 16);
-        }
-        return player.getName();
-    }
-
-    @Override
-    public boolean hasCustomName() {
-        return true;
-    }
-
-}

plugin/pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2021 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -19,9 +19,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>4.1.4</version>
+    <groupId>com.lishid</groupId>
+    <version>4.1.8</version>
   </parent>
 
   <artifactId>openinvplugincore</artifactId>
@@ -29,15 +29,16 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.lishid</groupId>
       <artifactId>openinvapi</artifactId>
-      <version>4.1.4</version>
+      <groupId>com.lishid</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>annotations</artifactId>
+      <groupId>org.jetbrains</groupId>
     </dependency>
     <dependency>
-      <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.15.2-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
+      <groupId>org.spigotmc</groupId>
     </dependency>
   </dependencies>
 
@@ -48,31 +49,13 @@
         <filtering>true</filtering>
       </resource>
     </resources>
+
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.2</version>
-        <configuration>
-          <minimizeJar>true</minimizeJar>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
-
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
       </plugin>
     </plugins>
   </build>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,9 +27,7 @@ import com.lishid.openinv.internal.IAnySilentContainer;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.listeners.InventoryClickListener;
-import com.lishid.openinv.listeners.InventoryCloseListener;
-import com.lishid.openinv.listeners.InventoryDragListener;
+import com.lishid.openinv.listeners.InventoryListener;
 import com.lishid.openinv.listeners.PlayerListener;
 import com.lishid.openinv.listeners.PluginListener;
 import com.lishid.openinv.util.Cache;
@@ -43,6 +41,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.function.Consumer;
+import net.md_5.bungee.api.ChatMessageType;
+import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
@@ -105,7 +106,6 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
                 if (!OpenInv.this.disableSaving() && !value.isOnline()) {
                     value.saveData();
                 }
-                return true;
             });
 
     private InternalAccessor accessor;
@@ -127,6 +127,7 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
 
         if (this.inventories.containsKey(key)) {
             Iterator<HumanEntity> iterator = this.inventories.get(key).getBukkitInventory().getViewers().iterator();
+            //noinspection WhileLoopReplaceableByForEach
             while (iterator.hasNext()) {
                 HumanEntity human = iterator.next();
                 // If player has permission or is in the same world, allow continued access
@@ -140,6 +141,7 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
 
         if (this.enderChests.containsKey(key)) {
             Iterator<HumanEntity> iterator = this.enderChests.get(key).getBukkitInventory().getViewers().iterator();
+            //noinspection WhileLoopReplaceableByForEach
             while (iterator.hasNext()) {
                 HumanEntity human = iterator.next();
                 if (Permissions.CROSSWORLD.hasPermission(human) || human.getWorld().equals(player.getWorld())) {
@@ -150,6 +152,20 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
         }
     }
 
+    /**
+     * Convert a raw slot number into a player inventory slot number.
+     *
+     * <p>Note that this method is specifically for converting an ISpecialPlayerInventory slot number into a regular
+     * player inventory slot number.
+     *
+     * @param view the open inventory view
+     * @param rawSlot the raw slot in the view
+     * @return the converted slot number
+     */
+    public int convertToPlayerSlot(InventoryView view, int rawSlot) {
+        return this.accessor.getPlayerDataManager().convertToPlayerSlot(view, rawSlot);
+    }
+
     @Override
     public boolean disableSaving() {
         return this.getConfig().getBoolean("settings.disable-saving", false);
@@ -222,22 +238,18 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
         return this.accessor != null && this.accessor.isSupported();
     }
 
-    @Nullable
     @Override
-    public Player loadPlayer(@NotNull final OfflinePlayer offline) {
+    public @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline) {
 
         String key = this.getPlayerID(offline);
         if (this.playerCache.containsKey(key)) {
             return this.playerCache.get(key);
         }
 
-        // TODO: wrap Player to ensure all methods can safely be called offline
-        Player loaded;
-
-        if (offline.isOnline()) {
-            loaded = offline.getPlayer();
-            this.playerCache.put(key, loaded);
-            return loaded;
+        Player player = offline.getPlayer();
+        if (player != null) {
+            this.playerCache.put(key, player);
+            return player;
         }
 
         if (!this.isSupportedVersion()) {
@@ -251,33 +263,18 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
         Future<Player> future = Bukkit.getScheduler().callSyncMethod(this,
                 () -> OpenInv.this.accessor.getPlayerDataManager().loadPlayer(offline));
 
-        int ticks = 0;
-        while (!future.isDone() && !future.isCancelled() && ticks < 10) {
-            ++ticks;
-            try {
-                Thread.sleep(50L);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-                return null;
-            }
-        }
-
-        if (!future.isDone() || future.isCancelled()) {
-            return null;
-        }
-
         try {
-            loaded = future.get();
+            player = future.get();
         } catch (InterruptedException | ExecutionException e) {
             e.printStackTrace();
             return null;
         }
 
-        if (loaded != null) {
-            this.playerCache.put(key, loaded);
+        if (player != null) {
+            this.playerCache.put(key, player);
         }
 
-        return loaded;
+        return player;
     }
 
     @Override
@@ -304,9 +301,21 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
     public void sendSystemMessage(@NotNull Player player, @NotNull String key) {
         String message = this.languageManager.getValue(key, getLocale(player));
 
-        if (message != null) {
-            this.accessor.getPlayerDataManager().sendSystemMessage(player, message);
+        if (message == null) {
+            return;
         }
+
+        int newline = message.indexOf('\n');
+        if (newline != -1) {
+            // No newlines in action bar chat.
+            message = message.substring(0, newline);
+        }
+
+        if (message.isEmpty()) {
+            return;
+        }
+
+        player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(message));
     }
 
     public @Nullable String getLocalizedMessage(@NotNull CommandSender sender, @NotNull String key) {
@@ -317,25 +326,14 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
         return this.languageManager.getValue(key, getLocale(sender), replacements);
     }
 
-    @Nullable
-    private String getLocale(@NotNull CommandSender sender) {
+    private @Nullable String getLocale(@NotNull CommandSender sender) {
         if (sender instanceof Player) {
-            return this.accessor.getPlayerDataManager().getLocale((Player) sender);
+            return ((Player) sender).getLocale();
         } else {
             return this.getConfig().getString("settings.locale", "en_us");
         }
     }
 
-    @Override
-    public boolean notifyAnyChest() {
-        return this.getConfig().getBoolean("notify.any-chest", true);
-    }
-
-    @Override
-    public boolean notifySilentChest() {
-        return this.getConfig().getBoolean("notify.silent-chest", true);
-    }
-
     @Override
     public void onDisable() {
 
@@ -369,44 +367,39 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
             // Register listeners
             pm.registerEvents(new PlayerListener(this), this);
             pm.registerEvents(new PluginListener(this), this);
-            pm.registerEvents(new InventoryClickListener(), this);
-            pm.registerEvents(new InventoryCloseListener(this), this);
-            // Bukkit will handle missing events for us, attempt to register InventoryDragEvent without a version check
-            pm.registerEvents(new InventoryDragListener(), this);
+            pm.registerEvents(new InventoryListener(this), this);
 
             // Register commands to their executors
-            OpenInvCommand openInv = new OpenInvCommand(this);
-            this.setCommandExecutor("openinv", openInv);
-            this.setCommandExecutor("openender", openInv);
-            this.setCommandExecutor("searchcontainer", new SearchContainerCommand(this));
-            SearchInvCommand searchInv = new SearchInvCommand(this);
-            this.setCommandExecutor("searchinv", searchInv);
-            this.setCommandExecutor("searchender", searchInv);
-            this.setCommandExecutor("searchenchant", new SearchEnchantCommand(this));
-            ContainerSettingCommand settingCommand = new ContainerSettingCommand(this);
-            this.setCommandExecutor("silentcontainer", settingCommand);
-            this.setCommandExecutor("anycontainer", settingCommand);
+            this.setCommandExecutor(new OpenInvCommand(this), "openinv", "openender");
+            this.setCommandExecutor(new SearchContainerCommand(this), "searchcontainer");
+            this.setCommandExecutor(new SearchInvCommand(this), "searchinv", "searchender");
+            this.setCommandExecutor(new SearchEnchantCommand(this), "searchenchant");
+            this.setCommandExecutor(new ContainerSettingCommand(this), "silentcontainer", "anycontainer");
 
         } else {
-            this.getLogger().info("Your version of CraftBukkit (" + this.accessor.getVersion() + ") is not supported.");
-            this.getLogger().info("If this version is a recent release, check for an update.");
-            this.getLogger().info("If this is an older version, ensure that you've downloaded the legacy support version.");
+            this.sendVersionError(this.getLogger()::warning);
         }
 
     }
 
-    private void setCommandExecutor(String commandName, CommandExecutor executor) {
-        PluginCommand command = this.getCommand(commandName);
-        if (command != null) {
-            command.setExecutor(executor);
+    private void sendVersionError(Consumer<String> messageMethod) {
+        messageMethod.accept("Your server version (" + this.accessor.getVersion() + ") is not supported.");
+        messageMethod.accept("Please obtain an appropriate version here: " + accessor.getReleasesLink());
+    }
+
+    private void setCommandExecutor(CommandExecutor executor, String... commands) {
+        for (String commandName : commands) {
+            PluginCommand command = this.getCommand(commandName);
+            if (command != null) {
+                command.setExecutor(executor);
+            }
         }
     }
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
         if (!this.accessor.isSupported()) {
-            sender.sendMessage("Your server version (" + this.accessor.getVersion() + ") is not supported.");
-            sender.sendMessage("Please check https://github.com/lishid/OpenInv/releases for an update.");
+            this.sendVersionError(sender::sendMessage);
             return true;
         }
         return false;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@ import com.lishid.openinv.util.TabCompleter;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.BiConsumer;
-import java.util.function.Function;
+import java.util.function.Predicate;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -46,7 +46,7 @@ public class ContainerSettingCommand implements TabExecutor {
 
         Player player = (Player) sender;
         boolean any = command.getName().startsWith("any");
-        Function<Player, Boolean> getSetting = any ? plugin::getPlayerAnyChestStatus : plugin::getPlayerSilentChestStatus;
+        Predicate<Player> getSetting = any ? plugin::getPlayerAnyChestStatus : plugin::getPlayerSilentChestStatus;
         BiConsumer<OfflinePlayer, Boolean> setSetting = any ? plugin::setPlayerAnyChestStatus : plugin::setPlayerSilentChestStatus;
 
         if (args.length > 0) {
@@ -62,12 +62,12 @@ public class ContainerSettingCommand implements TabExecutor {
             }
 
         } else {
-            setSetting.accept(player, !getSetting.apply(player));
+            setSetting.accept(player, !getSetting.test(player));
         }
 
-        String onOff = plugin.getLocalizedMessage(player, getSetting.apply(player) ? "messages.info.on" : "messages.info.off");
+        String onOff = plugin.getLocalizedMessage(player, getSetting.test(player) ? "messages.info.on" : "messages.info.off");
         if (onOff == null) {
-            onOff = String.valueOf(getSetting.apply(player));
+            onOff = String.valueOf(getSetting.test(player));
         }
 
         plugin.sendMessage(sender, "messages.info.settingState","%setting%", any ? "AnyContainer" : "SilentContainer", "%state%", onOff);

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,6 +31,7 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Command adding the ability to search online players' inventories for enchantments of a specific
@@ -124,8 +125,9 @@ public class SearchEnchantCommand implements TabExecutor {
         return true;
     }
 
-    private boolean containsEnchantment(Inventory inventory, Enchantment enchant, int minLevel) {
+    private boolean containsEnchantment(Inventory inventory, @Nullable Enchantment enchant, int minLevel) {
         for (ItemStack item : inventory.getContents()) {
+            //noinspection ConstantConditions // Spigot improperly annotated, should be ItemStack @NotNull []
             if (item == null || item.getType() == Material.AIR) {
                 continue;
             }

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,16 +32,14 @@ public interface IPlayerDataManager {
      * @param offline the OfflinePlayer
      * @return the Player loaded
      */
-    @Nullable
-    Player loadPlayer(@NotNull OfflinePlayer offline);
+    @Nullable Player loadPlayer(@NotNull OfflinePlayer offline);
 
     /**
      * Creates a new Player from an existing one that will function slightly better offline.
      *
      * @return the Player
      */
-    @NotNull
-    Player inject(@NotNull Player player);
+    @NotNull Player inject(@NotNull Player player);
 
     /**
      * Opens an ISpecialInventory for a Player.
@@ -51,14 +49,18 @@ public interface IPlayerDataManager {
      *`
      * @return the InventoryView opened
      */
-    @Nullable
-    InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory);
+    @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory);
 
-    void sendSystemMessage(@NotNull Player player, @NotNull String message);
-
-    @NotNull
-    default String getLocale(Player player) {
-        return player.getLocale();
-    }
+    /**
+     * Convert a raw slot number into a player inventory slot number.
+     *
+     * <p>Note that this method is specifically for converting an ISpecialPlayerInventory slot number into a regular
+     * player inventory slot number.
+     *
+     * @param view the open inventory view
+     * @param rawSlot the raw slot in the view
+     * @return the converted slot number
+     */
+    int convertToPlayerSlot(InventoryView view, int rawSlot);
 
 }

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

@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal;
+
+import com.lishid.openinv.OpenInv;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.jetbrains.annotations.NotNull;
+
+public class OpenInventoryView extends InventoryView {
+
+    private final Player player;
+    private final ISpecialInventory inventory;
+    private final String titleKey;
+    private final String titleDefaultSuffix;
+    private String title;
+
+    public OpenInventoryView(Player player, ISpecialInventory inventory, String titleKey, String titleDefaultSuffix) {
+        this.player = player;
+        this.inventory = inventory;
+        this.titleKey = titleKey;
+        this.titleDefaultSuffix = titleDefaultSuffix;
+    }
+
+    @Override
+    public @NotNull Inventory getTopInventory() {
+        return inventory.getBukkitInventory();
+    }
+
+    @Override
+    public @NotNull Inventory getBottomInventory() {
+        return getPlayer().getInventory();
+    }
+
+    @Override
+    public @NotNull HumanEntity getPlayer() {
+        return player;
+    }
+
+    @Override
+    public @NotNull InventoryType getType() {
+        return inventory.getBukkitInventory().getType();
+    }
+
+    @Override
+    public @NotNull String getTitle() {
+        if (title == null) {
+            HumanEntity owner = inventory.getPlayer();
+
+            String localTitle = OpenInv.getPlugin(OpenInv.class)
+                    .getLocalizedMessage(
+                            owner,
+                            titleKey,
+                            "%player%",
+                            owner.getName());
+            if (localTitle != null) {
+                title = localTitle;
+            } else  {
+                title = owner.getName() + titleDefaultSuffix;
+            }
+        }
+
+        return title;
+    }
+
+}

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

@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.listeners;
-
-import com.lishid.openinv.util.InventoryAccess;
-import com.lishid.openinv.util.Permissions;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.inventory.Inventory;
-
-public class InventoryClickListener implements Listener {
-
-    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
-    public void onInventoryClick(InventoryClickEvent event) {
-        HumanEntity entity = event.getWhoClicked();
-        Inventory inventory = event.getInventory();
-        if (InventoryAccess.isPlayerInventory(inventory) && !Permissions.EDITINV.hasPermission(entity)
-                || InventoryAccess.isEnderChest(inventory) && !Permissions.EDITENDER.hasPermission(entity)) {
-            event.setCancelled(true);
-        }
-    }
-
-}

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

@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.listeners;
-
-import com.lishid.openinv.IOpenInv;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-
-public class InventoryCloseListener implements Listener {
-
-    private final IOpenInv plugin;
-
-    public InventoryCloseListener(final IOpenInv plugin) {
-        this.plugin = plugin;
-    }
-
-    @EventHandler
-    public void onInventoryClose(final InventoryCloseEvent event) {
-        if (!(event.getPlayer() instanceof Player)) {
-            return;
-        }
-
-        Player player = (Player) event.getPlayer();
-
-        if (this.plugin.getPlayerSilentChestStatus(player)) {
-            this.plugin.getAnySilentContainer().deactivateContainer(player);
-        }
-    }
-
-}

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

@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.listeners;
-
-import com.lishid.openinv.util.InventoryAccess;
-import com.lishid.openinv.util.Permissions;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryDragEvent;
-import org.bukkit.inventory.Inventory;
-
-/**
- * Listener for InventoryDragEvents to prevent unpermitted modification of special inventories.
- *
- * @author Jikoo
- */
-public class InventoryDragListener implements Listener {
-
-    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
-    public void onInventoryDrag(InventoryDragEvent event) {
-        HumanEntity entity = event.getWhoClicked();
-        Inventory inventory = event.getInventory();
-        if (InventoryAccess.isPlayerInventory(inventory) && !Permissions.EDITINV.hasPermission(entity)
-                || InventoryAccess.isEnderChest(inventory) && !Permissions.EDITENDER.hasPermission(entity)) {
-            event.setCancelled(true);
-        }
-    }
-
-}

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

@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.listeners;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.util.InventoryAccess;
+import com.lishid.openinv.util.Permissions;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.bukkit.GameMode;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryAction;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.event.inventory.InventoryDragEvent;
+import org.bukkit.event.inventory.InventoryInteractEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Listener for inventory-related events to prevent modification of inventories where not allowed.
+ *
+ * @author Jikoo
+ */
+public class InventoryListener implements Listener {
+
+    private final OpenInv plugin;
+
+    public InventoryListener(final OpenInv plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler
+    public void onInventoryClose(@NotNull final InventoryCloseEvent event) {
+        if (!(event.getPlayer() instanceof Player)) {
+            return;
+        }
+
+        Player player = (Player) event.getPlayer();
+
+        if (this.plugin.getPlayerSilentChestStatus(player)) {
+            this.plugin.getAnySilentContainer().deactivateContainer(player);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onInventoryClick(@NotNull final InventoryClickEvent event) {
+        if (handleInventoryInteract(event)) {
+            return;
+        }
+
+        // Safe cast - has to be a player to be the holder of a special player inventory.
+        Player player = (Player) event.getWhoClicked();
+
+        if (event.getAction() != InventoryAction.MOVE_TO_OTHER_INVENTORY) {
+            // All own-inventory interactions require updates to display properly.
+            // Update in same tick after event completion.
+            this.plugin.getServer().getScheduler().runTask(this.plugin, player::updateInventory);
+            return;
+        }
+
+        // Extra handling for MOVE_TO_OTHER_INVENTORY - apparently Mojang no longer removes the item from the target
+        // inventory prior to adding it to existing stacks.
+        ItemStack currentItem = event.getCurrentItem();
+        if (currentItem == null) {
+            // Other plugin doing some sort of handling (would be NOTHING for null item otherwise), ignore.
+            return;
+        }
+
+        ItemStack clone = currentItem.clone();
+        event.setCurrentItem(null);
+
+        // Complete add action in same tick after event completion.
+        this.plugin.getServer().getScheduler().runTask(this.plugin, () -> {
+            player.getInventory().addItem(clone);
+            player.updateInventory();
+        });
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onInventoryDrag(@NotNull final InventoryDragEvent event) {
+        if (handleInventoryInteract(event)) {
+            return;
+        }
+
+        InventoryView view = event.getView();
+        int topSize = view.getTopInventory().getSize();
+
+        // Get bottom inventory active slots as player inventory slots.
+        Set<Integer> slots = event.getRawSlots().stream()
+                .filter(slot -> slot >= topSize)
+                .map(slot -> plugin.convertToPlayerSlot(view, slot)).collect(Collectors.toSet());
+
+        int overlapLosses = 0;
+
+        // Count overlapping slots.
+        for (Map.Entry<Integer, ItemStack> newItem : event.getNewItems().entrySet()) {
+            int rawSlot = newItem.getKey();
+
+            // Skip bottom inventory slots.
+            if (rawSlot >= topSize) {
+                continue;
+            }
+
+            int convertedSlot = plugin.convertToPlayerSlot(view, rawSlot);
+
+            if (slots.contains(convertedSlot)) {
+                overlapLosses += getCountDiff(view.getItem(rawSlot), newItem.getValue());
+            }
+        }
+
+        // Allow no overlap to proceed as usual.
+        if (overlapLosses < 1) {
+            return;
+        }
+
+        ItemStack cursor = event.getCursor();
+        if (cursor != null) {
+            cursor.setAmount(cursor.getAmount() + overlapLosses);
+        } else {
+            cursor = event.getOldCursor().clone();
+            cursor.setAmount(overlapLosses);
+        }
+
+        event.setCursor(cursor);
+    }
+
+    private int getCountDiff(@Nullable ItemStack original, @NotNull ItemStack result) {
+        if (original == null || original.getType() != result.getType()) {
+            return result.getAmount();
+        }
+
+        return result.getAmount() - original.getAmount();
+    }
+
+    /**
+     * Handle common InventoryInteractEvent functions.
+     *
+     * @param event the InventoryInteractEvent
+     * @return true unless the top inventory is the holder's own inventory
+     */
+    private boolean handleInventoryInteract(@NotNull final InventoryInteractEvent event) {
+        HumanEntity entity = event.getWhoClicked();
+
+        // Un-cancel spectator interactions.
+        if (Permissions.SPECTATE.hasPermission(entity) && entity.getGameMode() == GameMode.SPECTATOR) {
+            event.setCancelled(false);
+        }
+
+        if (event.isCancelled()) {
+            return true;
+        }
+
+        Inventory inventory = event.getView().getTopInventory();
+
+        // Is the inventory a special ender chest?
+        if (InventoryAccess.isEnderChest(inventory)) {
+            // Disallow ender chest interaction for users without edit permission.
+            if (!Permissions.EDITENDER.hasPermission(entity)) {
+                event.setCancelled(true);
+            }
+            return true;
+        }
+
+        ISpecialPlayerInventory playerInventory = InventoryAccess.getPlayerInventory(inventory);
+
+        // Ignore inventories other than special player inventories.
+        if (playerInventory == null) {
+            return true;
+        }
+
+        // Disallow player inventory interaction for users without edit permission.
+        if (!Permissions.EDITINV.hasPermission(entity)) {
+            event.setCancelled(true);
+            return true;
+        }
+
+        // Only specially handle actions in the player's own inventory.
+        return !event.getWhoClicked().equals(playerInventory.getPlayer());
+    }
+
+}

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.function.Function;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
 
 /**
  * A minimal thread-safe time-based cache implementation backed by a HashMap and TreeMultimap.
@@ -36,16 +37,17 @@ public class Cache<K, V> {
     private final Map<K, V> internal;
     private final Multimap<Long, K> expiry;
     private final long retention;
-    private final Function<V, Boolean> inUseCheck, postRemoval;
+    private final Predicate<V> inUseCheck;
+    private final Consumer<V> postRemoval;
 
     /**
      * Constructs a Cache with the specified retention duration, in use function, and post-removal function.
      *
      * @param retention duration after which keys are automatically invalidated if not in use
-     * @param inUseCheck Function used to check if a key is considered in use
-     * @param postRemoval Function used to perform any operations required when a key is invalidated
+     * @param inUseCheck Predicate used to check if a key is considered in use
+     * @param postRemoval Consumer used to perform any operations required when a key is invalidated
      */
-    public Cache(final long retention, final Function<V, Boolean> inUseCheck, final Function<V, Boolean> postRemoval) {
+    public Cache(final long retention, final Predicate<V> inUseCheck, final Consumer<V> postRemoval) {
         this.internal = new HashMap<>();
 
         this.expiry = TreeMultimap.create(Long::compareTo, (k1, k2) -> Objects.equals(k1, k2) ? 0 : 1);
@@ -136,7 +138,7 @@ public class Cache<K, V> {
     public void invalidateAll() {
         synchronized (this.internal) {
             for (V value : this.internal.values()) {
-                this.postRemoval.apply(value);
+                this.postRemoval.accept(value);
             }
             this.expiry.clear();
             this.internal.clear();
@@ -161,7 +163,7 @@ public class Cache<K, V> {
 
                 iterator.remove();
 
-                if (this.inUseCheck.apply(this.internal.get(entry.getValue()))) {
+                if (this.inUseCheck.test(this.internal.get(entry.getValue()))) {
                     inUse.add(entry.getValue());
                     continue;
                 }
@@ -172,7 +174,7 @@ public class Cache<K, V> {
                     continue;
                 }
 
-                this.postRemoval.apply(value);
+                this.postRemoval.accept(value);
             }
 
             long nextExpiry = now + this.retention;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@ import java.util.Map;
 import java.util.Set;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.scheduler.BukkitRunnable;
 
 public class ConfigUpdater {
 
@@ -36,7 +35,8 @@ public class ConfigUpdater {
 
     public void checkForUpdates() {
         final int version = plugin.getConfig().getInt("config-version", 1);
-        if (version >= plugin.getConfig().getDefaults().getInt("config-version")) {
+        ConfigurationSection defaults = plugin.getConfig().getDefaults();
+        if (defaults == null || version >= defaults.getInt("config-version")) {
             return;
         }
 
@@ -50,87 +50,72 @@ public class ConfigUpdater {
             plugin.getLogger().warning("Could not back up config.yml before updating!");
         }
 
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                if (version < 2) {
-                    updateConfig1To2();
-                }
-                if (version < 3) {
-                    updateConfig2To3();
-                }
-                if (version < 4) {
-                    updateConfig3To4();
-                }
-
-                new BukkitRunnable() {
-                    @Override
-                    public void run() {
-                        plugin.saveConfig();
-                        plugin.getLogger().info("Configuration update complete!");
-                    }
-                }.runTaskLater(plugin, 1L); // Run on 1 tick delay; on older versions Bukkit's scheduler is not guaranteed FIFO
+        plugin.getServer().getScheduler().runTaskAsynchronously(plugin, () -> {
+            if (version < 2) {
+                updateConfig1To2();
             }
-        }.runTaskAsynchronously(plugin);
+            if (version < 3) {
+                updateConfig2To3();
+            }
+            if (version < 4) {
+                updateConfig3To4();
+            }
+
+            plugin.getServer().getScheduler().runTask(plugin, () -> {
+                plugin.saveConfig();
+                plugin.getLogger().info("Configuration update complete!");
+            });
+        });
     }
 
     private void updateConfig3To4() {
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                plugin.getConfig().set("notify", null);
-                plugin.getConfig().set("settings.locale", "en_US");
-                plugin.getConfig().set("config-version", 4);
-            }
-        }.runTask(plugin);
+        plugin.getServer().getScheduler().runTask(plugin, () -> {
+            plugin.getConfig().set("notify", null);
+            plugin.getConfig().set("settings.locale", "en_US");
+            plugin.getConfig().set("config-version", 4);
+        });
     }
 
     private void updateConfig2To3() {
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                plugin.getConfig().set("config-version", 3);
-                plugin.getConfig().set("items.open-inv", null);
-                plugin.getConfig().set("ItemOpenInv", null);
-                plugin.getConfig().set("toggles.items.open-inv", null);
-                plugin.getConfig().set("settings.disable-saving",
-                        plugin.getConfig().getBoolean("DisableSaving", false));
-                plugin.getConfig().set("DisableSaving", null);
-            }
-        }.runTask(plugin);
+        plugin.getServer().getScheduler().runTask(plugin, () -> {
+            plugin.getConfig().set("config-version", 3);
+            plugin.getConfig().set("items.open-inv", null);
+            plugin.getConfig().set("ItemOpenInv", null);
+            plugin.getConfig().set("toggles.items.open-inv", null);
+            plugin.getConfig().set("settings.disable-saving",
+                    plugin.getConfig().getBoolean("DisableSaving", false));
+            plugin.getConfig().set("DisableSaving", null);
+        });
     }
 
     private void updateConfig1To2() {
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                // Get the old config settings
-                boolean notifySilentChest = plugin.getConfig().getBoolean("NotifySilentChest", true);
-                boolean notifyAnyChest = plugin.getConfig().getBoolean("NotifyAnyChest", true);
-                plugin.getConfig().set("ItemOpenInvItemID", null);
-                plugin.getConfig().set("NotifySilentChest", null);
-                plugin.getConfig().set("NotifyAnyChest", null);
-                plugin.getConfig().set("config-version", 2);
-                plugin.getConfig().set("notify.any-chest", notifyAnyChest);
-                plugin.getConfig().set("notify.silent-chest", notifySilentChest);
-            }
-        }.runTask(plugin);
+        plugin.getServer().getScheduler().runTask(plugin, () -> {
+            // Get the old config settings
+            boolean notifySilentChest = plugin.getConfig().getBoolean("NotifySilentChest", true);
+            boolean notifyAnyChest = plugin.getConfig().getBoolean("NotifyAnyChest", true);
+            plugin.getConfig().set("ItemOpenInvItemID", null);
+            plugin.getConfig().set("NotifySilentChest", null);
+            plugin.getConfig().set("NotifyAnyChest", null);
+            plugin.getConfig().set("config-version", 2);
+            plugin.getConfig().set("notify.any-chest", notifyAnyChest);
+            plugin.getConfig().set("notify.silent-chest", notifySilentChest);
+        });
 
         updateToggles("AnyChest", "toggles.any-chest");
         updateToggles("SilentChest", "toggles.silent-chest");
     }
 
     private void updateToggles(final String sectionName, final String newSectionName) {
+        ConfigurationSection section = plugin.getConfig().getConfigurationSection(sectionName);
         // Ensure section exists
-        if (!plugin.getConfig().isConfigurationSection(sectionName)) {
+        if (section == null) {
             return;
         }
 
-        ConfigurationSection section = plugin.getConfig().getConfigurationSection(sectionName);
         Set<String> keys = section.getKeys(false);
 
         // Ensure section has content
-        if (keys == null || keys.isEmpty()) {
+        if (keys.isEmpty()) {
             return;
         }
 
@@ -143,25 +128,20 @@ public class ConfigUpdater {
             }
         }
 
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                // Wipe old ConfigurationSection
-                plugin.getConfig().set(sectionName, null);
+        plugin.getServer().getScheduler().runTask(plugin, () -> {
+            // Wipe old ConfigurationSection
+            plugin.getConfig().set(sectionName, null);
 
-                // Prepare new ConfigurationSection
-                ConfigurationSection newSection;
-                if (plugin.getConfig().isConfigurationSection(newSectionName)) {
-                    newSection = plugin.getConfig().getConfigurationSection(newSectionName);
-                } else {
-                    newSection = plugin.getConfig().createSection(newSectionName);
-                }
-                // Set new values
-                for (Map.Entry<String, Boolean> entry : toggles.entrySet()) {
-                    newSection.set(entry.getKey(), entry.getValue());
-                }
+            // Prepare new ConfigurationSection
+            ConfigurationSection newSection = plugin.getConfig().getConfigurationSection(newSectionName);
+            if (newSection == null) {
+                newSection = plugin.getConfig().createSection(newSectionName);
             }
-        }.runTask(plugin);
+            // Set new values
+            for (Map.Entry<String, Boolean> entry : toggles.entrySet()) {
+                newSection.set(entry.getKey(), entry.getValue());
+            }
+        });
     }
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,15 +40,54 @@ public class InternalAccessor {
         this.version = packageName.substring(packageName.lastIndexOf('.') + 1);
 
         try {
-            // TODO: implement support for CraftMagicNumbers#getMappingsVersion
             Class.forName("com.lishid.openinv.internal." + this.version + ".SpecialPlayerInventory");
             Class.forName("com.lishid.openinv.internal." + this.version + ".SpecialEnderChest");
             this.playerDataManager = this.createObject(IPlayerDataManager.class, "PlayerDataManager");
             this.anySilentContainer = this.createObject(IAnySilentContainer.class, "AnySilentContainer");
-            this.supported = InventoryAccess.isUseable();
+            this.supported = InventoryAccess.isUsable();
         } catch (Exception ignored) {}
     }
 
+    public String getReleasesLink() {
+        switch (version) {
+            case "1_4_5":
+            case "1_4_6":
+            case "v1_4_R1":
+            case "v1_5_R2":
+            case "v1_5_R3":
+            case "v1_6_R1":
+            case "v1_6_R2":
+            case "v1_6_R3":
+            case "v1_7_R1":
+            case "v1_7_R2":
+            case "v1_7_R3":
+            case "v1_7_R4":
+            case "v1_8_R1":
+            case "v1_8_R2":
+            case "v1_9_R1":
+            case "v1_9_R2":
+            case "v1_10_R1":
+            case "v1_11_R1":
+            case "v1_12_R1":
+                return "https://github.com/lishid/OpenInv/releases/tag/4.0.0 (OpenInv-legacy)";
+            case "v1_13_R1":
+                return "https://github.com/lishid/OpenInv/releases/tag/4.0.0";
+            case "v1_13_R2":
+                return "https://github.com/lishid/OpenInv/releases/tag/4.0.7";
+            case "v1_14_R1":
+                return "https://github.com/lishid/OpenInv/releases/tag/4.1.1";
+            case "v1_16_R1":
+                return "https://github.com/lishid/OpenInv/releases/tag/4.1.4";
+            case "v1_8_R3":
+            case "v1_15_R1":
+            case "v1_16_R2":
+                return "https://github.com/lishid/OpenInv/releases/tag/4.1.5";
+            case "v1_16_R3":
+            default:
+                return "https://github.com/Jikoo/OpenInv/releases";
+        }
+    }
+
     private <T> T createObject(final Class<? extends T> assignableClass, final String className,
             final Object... params) throws ClassCastException, ClassNotFoundException,
             InstantiationException, IllegalAccessException, IllegalArgumentException,

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 Jikoo. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@ public class LanguageManager {
 
 	private final OpenInv plugin;
 	private final String defaultLocale;
-	private Map<String, YamlConfiguration> locales;
+	private final Map<String, YamlConfiguration> locales;
 
 	public LanguageManager(@NotNull OpenInv plugin, @NotNull String defaultLocale) {
 		this.plugin = plugin;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 lishid. All rights reserved.
+ * Copyright (C) 2011-2021 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,9 +25,9 @@ public enum Permissions {
     EXEMPT("exempt"),
     CROSSWORLD("crossworld"),
     SILENT("silent"),
-    SILENT_DEFAULT("silent.default"),
+    SILENT_DEFAULT("silent.default", true),
     ANYCHEST("anychest"),
-    ANY_DEFAULT("any.default"),
+    ANY_DEFAULT("any.default", true),
     ENDERCHEST("openender"),
     ENDERCHEST_ALL("openenderall"),
     SEARCH("search"),
@@ -35,18 +35,25 @@ public enum Permissions {
     EDITENDER("editender"),
     OPENSELF("openself"),
     OPENONLINE("openonline"),
-    OPENOFFLINE("openoffline");
+    OPENOFFLINE("openoffline"),
+    SPECTATE("spectate");
 
     private final String permission;
+    private final boolean uninheritable;
 
     Permissions(String permission) {
+        this(permission, false);
+    }
+
+    Permissions(String permission, boolean uninheritable) {
         this.permission = "OpenInv." + permission;
+        this.uninheritable = uninheritable;
     }
 
     public boolean hasPermission(Permissible permissible) {
 
         boolean hasPermission = permissible.hasPermission(permission);
-        if (hasPermission || permissible.isPermissionSet(permission)) {
+        if (uninheritable || hasPermission || permissible.isPermissionSet(permission)) {
             return hasPermission;
         }
 

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

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

plugin/src/main/resources/plugin.yml

@@ -5,7 +5,7 @@ author: lishid
 authors: [Jikoo, ShadowRanger]
 description: >
              This plugin allows you to open a player's inventory as a chest and interact with it in real time.
-api-version: "1.14"
+api-version: "1.16"
 
 permissions:
   OpenInv.any.default:
@@ -27,6 +27,7 @@ permissions:
       OpenInv.searchcontainer: true
       OpenInv.openonline: true
       OpenInv.openoffline: true
+      OpenInv.spectate: true
   OpenInv.openinv:
     default: op
     children:

pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2021 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -19,61 +19,41 @@
 
   <groupId>com.lishid</groupId>
   <artifactId>openinvparent</artifactId>
-  <name>OpenInvParent</name>
+  <name>OpenInv</name>
   <url>http://dev.bukkit.org/bukkit-plugins/openinv/</url>
-  <version>4.1.4</version>
+  <version>4.1.8</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>
 
-  <modules>
-    <module>api</module>
-    <module>plugin</module>
-    <module>internal</module>
-    <module>assembly</module>
-  </modules>
-
   <profiles>
-
-    <!--
-      ~ N.B.: All version-specific code is handled in submodules of the internal module.
-      ~
-      ~ Internal submodules built by each profile are handled in internal/pom.xml
-     -->
-
     <profile>
       <id>all</id>
-      <activation>
-        <property>
-          <name>all</name>
-          <value>true</value>
-        </property>
-      </activation>
+      <modules>
+        <module>api</module>
+        <module>plugin</module>
+        <module>internal/v1_16_R3</module>
+        <module>internal/v1_17_R1</module>
+        <module>assembly</module>
+      </modules>
     </profile>
 
     <profile>
-      <id>latest</id>
+      <id>default</id>
       <activation>
-        <property>
-          <name>latest</name>
-          <value>true</value>
-        </property>
+        <activeByDefault>true</activeByDefault>
       </activation>
+      <modules>
+        <module>api</module>
+        <module>plugin</module>
+        <module>assembly</module>
+      </modules>
     </profile>
-
-    <profile>
-      <id>recent</id>
-      <activation>
-        <property>
-          <name>recent</name>
-          <value>true</value>
-        </property>
-      </activation>
-    </profile>
-
   </profiles>
 
   <repositories>
@@ -83,42 +63,84 @@
     </repository>
   </repositories>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.2</version>
-        <configuration>
-          <filters>
-            <filter>
-              <artifact>*:*</artifact>
-              <!-- Keep the file clean, don't include every single pom from all modules -->
-              <excludes>
-                <exclude>META-INF/maven/**</exclude>
-              </excludes>
-            </filter>
-          </filters>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <artifactId>annotations</artifactId>
+        <groupId>org.jetbrains</groupId>
+        <scope>provided</scope>
+        <version>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>
 
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-shade-plugin</artifactId>
+          <configuration>
+            <filters>
+              <filter>
+                <!-- Always shade entirety of required modules. -->
+                <artifact>com.lishid:openinv*</artifact>
+                <includes>
+                  <include>**</include>
+                </includes>
+              </filter>
+              <filter>
+                <artifact>*:*</artifact>
+                <!-- Don't warn about file conflicts that'll be clobbered anyway. -->
+                <excludes>
+                  <exclude>META-INF/MANIFEST.MF</exclude>
+                </excludes>
+              </filter>
+            </filters>
+            <minimizeJar>true</minimizeJar>
+          </configuration>
+          <executions>
+            <execution>
+              <phase>package</phase>
+              <goals>
+                <goal>shade</goal>
+              </goals>
+            </execution>
+          </executions>
+          <groupId>org.apache.maven.plugins</groupId>
+          <version>3.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>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 
 </project>

scripts/generate_changelog.sh

@@ -0,0 +1,82 @@
+#!/bin/bash
+#
+# Copyright (C) 2011-2021 lishid. All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Note that this script is designed for use in GitHub Actions, and is not
+# particularly robust nor configurable. Run from project parent directory.
+
+# Query GitHub for the username of the given email address.
+# Falls through to the given author name.
+function lookup_email_username() {
+  lookup=$(curl -G --data-urlencode "q=$1 in:email" https://api.github.com/search/users -H 'Accept: application/vnd.github.v3+json' | grep '"login":' | sed -e 's/^.*": "//g' -e 's/",.*$//g')
+
+  if [[ $lookup ]]; then
+    echo -n "@$lookup"
+  else
+    echo "$2"
+  fi
+}
+
+# Get a pretty list of supported Minecraft versions
+function get_minecraft_versions() {
+  readarray -t versions <<< "$(. ./scripts/get_spigot_versions.sh)"
+
+  for version in "${versions[@]}"; do
+    # Append comma if variable is set, then append version
+    minecraft_versions="${minecraft_versions:+${minecraft_versions},}${version%%-R*}"
+  done
+
+  echo "${minecraft_versions}"
+}
+
+previous_tag=$(git describe --tags --abbrev=0 @^)
+
+# Use formatted log to pull authors list
+authors_raw=$(git log --pretty=format:"%ae|%an" "$previous_tag"..@)
+readarray -t authors <<<"$authors_raw"
+
+# Use associative array to map email to author name
+declare -A author_data
+
+for author in "${authors[@]}"; do
+  # Match author email
+  author_email=${author%|*}
+  # Convert to lower case
+  author_email=${author_email,,}
+  # Match author name
+  author_name=${author##*|}
+  if [[ -n ${author_data[$author_email]} ]]; then
+    # Skip emails we already have data for
+    continue
+  fi
+
+  # Fetch and store author GitHub username by email
+  author_data[$author_email]=$(lookup_email_username "$author_email" "$author_name")
+done
+
+# Fetch actual formatted changelog
+changelog=$(git log --pretty=format:"* %s (%h) - %ae" "$previous_tag"..@)
+
+for author_email in "${!author_data[@]}"; do
+  # Ignore case when matching
+  shopt -s nocasematch
+  # Match and replace email
+  changelog=${changelog//$author_email/${author_data[$author_email]}}
+done
+
+minecraft_versions=$(get_minecraft_versions)
+
+printf "## Supported Minecraft versions\n%s\n\n## Changelog\n%s" "${minecraft_versions}" "${changelog}"

scripts/get_spigot_versions.sh

@@ -0,0 +1,50 @@
+#!/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

scripts/install_spigot_dependencies.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+#
+# Copyright (C) 2011-2021 lishid. All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Note that this script is designed for use in GitHub Actions, and is not
+# particularly robust nor configurable. Run from project parent directory.
+
+buildtools_dir=~/buildtools
+buildtools=$buildtools_dir/BuildTools.jar
+
+get_buildtools () {
+  if [[ -d $buildtools_dir && -f $buildtools ]]; then
+    return
+  fi
+
+  mkdir $buildtools_dir
+  wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar -O $buildtools
+}
+
+readarray -t versions <<< "$(. ./scripts/get_spigot_versions.sh)"
+echo Found Spigot dependencies: "${versions[@]}"
+
+for version in "${versions[@]}"; do
+  set -e
+  exit_code=0
+  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*}
+    get_buildtools
+    java -jar $buildtools -rev "$revision"
+  else
+    echo Spigot "$version" is already installed
+  fi
+done

scripts/set_curseforge_env.sh

@@ -0,0 +1,55 @@
+#!/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"

scripts/set_release_env.sh

@@ -0,0 +1,32 @@
+#!/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"

scripts/tag_release.sh

@@ -0,0 +1,37 @@
+#!/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"