Add reading assistant

With the update to 1.16 there's no need to maintain multiple copies of the same code. Additionally, in 1.16 the action bar now supports JSON text.

.github/workflows/close-issue.yml

@@ -0,0 +1,13 @@
+name: Close Issue
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: peter-evans/close-issue@v1.0.3
+        with:
+          comment: "Per the notice in the readme, OpenInv is now being maintained at [Jikoo/OpenInv](https://github.com/Jikoo/OpenInv)."

.github/workflows/close-pr.yml

@@ -0,0 +1,13 @@
+name: Close Pull Request
+
+on:
+  pull_request_target:
+    types: [opened]
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: superbrothers/close-pull-request@v3.1.0
+        with:
+          comment: "Per the notice in the readme, OpenInv is now being maintained at [Jikoo/OpenInv](https://github.com/Jikoo/OpenInv)."

.gitignore

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

README.MD

@@ -1,3 +1,6 @@
+## Notice
+I am now maintaining OpenInv over at [Jikoo/OpenInv](https://github.com/Jikoo/OpenInv) because I needed higher levels of access to add secrets to the repository for Github Actions. It feels ruder to send an email saying what amounts to "pls op" than to redirect people to my fork, though neither option is polite. Existing issues will remain open here until resolved (you can't transfer issues across organizations/users), but any new issues in this repo will be closed without resolution.
+
 ## About
 OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) which allows users to open and edit anyone's inventory or ender chest - online or not!
 
@@ -80,6 +83,14 @@ OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) whi
     <td>OpenInv.editinv</td>
     <td>Required to make changes to open inventories.</td>
   </tr>
+  <tr>
+      <td>OpenInv.openonline</td>
+      <td>Allows users to open online players' inventories. For compatibility reasons this is granted by the nodes OpenInv.openinv and OpenInv.openender.</td>
+  </tr>
+  <tr>
+      <td>OpenInv.openoffline</td>
+      <td>Allows users to open offline players' inventories. For compatibility reasons this is granted by the nodes OpenInv.openinv and OpenInv.openender.</td>
+  </tr>
   <tr>
     <td>OpenInv.openender</td>
     <td>Required to use /openender.</td>
@@ -128,19 +139,27 @@ 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.11-R0.1-SNAPSHOT.jar -DgroupId=org.spigotmc -DartifactId=spigot -Dversion=1.11-R0.1-SNAPSHOT`
+Ex: `mvn install:install-file -Dpackaging=jar -Dfile=spigot-1.8-R0.1-SNAPSHOT.jar -DgroupId=org.spigotmc -DartifactId=spigot -Dversion=1.8-R0.1-SNAPSHOT`
 
-To compile for a specific version or set of versions, you'll need to use a profile. Provided profiles are `latest`, `recent` (last 2 major Minecraft versions), and `all`. Select an existing profile using the `-P` argument (ex: `mvn clean package -am -P all`) or make your own. For more information, check out the [official guide](http://maven.apache.org/guides/introduction/introduction-to-profiles.html).
+To compile for a single version, specify the NMS revision you are targeting: `mvn -pl <NMS module> -am clean install`
 
-The final file is target/OpenInv.jar
+To compile for a set of versions, you'll need to use a profile. The only provided profile is `all`. Select a profile using the `-P` argument: `mvn clean package -am -P all`
+
+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-2018 lishid. All rights reserved.
+Copyright (C) 2011-2020 lishid. All rights reserved.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

api/pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>4.0.0</version>
+    <version>4.1.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>openinvapi</artifactId>
@@ -29,12 +29,29 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.bukkit</groupId>
+      <groupId>org.jetbrains</groupId>
-      <artifactId>bukkit</artifactId>
+      <artifactId>annotations</artifactId>
-      <version>1.4.5-R1.0</version>
+      <version>17.0.0</version>
-      <scope>system</scope>
+    </dependency>
-      <systemPath>${project.basedir}/../lib/bukkit-1.4.5-R1.0.jar</systemPath>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot-api</artifactId>
+      <version>1.16.5-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 
+  <build>
+    <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>
+
 </project>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2020 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,11 @@ 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 com.lishid.openinv.util.InventoryAccess;
+import com.lishid.openinv.util.StringMetric;
+import java.util.UUID;
+import java.util.logging.Logger;
+import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryView;
@@ -59,7 +64,10 @@ public interface IOpenInv {
      * @return the IInventoryAccess
      * @throws IllegalStateException if the server version is unsupported
      */
-    @NotNull IInventoryAccess getInventoryAccess();
+    @Deprecated
+    default @NotNull IInventoryAccess getInventoryAccess() {
+        return new InventoryAccess();
+    }
 
     /**
      * Gets the provided player's AnyChest setting.
@@ -78,7 +86,9 @@ public interface IOpenInv {
      * @return the identifier
      * @throws IllegalStateException if the server version is unsupported
      */
-    @NotNull String getPlayerID(@NotNull OfflinePlayer offline);
+    default @NotNull String getPlayerID(@NotNull OfflinePlayer offline) {
+        return offline.getUniqueId().toString();
+    }
 
     /**
      * Gets a player's SilentChest setting.
@@ -137,7 +147,76 @@ public interface IOpenInv {
      * @param name the name of the Player
      * @return the OfflinePlayer with the closest matching name or null if no players have ever logged in
      */
-    @Nullable OfflinePlayer matchPlayer(@NotNull String name);
+    default @Nullable OfflinePlayer matchPlayer(@NotNull String name) {
+
+        // Warn if called on the main thread - if we resort to searching offline players, this may take several seconds.
+        if (Bukkit.getServer().isPrimaryThread()) {
+            this.getLogger().warning("Call to OpenInv#matchPlayer made on the main thread!");
+            this.getLogger().warning("This can cause the server to hang, potentially severely.");
+            this.getLogger().warning("Trace:");
+            for (StackTraceElement element : new Throwable().fillInStackTrace().getStackTrace()) {
+                this.getLogger().warning(element.toString());
+            }
+        }
+
+        OfflinePlayer player;
+
+        try {
+            UUID uuid = UUID.fromString(name);
+            player = Bukkit.getOfflinePlayer(uuid);
+            // Ensure player is a real player, otherwise return null
+            if (player.hasPlayedBefore() || player.isOnline()) {
+                return player;
+            }
+        } catch (IllegalArgumentException ignored) {
+            // Not a UUID
+        }
+
+        // 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) {
+            return player;
+        }
+
+        player = Bukkit.getServer().getOfflinePlayer(name);
+
+        if (player.hasPlayedBefore()) {
+            return player;
+        }
+
+        player = Bukkit.getServer().getPlayer(name);
+
+        if (player != null) {
+            return player;
+        }
+
+        float bestMatch = 0;
+        for (OfflinePlayer offline : Bukkit.getServer().getOfflinePlayers()) {
+            if (offline.getName() == null) {
+                // Loaded by UUID only, name has never been looked up.
+                continue;
+            }
+
+            float currentMatch = StringMetric.compareJaroWinkler(name, offline.getName());
+
+            if (currentMatch == 1.0F) {
+                return offline;
+            }
+
+            if (currentMatch > bestMatch) {
+                bestMatch = currentMatch;
+                player = offline;
+            }
+        }
+
+        // Only null if no players have played ever, otherwise even the worst match will do.
+        return player;
+    }
 
     /**
      * Open an ISpecialInventory for a Player.
@@ -225,4 +304,6 @@ public interface IOpenInv {
      */
     void unload(@NotNull OfflinePlayer offline);
 
+    Logger getLogger();
+
 }

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2020 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@ import org.bukkit.inventory.Inventory;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@Deprecated
 public interface IInventoryAccess {
 
     /**
@@ -29,6 +30,7 @@ public interface IInventoryAccess {
      * @param inventory the Inventory
      * @return the ISpecialEnderChest or null
      */
+    @Deprecated
     @Nullable ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory);
 
     /**
@@ -38,6 +40,7 @@ public interface IInventoryAccess {
      * @param inventory the Inventory
      * @return the ISpecialPlayerInventory or null
      */
+    @Deprecated
     @Nullable ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory);
 
     /**
@@ -46,6 +49,7 @@ public interface IInventoryAccess {
      * @param inventory the Inventory
      * @return true if the Inventory is backed by an ISpecialEnderChest
      */
+    @Deprecated
     boolean isSpecialEnderChest(@NotNull Inventory inventory);
 
     /**
@@ -54,6 +58,7 @@ public interface IInventoryAccess {
      * @param inventory the Inventory
      * @return true if the Inventory is backed by an ISpecialPlayerInventory
      */
+    @Deprecated
     boolean isSpecialPlayerInventory(@NotNull Inventory inventory);
 
 }

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

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

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

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

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

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

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

@@ -0,0 +1,134 @@
+/*
+ * 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.util;
+
+import com.lishid.openinv.internal.IInventoryAccess;
+import com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialInventory;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import org.bukkit.Bukkit;
+import org.bukkit.inventory.Inventory;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class InventoryAccess implements IInventoryAccess {
+
+    private static Class<?> craftInventory = null;
+    private static Method getInventory = null;
+
+    static {
+        String packageName = Bukkit.getServer().getClass().getPackage().getName();
+        try {
+            craftInventory = Class.forName(packageName + ".inventory.CraftInventory");
+        } catch (ClassNotFoundException ignored) {}
+        try {
+            getInventory = craftInventory.getDeclaredMethod("getInventory");
+        } catch (NoSuchMethodException ignored) {}
+    }
+
+    /**
+     * @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) {
+        return getPlayerInventory(inventory) != null;
+    }
+
+    public static @Nullable ISpecialPlayerInventory getPlayerInventory(@NotNull Inventory inventory) {
+        return getSpecialInventory(ISpecialPlayerInventory.class, inventory);
+    }
+
+    public static boolean isEnderChest(@NotNull Inventory inventory) {
+        return getEnderChest(inventory) != null;
+    }
+
+    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) {}
+        }
+
+        inv = grabFieldOfTypeFromObject(expected, inventory);
+
+        if (expected.isInstance(inv)) {
+            return expected.cast(inv);
+        }
+
+        return null;
+    }
+
+    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;
+        for (Field f : clazz.getDeclaredFields()) {
+            f.setAccessible(true);
+            if (type.isAssignableFrom(f.getDeclaringClass())) {
+                try {
+                    result = type.cast(f.get(object));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return result;
+    }
+
+    @Deprecated
+    @Override
+    public @Nullable ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
+        return getEnderChest(inventory);
+    }
+
+    @Deprecated
+    @Override
+    public @Nullable ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
+        return getPlayerInventory(inventory);
+    }
+
+    @Deprecated
+    @Override
+    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
+        return isEnderChest(inventory);
+    }
+
+    @Deprecated
+    @Override
+    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
+        return isPlayerInventory(inventory);
+    }
+
+}

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

@@ -0,0 +1,150 @@
+/*
+ * 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.util;
+
+public class StringMetric {
+
+    public static float compareJaroWinkler(String a, String b) {
+        final float jaroScore = compareJaro(a, b);
+
+        if (jaroScore < (float) 0.7) {
+            return jaroScore;
+        }
+
+        String prefix = commonPrefix(a, b);
+        int prefixLength = Math.min(prefix.codePointCount(0, prefix.length()), 4);
+
+        return jaroScore + (prefixLength * (float) 0.1 * (1.0f - jaroScore));
+
+    }
+
+    private static float compareJaro(String a, String b) {
+        if (a.isEmpty() && b.isEmpty()) {
+            return 1.0f;
+        }
+
+        if (a.isEmpty() || b.isEmpty()) {
+            return 0.0f;
+        }
+
+        final int[] charsA = a.codePoints().toArray();
+        final int[] charsB = b.codePoints().toArray();
+
+        // Intentional integer division to round down.
+        final int halfLength = Math.max(0, Math.max(charsA.length, charsB.length) / 2 - 1);
+
+        final int[] commonA = getCommonCodePoints(charsA, charsB, halfLength);
+        final int[] commonB = getCommonCodePoints(charsB, charsA, halfLength);
+
+        // commonA and commonB will always contain the same multi-set of
+        // characters. Because getCommonCharacters has been optimized, commonA
+        // and commonB are -1-padded. So in this loop we count transposition
+        // and use commonCharacters to determine the length of the multi-set.
+        float transpositions = 0;
+        int commonCharacters = 0;
+        for (int length = commonA.length; commonCharacters < length
+                && commonA[commonCharacters] > -1; commonCharacters++) {
+            if (commonA[commonCharacters] != commonB[commonCharacters]) {
+                transpositions++;
+            }
+        }
+
+        if (commonCharacters == 0) {
+            return 0.0f;
+        }
+
+        float aCommonRatio = commonCharacters / (float) charsA.length;
+        float bCommonRatio = commonCharacters / (float) charsB.length;
+        float transpositionRatio = (commonCharacters - transpositions / 2.0f) / commonCharacters;
+
+        return (aCommonRatio + bCommonRatio + transpositionRatio) / 3.0f;
+    }
+
+    /*
+     * Returns an array of code points from a within b. A character in b is
+     * counted as common when it is within separation distance from the position
+     * in a.
+     */
+    private static int[] getCommonCodePoints(final int[] charsA, final int[] charsB, final int separation) {
+        final int[] common = new int[Math.min(charsA.length, charsB.length)];
+        final boolean[] matched = new boolean[charsB.length];
+
+        // Iterate of string a and find all characters that occur in b within
+        // the separation distance. Mark any matches found to avoid
+        // duplicate matchings.
+        int commonIndex = 0;
+        for (int i = 0, length = charsA.length; i < length; i++) {
+            final int character = charsA[i];
+            final int index = indexOf(character, charsB, i - separation, i
+                    + separation + 1, matched);
+            if (index > -1) {
+                common[commonIndex++] = character;
+                matched[index] = true;
+            }
+        }
+
+        if (commonIndex < common.length) {
+            common[commonIndex] = -1;
+        }
+
+        // Both invocations will yield the same multi-set terminated by -1, so
+        // they can be compared for transposition without making a copy.
+        return common;
+    }
+
+    /*
+     * Search for code point in buffer starting at fromIndex to toIndex - 1.
+     *
+     * Returns -1 when not found.
+     */
+    private static int indexOf(int character, int[] buffer, int fromIndex, int toIndex, boolean[] matched) {
+
+        // compare char with range of characters to either side
+        for (int j = Math.max(0, fromIndex), length = Math.min(toIndex, buffer.length); j < length; j++) {
+            // check if found
+            if (buffer[j] == character && !matched[j]) {
+                return j;
+            }
+        }
+
+        return -1;
+    }
+
+    private static String commonPrefix(CharSequence a, CharSequence b) {
+        int maxPrefixLength = Math.min(a.length(), b.length());
+
+        int p;
+
+        p = 0;
+        while (p < maxPrefixLength && a.charAt(p) == b.charAt(p)) {
+            ++p;
+        }
+
+        if (validSurrogatePairAt(a, p - 1) || validSurrogatePairAt(b, p - 1)) {
+            --p;
+        }
+
+        return a.subSequence(0, p).toString();
+    }
+
+    private static boolean validSurrogatePairAt(CharSequence string, int index) {
+        return index >= 0 && index <= string.length() - 2 && Character.isHighSurrogate(string.charAt(index)) && Character.isLowSurrogate(string.charAt(index + 1));
+    }
+
+    private StringMetric(){}
+
+}

assembly/pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>4.0.0</version>
+    <version>4.1.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>openinvassembly</artifactId>
@@ -34,7 +34,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <id>reactor-uberjar</id>

assembly/src/assembly/reactor-uberjar.xml

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

common/pom.xml

@@ -1,45 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2018 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.0.0</version>
-  </parent>
-
-  <artifactId>openinvcommon</artifactId>
-  <name>OpenInvCommon</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>1.4.5-R1.0</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/../lib/bukkit-1.4.5-R1.0.jar</systemPath>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvapi</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-  </dependencies>
-
-</project>

common/src/main/java/com/lishid/openinv/util/Function.java

@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.util;
-
-/**
- * Abstraction for some simple cache calls.
- *
- * @author Jikoo
- */
-public abstract class Function<V> {
-
-    public abstract boolean run(V value);
-
-}

internal/1_4_5/pom.xml

@@ -1,44 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2018 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.0.0</version>
-  </parent>
-
-  <artifactId>openinvadapter1_4_5</artifactId>
-  <name>OpenInvAdapter1_4_5</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>craftbukkit</artifactId>
-      <version>1.4.5-R1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-  </dependencies>
-
-</project>

internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/AnySilentContainer.java

@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_5;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import net.minecraft.server.v1_4_5.AxisAlignedBB;
-import net.minecraft.server.v1_4_5.BlockEnderChest;
-import net.minecraft.server.v1_4_5.Container;
-import net.minecraft.server.v1_4_5.EntityOcelot;
-import net.minecraft.server.v1_4_5.EntityPlayer;
-import net.minecraft.server.v1_4_5.IInventory;
-import net.minecraft.server.v1_4_5.InventoryEnderChest;
-import net.minecraft.server.v1_4_5.InventoryLargeChest;
-import net.minecraft.server.v1_4_5.Packet100OpenWindow;
-import net.minecraft.server.v1_4_5.TileEntityChest;
-import net.minecraft.server.v1_4_5.TileEntityEnderChest;
-import net.minecraft.server.v1_4_5.World;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_4_5.event.CraftEventFactory;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class AnySilentContainer implements IAnySilentContainer {
-
-    @Override
-    public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
-        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
-        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
-
-        if (bukkitBlock instanceof BlockEnderChest) {
-            // Ender chests are not blocked by ocelots.
-            return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        }
-
-        // If block or ocelot on top
-        if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
-            return true;
-        }
-
-        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        // If block next to chest is chest and has a block or ocelot on top
-        if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
-            return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() + 1);
-        } else if(world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
-            return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() - 1);
-        } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            return isBlockedChest(world, bukkitBlock.getX() + 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            return isBlockedChest(world, bukkitBlock.getX() - 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedChest(World world, int x, int y, int z) {
-        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
-    }
-
-    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
-        for (Object localEntity : world.a(EntityOcelot.class,
-                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
-            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
-            if (localEntityOcelot.isSitting()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        // Silent ender chest is API-only
-        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            return true;
-        }
-
-        World world = player.world;
-        Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        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);
-            return true;
-        }
-
-        if (!(tile instanceof IInventory)) {
-            return false;
-        }
-
-        IInventory inventory = (IInventory) tile;
-        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1));
-        } else if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1), inventory);
-        } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()));
-        } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()), inventory);
-        }
-
-        // AnyChest only
-        if (!silent) {
-            player.openContainer(inventory);
-            return true;
-        }
-
-        // SilentChest
-        try {
-            // Call InventoryOpenEvent
-            Container container = new SilentContainerChest(player.inventory, inventory);
-            container = CraftEventFactory.callInventoryOpenEvent(player, container);
-            if (container == null) {
-                return false;
-            }
-
-            // Open window
-            int windowId = player.nextContainerCounter();
-            player.netServerHandler.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize()));
-            player.activeContainer = container;
-            player.activeContainer.windowId = windowId;
-            player.activeContainer.addSlotListener(player);
-
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
-            return false;
-        }
-    }
-
-    @Override
-    public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
-
-}

internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/InventoryAccess.java

@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_5;
-
-import com.lishid.openinv.internal.IInventoryAccess;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.util.InternalAccessor;
-import net.minecraft.server.v1_4_5.IInventory;
-import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class InventoryAccess implements IInventoryAccess {
-
-    @Override
-    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
-    }
-
-    @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialPlayerInventory) {
-            return (SpecialPlayerInventory) inv;
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
-    }
-
-    @Override
-    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialEnderChest) {
-            return (SpecialEnderChest) inv;
-        }
-        return null;
-    }
-
-}

internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/PlayerDataManager.java

@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_5;
-
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import java.util.Arrays;
-import java.util.Collection;
-import net.minecraft.server.v1_4_5.EntityPlayer;
-import net.minecraft.server.v1_4_5.ItemInWorldManager;
-import net.minecraft.server.v1_4_5.MinecraftServer;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_4_5.CraftServer;
-import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    @Override
-    public Player loadPlayer(@NotNull OfflinePlayer offline) {
-        // Ensure the player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
-                new ItemInWorldManager(server.getWorldServer(0)));
-
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
-    }
-
-    @Override
-    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
-        return offline.getName();
-    }
-
-    @Override
-    public OfflinePlayer getPlayerByID(@NotNull String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
-    @Override
-    public @NotNull Collection<? extends Player> getOnlinePlayers() {
-        return Arrays.asList(Bukkit.getOnlinePlayers());
-    }
-
-    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().f(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 InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-        return player.openInventory(inventory.getBukkitInventory());
-    }
-
-}

internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SilentContainerChest.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_5;
-
-import net.minecraft.server.v1_4_5.ContainerChest;
-import net.minecraft.server.v1_4_5.EntityHuman;
-import net.minecraft.server.v1_4_5.IInventory;
-import net.minecraft.server.v1_4_5.ItemStack;
-import net.minecraft.server.v1_4_5.PlayerInventory;
-
-class SilentContainerChest extends ContainerChest {
-
-    SilentContainerChest(IInventory i1, IInventory i2) {
-        super(i1, i2);
-        // Send close signal
-        i2.f();
-    }
-
-    @Override
-    public void b(EntityHuman entityHuman) {
-        // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried);
-        }
-    }
-
-}

internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialEnderChest.java

@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_5;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.server.v1_4_5.EntityPlayer;
-import net.minecraft.server.v1_4_5.IInventory;
-import net.minecraft.server.v1_4_5.InventoryEnderChest;
-import net.minecraft.server.v1_4_5.InventorySubcontainer;
-import net.minecraft.server.v1_4_5.ItemStack;
-import org.bukkit.craftbukkit.v1_4_5.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-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 final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline;
-    private CraftPlayer owner;
-    private int maxStack = MAX_STACK;
-
-    public SpecialEnderChest(Player player, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
-        this.playerOnline = online;
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.owner = 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.owner = 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 ItemStack[] getContents() {
-        return this.items;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        transaction.add(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        transaction.remove(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return transaction;
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner;
-    }
-
-    @Override
-    public void setMaxStackSize(int size) {
-        maxStack = size;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return maxStack;
-    }
-
-    @Override
-    public void update() {
-        super.update();
-        enderChest.update();
-    }
-
-}

internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialPlayerInventory.java

@@ -1,233 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_5;
-
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import net.minecraft.server.v1_4_5.ItemStack;
-import net.minecraft.server.v1_4_5.PlayerInventory;
-import org.bukkit.craftbukkit.v1_4_5.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].a(j);
-                if (is[i].count == 0) {
-                    is[i] = null;
-                }
-
-                return itemstack;
-            }
-        }
-        else {
-            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;
-        }
-        else {
-            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);
-            itemstack = null;
-        }
-
-        is[i] = itemstack;
-
-        player.defaultContainer.b();
-    }
-
-    private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
-            return i - 27;
-        else
-            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;
-        else
-            return i;
-    }
-
-    @Override
-    public String getName() {
-        if (player.getName().length() > 16) {
-            return player.getName().substring(0, 16);
-        }
-        return player.getName();
-    }
-
-}

internal/1_4_6/pom.xml

@@ -1,44 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2018 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.0.0</version>
-  </parent>
-
-  <artifactId>openinvadapter1_4_6</artifactId>
-  <name>OpenInvAdapter1_4_6</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>craftbukkit</artifactId>
-      <version>1.4.6-R0.3</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-  </dependencies>
-
-</project>

internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/AnySilentContainer.java

@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_6;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import net.minecraft.server.v1_4_6.AxisAlignedBB;
-import net.minecraft.server.v1_4_6.BlockEnderChest;
-import net.minecraft.server.v1_4_6.Container;
-import net.minecraft.server.v1_4_6.EntityOcelot;
-import net.minecraft.server.v1_4_6.EntityPlayer;
-import net.minecraft.server.v1_4_6.IInventory;
-import net.minecraft.server.v1_4_6.InventoryEnderChest;
-import net.minecraft.server.v1_4_6.InventoryLargeChest;
-import net.minecraft.server.v1_4_6.Packet100OpenWindow;
-import net.minecraft.server.v1_4_6.TileEntityChest;
-import net.minecraft.server.v1_4_6.TileEntityEnderChest;
-import net.minecraft.server.v1_4_6.World;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_4_6.event.CraftEventFactory;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class AnySilentContainer implements IAnySilentContainer {
-
-    @Override
-    public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
-        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
-        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
-
-        if (bukkitBlock instanceof BlockEnderChest) {
-            // Ender chests are not blocked by ocelots.
-            return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        }
-
-        // If block or ocelot on top
-        if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
-            return true;
-        }
-
-        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        // If block next to chest is chest and has a block or ocelot on top
-        if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
-            return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() + 1);
-        } else if(world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
-            return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() - 1);
-        } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            return isBlockedChest(world, bukkitBlock.getX() + 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            return isBlockedChest(world, bukkitBlock.getX() - 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedChest(World world, int x, int y, int z) {
-        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
-    }
-
-    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
-        for (Object localEntity : world.a(EntityOcelot.class,
-                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
-            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
-            if (localEntityOcelot.isSitting()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        // Silent ender chest is API-only
-        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            return true;
-        }
-
-        World world = player.world;
-        Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        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);
-            return true;
-        }
-
-        if (!(tile instanceof IInventory)) {
-            return false;
-        }
-
-        IInventory inventory = (IInventory) tile;
-        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1));
-        } else if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1), inventory);
-        } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()));
-        } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()), inventory);
-        }
-
-        // AnyChest only
-        if (!silent) {
-            player.openContainer(inventory);
-            return true;
-        }
-
-        // SilentChest
-        try {
-            // Call InventoryOpenEvent
-            Container container = new SilentContainerChest(player.inventory, inventory);
-            container = CraftEventFactory.callInventoryOpenEvent(player, container);
-            if (container == null) {
-                return false;
-            }
-
-            // Open window
-            int windowId = player.nextContainerCounter();
-            player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize()));
-            player.activeContainer = container;
-            player.activeContainer.windowId = windowId;
-            player.activeContainer.addSlotListener(player);
-
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
-            return false;
-        }
-    }
-
-    @Override
-    public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
-
-}

internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/InventoryAccess.java

@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_6;
-
-import com.lishid.openinv.internal.IInventoryAccess;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.util.InternalAccessor;
-import net.minecraft.server.v1_4_6.IInventory;
-import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class InventoryAccess implements IInventoryAccess {
-
-    @Override
-    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
-    }
-
-    @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialPlayerInventory) {
-            return (SpecialPlayerInventory) inv;
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
-    }
-
-    @Override
-    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialEnderChest) {
-            return (SpecialEnderChest) inv;
-        }
-        return null;
-    }
-
-}

internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/PlayerDataManager.java

@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_6;
-
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import java.util.Arrays;
-import java.util.Collection;
-import net.minecraft.server.v1_4_6.EntityPlayer;
-import net.minecraft.server.v1_4_6.MinecraftServer;
-import net.minecraft.server.v1_4_6.PlayerInteractManager;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_4_6.CraftServer;
-import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    @Override
-    public Player loadPlayer(@NotNull OfflinePlayer offline) {
-        // Ensure the player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
-                new PlayerInteractManager(server.getWorldServer(0)));
-
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
-    }
-
-    @Override
-    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
-        return offline.getName();
-    }
-
-    @Override
-    public OfflinePlayer getPlayerByID(@NotNull String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
-    @Override
-    public @NotNull Collection<? extends Player> getOnlinePlayers() {
-        return Arrays.asList(Bukkit.getOnlinePlayers());
-    }
-
-    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().f(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 InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-        return player.openInventory(inventory.getBukkitInventory());
-    }
-
-}

internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SilentContainerChest.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_6;
-
-import net.minecraft.server.v1_4_6.ContainerChest;
-import net.minecraft.server.v1_4_6.EntityHuman;
-import net.minecraft.server.v1_4_6.IInventory;
-import net.minecraft.server.v1_4_6.ItemStack;
-import net.minecraft.server.v1_4_6.PlayerInventory;
-
-class SilentContainerChest extends ContainerChest {
-
-    SilentContainerChest(IInventory i1, IInventory i2) {
-        super(i1, i2);
-        // Send close signal
-        i2.f();
-    }
-
-    @Override
-    public void b(EntityHuman entityHuman) {
-        // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried);
-        }
-    }
-
-}

internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialEnderChest.java

@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_6;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.server.v1_4_6.EntityPlayer;
-import net.minecraft.server.v1_4_6.IInventory;
-import net.minecraft.server.v1_4_6.InventoryEnderChest;
-import net.minecraft.server.v1_4_6.InventorySubcontainer;
-import net.minecraft.server.v1_4_6.ItemStack;
-import org.bukkit.craftbukkit.v1_4_6.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-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 final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline;
-    private CraftPlayer owner;
-    private int maxStack = MAX_STACK;
-
-    public SpecialEnderChest(Player player, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
-        this.playerOnline = online;
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.owner = 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.owner = 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 ItemStack[] getContents() {
-        return this.items;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        transaction.add(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        transaction.remove(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return transaction;
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner;
-    }
-
-    @Override
-    public void setMaxStackSize(int size) {
-        maxStack = size;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return maxStack;
-    }
-
-    @Override
-    public void update() {
-        super.update();
-        enderChest.update();
-    }
-
-}

internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialPlayerInventory.java

@@ -1,225 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_6;
-
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import net.minecraft.server.v1_4_6.ItemStack;
-import net.minecraft.server.v1_4_6.PlayerInventory;
-import org.bukkit.craftbukkit.v1_4_6.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].a(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);
-            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();
-    }
-
-}

internal/pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>4.0.0</version>
+    <version>4.1.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>openinvinternal</artifactId>
@@ -30,50 +30,10 @@
 
   <profiles>
 
-    <profile>
-      <id>latest</id>
-      <modules>
-        <module>v1_14_R1</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>recent</id>
-      <!-- The recent profile is for the most recent 2 versions. -->
-      <modules>
-        <module>v1_13_R2</module>
-        <module>v1_14_R1</module>
-      </modules>
-    </profile>
-
     <profile>
       <id>all</id>
       <modules>
-        <module>1_4_5</module>
+        <module>v1_16_R3</module>
-        <module>1_4_6</module>
-        <module>v1_4_R1</module>
-        <!-- 1_5_R1 was never released -->
-        <module>v1_5_R2</module>
-        <module>v1_5_R3</module>
-        <!-- 1_6_R1 also had no tagged releases, remove? -->
-        <module>v1_6_R1</module>
-        <module>v1_6_R2</module>
-        <module>v1_6_R3</module>
-        <module>v1_7_R1</module>
-        <module>v1_7_R2</module>
-        <module>v1_7_R3</module>
-        <module>v1_7_R4</module>
-        <module>v1_8_R1</module>
-        <module>v1_8_R2</module>
-        <module>v1_8_R3</module>
-        <module>v1_9_R1</module>
-        <module>v1_9_R2</module>
-        <module>v1_10_R1</module>
-        <module>v1_11_R1</module>
-        <module>v1_12_R1</module>
-        <module>v1_13_R1</module>
-        <module>v1_13_R2</module>
-        <module>v1_14_R1</module>
       </modules>
     </profile>
 

internal/v1_10_R1/pom.xml

@@ -1,44 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2018 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.0.0</version>
-  </parent>
-
-  <artifactId>openinvadapter1_10_R1</artifactId>
-  <name>OpenInvAdapter1_10_R1</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
-      <version>1.10-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-  </dependencies>
-
-</project>

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

@@ -1,248 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_10_R1;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import java.lang.reflect.Field;
-import net.minecraft.server.v1_10_R1.AxisAlignedBB;
-import net.minecraft.server.v1_10_R1.Block;
-import net.minecraft.server.v1_10_R1.BlockChest;
-import net.minecraft.server.v1_10_R1.BlockEnderChest;
-import net.minecraft.server.v1_10_R1.BlockPosition;
-import net.minecraft.server.v1_10_R1.Entity;
-import net.minecraft.server.v1_10_R1.EntityOcelot;
-import net.minecraft.server.v1_10_R1.EntityPlayer;
-import net.minecraft.server.v1_10_R1.EnumDirection;
-import net.minecraft.server.v1_10_R1.EnumGamemode;
-import net.minecraft.server.v1_10_R1.ITileInventory;
-import net.minecraft.server.v1_10_R1.InventoryEnderChest;
-import net.minecraft.server.v1_10_R1.InventoryLargeChest;
-import net.minecraft.server.v1_10_R1.PlayerInteractManager;
-import net.minecraft.server.v1_10_R1.StatisticList;
-import net.minecraft.server.v1_10_R1.TileEntity;
-import net.minecraft.server.v1_10_R1.TileEntityChest;
-import net.minecraft.server.v1_10_R1.TileEntityEnderChest;
-import net.minecraft.server.v1_10_R1.World;
-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()).m();
-        }
-
-        // 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()).l() || 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.X);
-            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.X);
-            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.g == BlockChest.Type.BASIC) {
-                player.b(StatisticList.ac);
-            } else if (blockChest.g == BlockChest.Type.TRAP) {
-                player.b(StatisticList.W);
-            }
-        }
-
-        // 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 = 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_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/InventoryAccess.java

@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_10_R1;
-
-import com.lishid.openinv.internal.IInventoryAccess;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.util.InternalAccessor;
-import net.minecraft.server.v1_10_R1.IInventory;
-import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class InventoryAccess implements IInventoryAccess {
-
-    @Override
-    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
-    }
-
-    @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialPlayerInventory) {
-            return (SpecialPlayerInventory) inv;
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
-    }
-
-    @Override
-    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialEnderChest) {
-            return (SpecialEnderChest) inv;
-        }
-        return null;
-    }
-
-}

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

@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_10_R1;
-
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.mojang.authlib.GameProfile;
-import java.util.Collection;
-import java.util.UUID;
-import net.minecraft.server.v1_10_R1.EntityPlayer;
-import net.minecraft.server.v1_10_R1.MinecraftServer;
-import net.minecraft.server.v1_10_R1.PlayerInteractManager;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    @Override
-    public Player loadPlayer(@NotNull OfflinePlayer offline) {
-        // Ensure player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        // Create a profile and entity to load the player data
-        GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
-                new PlayerInteractManager(server.getWorldServer(0)));
-
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
-    }
-
-    @Override
-    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
-        return offline.getUniqueId().toString();
-    }
-
-    @Override
-    public OfflinePlayer getPlayerByID(@NotNull String identifier) {
-        try {
-            UUID uuid = UUID.fromString(identifier);
-            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
-            // Ensure player is a real player, otherwise return null
-            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-                return null;
-            }
-            return player;
-        } catch (IllegalArgumentException e) {
-            // Not a UUID
-            return null;
-        }
-    }
-
-    @Override
-    public @NotNull Collection<? extends Player> getOnlinePlayers() {
-        return Bukkit.getOnlinePlayers();
-    }
-
-    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;
-    }
-
-    @Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-        return player.openInventory(inventory.getBukkitInventory());
-    }
-
-}

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

@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_10_R1;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import net.minecraft.server.v1_10_R1.EntityPlayer;
-import net.minecraft.server.v1_10_R1.IInventory;
-import net.minecraft.server.v1_10_R1.InventoryEnderChest;
-import net.minecraft.server.v1_10_R1.InventorySubcontainer;
-import net.minecraft.server.v1_10_R1.ItemStack;
-import org.bukkit.craftbukkit.v1_10_R1.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();
-        setItemArrays(this, enderChest.getContents());
-    }
-
-    private void setItemArrays(InventorySubcontainer subcontainer, ItemStack[] items) {
-        try {
-            // Prepare to remove final modifier
-            Field modifiers = Field.class.getDeclaredField("modifiers");
-            modifiers.setAccessible(true);
-            // Access and replace main inventory array
-            Field field = InventorySubcontainer.class.getField("items");
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(subcontainer, items);
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        } catch (SecurityException e) {
-            e.printStackTrace();
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @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();
-                setItemArrays(nmsPlayer.getEnderChest(), 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_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SpecialPlayerInventory.java

@@ -1,296 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_10_R1;
-
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import net.minecraft.server.v1_10_R1.EntityHuman;
-import net.minecraft.server.v1_10_R1.ItemStack;
-import net.minecraft.server.v1_10_R1.PlayerInventory;
-import org.bukkit.craftbukkit.v1_10_R1.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[4];
-    private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline;
-
-    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
-        this.playerOnline = online;
-        setItemArrays(this, player.inventory.items, player.inventory.armor, player.inventory.extraSlots);
-    }
-
-    private void setItemArrays(PlayerInventory inventory, ItemStack[] items, ItemStack[] armor,
-            ItemStack[] extraSlots) {
-        try {
-            // Prepare to remove final modifier
-            Field modifiers = Field.class.getDeclaredField("modifiers");
-            modifiers.setAccessible(true);
-
-            // Access and replace main inventory array
-            Field field = PlayerInventory.class.getField("items");
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, items);
-
-            // Access and replace armor inventory array
-            field = PlayerInventory.class.getField("armor");
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, armor);
-
-            // Access and replace offhand inventory array
-            field = PlayerInventory.class.getField("extraSlots");
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, extraSlots);
-
-            // Access and replace array containing all inventory arrays
-            field = PlayerInventory.class.getDeclaredField("g");
-            field.setAccessible(true);
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, new ItemStack[][] { items, armor, extraSlots });
-        } catch (NoSuchFieldException e) {
-            // Unable to set final fields to item arrays, we're screwed. Noisily fail.
-            e.printStackTrace();
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public @NotNull Inventory getBukkitInventory() {
-        return inventory;
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull Player player) {
-        if (!playerOnline) {
-            this.player = PlayerDataManager.getHandle(player);
-            setItemArrays(this.player.inventory, items, armor, extraSlots);
-            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);
-        System.arraycopy(extraSlots, 0, contents, items.length + armor.length, extraSlots.length);
-        return contents;
-    }
-
-    @Override
-    public int getSize() {
-        return super.getSize() + 4;
-    }
-
-    @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.extraSlots;
-        } else if (is == this.armor) {
-            i = getReversedArmorSlotNum(i);
-        }
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.extra;
-        }
-
-        // extraSlots is, for now, just an array with length 1. No need for special handling.
-
-        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.extraSlots;
-        } else if (is == this.armor) {
-            i = getReversedArmorSlotNum(i);
-        }
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.extra;
-        }
-
-        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.extraSlots;
-        } else if (is == this.armor) {
-            i = getReversedArmorSlotNum(i);
-        }
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.extra;
-        }
-
-        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.extraSlots;
-        } else if (is == this.armor) {
-            i = getReversedArmorSlotNum(i);
-        }
-
-        if (i >= is.length) {
-            i -= is.length;
-            is = this.extra;
-        }
-
-        // 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;
-    }
-
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-}

internal/v1_11_R1/pom.xml

@@ -1,44 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2018 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.0.0</version>
-  </parent>
-
-  <artifactId>openinvadapter1_11_R1</artifactId>
-  <name>OpenInvAdapter1_11_R1</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
-      <version>1.11.2-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-  </dependencies>
-
-</project>

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

@@ -1,293 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_11_R1;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import java.lang.reflect.Field;
-import net.minecraft.server.v1_11_R1.AxisAlignedBB;
-import net.minecraft.server.v1_11_R1.Block;
-import net.minecraft.server.v1_11_R1.BlockChest;
-import net.minecraft.server.v1_11_R1.BlockEnderChest;
-import net.minecraft.server.v1_11_R1.BlockPosition;
-import net.minecraft.server.v1_11_R1.BlockShulkerBox;
-import net.minecraft.server.v1_11_R1.Entity;
-import net.minecraft.server.v1_11_R1.EntityOcelot;
-import net.minecraft.server.v1_11_R1.EntityPlayer;
-import net.minecraft.server.v1_11_R1.EnumDirection;
-import net.minecraft.server.v1_11_R1.EnumGamemode;
-import net.minecraft.server.v1_11_R1.IBlockData;
-import net.minecraft.server.v1_11_R1.ITileInventory;
-import net.minecraft.server.v1_11_R1.InventoryEnderChest;
-import net.minecraft.server.v1_11_R1.InventoryLargeChest;
-import net.minecraft.server.v1_11_R1.PlayerInteractManager;
-import net.minecraft.server.v1_11_R1.StatisticList;
-import net.minecraft.server.v1_11_R1.TileEntity;
-import net.minecraft.server.v1_11_R1.TileEntityChest;
-import net.minecraft.server.v1_11_R1.TileEntityEnderChest;
-import net.minecraft.server.v1_11_R1.TileEntityShulkerBox;
-import net.minecraft.server.v1_11_R1.World;
-import org.bukkit.Material;
-import org.bukkit.block.BlockState;
-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) {
-        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;
-    }
-
-    @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());
-        IBlockData blockData = world.getType(blockPosition);
-        Block block = blockData.getBlock();
-
-        if (block instanceof BlockShulkerBox) {
-            return isBlockedShulkerBox(world, blockPosition, blockData);
-        }
-
-        if (block instanceof BlockEnderChest) {
-            // Ender chests are not blocked by ocelots.
-            return world.getType(blockPosition.up()).m();
-        }
-
-        // 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 isBlockedShulkerBox(World world, BlockPosition blockPosition, IBlockData blockData) {
-        // For reference, look at net.minecraft.server.BlockShulkerBox
-        TileEntity tile = world.getTileEntity(blockPosition);
-
-        if (!(tile instanceof TileEntityShulkerBox)) {
-            return false;
-        }
-
-        EnumDirection enumDirection = blockData.get(BlockShulkerBox.a);
-        if (((TileEntityShulkerBox) tile).p() == TileEntityShulkerBox.AnimationPhase.CLOSED) {
-            AxisAlignedBB axisAlignedBB = Block.j.b(0.5F * enumDirection.getAdjacentX(),
-                    0.5F * enumDirection.getAdjacentY(), 0.5F * enumDirection.getAdjacentZ())
-                    .a(enumDirection.getAdjacentX(), enumDirection.getAdjacentY(),
-                            enumDirection.getAdjacentZ());
-
-            try {
-                // 1.11.2
-                return world.a(axisAlignedBB.a(blockPosition.shift(enumDirection)));
-            } catch (NoSuchMethodError e) {
-                // 1.11
-                return world.b(axisAlignedBB.a(blockPosition.shift(enumDirection)));
-            }
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedChest(World world, BlockPosition blockPosition) {
-        // For reference, loot at net.minecraft.server.BlockChest
-        return world.getType(blockPosition.up()).m() || 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.getStatistic("stat.enderchestOpened"));
-            return true;
-        }
-
-        final World world = player.world;
-        final BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        final 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.getStatistic("stat.enderchestOpened"));
-            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.g == BlockChest.Type.BASIC) {
-                player.b(StatisticList.getStatistic("stat.chestOpened"));
-            } else if (blockChest.g == BlockChest.Type.TRAP) {
-                player.b(StatisticList.getStatistic("stat.trappedChestTriggered"));
-            }
-        }
-
-        if (block instanceof BlockShulkerBox) {
-            player.b(StatisticList.getStatistic("stat.shulkerBoxOpened"));
-        }
-
-        // 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:
-        case SHULKER_BOX:
-            break;
-        default:
-            return;
-        }
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
-        this.forceGameMode(player, EnumGamemode.SPECTATOR);
-        player.activeContainer.b(player);
-        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_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/InventoryAccess.java

@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_11_R1;
-
-import com.lishid.openinv.internal.IInventoryAccess;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.util.InternalAccessor;
-import net.minecraft.server.v1_11_R1.IInventory;
-import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class InventoryAccess implements IInventoryAccess {
-
-    @Override
-    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
-    }
-
-    @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialPlayerInventory) {
-            return (SpecialPlayerInventory) inv;
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
-    }
-
-    @Override
-    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialEnderChest) {
-            return (SpecialEnderChest) inv;
-        }
-        return null;
-    }
-
-}

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

@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_11_R1;
-
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.mojang.authlib.GameProfile;
-import java.util.Collection;
-import java.util.UUID;
-import net.minecraft.server.v1_11_R1.EntityPlayer;
-import net.minecraft.server.v1_11_R1.MinecraftServer;
-import net.minecraft.server.v1_11_R1.PlayerInteractManager;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    @Override
-    public Player loadPlayer(@NotNull OfflinePlayer offline) {
-        // Ensure player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        // Create a profile and entity to load the player data
-        GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
-                new PlayerInteractManager(server.getWorldServer(0)));
-
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
-    }
-
-    @Override
-    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
-        return offline.getUniqueId().toString();
-    }
-
-    @Override
-    public OfflinePlayer getPlayerByID(@NotNull String identifier) {
-        try {
-            UUID uuid = UUID.fromString(identifier);
-            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
-            // Ensure player is a real player, otherwise return null
-            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-                return null;
-            }
-            return player;
-        } catch (IllegalArgumentException e) {
-            // Not a UUID
-            return null;
-        }
-    }
-
-    @Override
-    public @NotNull Collection<? extends Player> getOnlinePlayers() {
-        return Bukkit.getOnlinePlayers();
-    }
-
-    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;
-    }
-
-    @Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-        return player.openInventory(inventory.getBukkitInventory());
-    }
-
-}

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

@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_11_R1;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.List;
-import net.minecraft.server.v1_11_R1.EntityPlayer;
-import net.minecraft.server.v1_11_R1.IInventory;
-import net.minecraft.server.v1_11_R1.InventoryEnderChest;
-import net.minecraft.server.v1_11_R1.InventorySubcontainer;
-import net.minecraft.server.v1_11_R1.ItemStack;
-import org.bukkit.craftbukkit.v1_11_R1.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();
-        setItemLists(this, enderChest.getContents());
-    }
-
-    private void setItemLists(InventorySubcontainer subcontainer, List<ItemStack> list) {
-        try {
-            // Prepare to remove final modifier
-            Field modifiers = Field.class.getDeclaredField("modifiers");
-            modifiers.setAccessible(true);
-            // Access and replace main inventory array
-            Field field = InventorySubcontainer.class.getField("items");
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(subcontainer, list);
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        } catch (SecurityException e) {
-            e.printStackTrace();
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @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();
-                setItemLists(nmsPlayer.getEnderChest(), 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_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SpecialPlayerInventory.java

@@ -1,259 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_11_R1;
-
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import net.minecraft.server.v1_11_R1.ContainerUtil;
-import net.minecraft.server.v1_11_R1.EntityHuman;
-import net.minecraft.server.v1_11_R1.ItemStack;
-import net.minecraft.server.v1_11_R1.NonNullList;
-import net.minecraft.server.v1_11_R1.PlayerInventory;
-import org.bukkit.craftbukkit.v1_11_R1.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 CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline;
-
-    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
-        this.playerOnline = online;
-        setItemArrays(this, player.inventory.items, player.inventory.armor, player.inventory.extraSlots);
-    }
-
-    private void setItemArrays(PlayerInventory inventory, NonNullList<ItemStack> items,
-            NonNullList<ItemStack> armor, NonNullList<ItemStack> extraSlots) {
-        try {
-            // Prepare to remove final modifier
-            Field modifiers = Field.class.getDeclaredField("modifiers");
-            modifiers.setAccessible(true);
-
-            // Access and replace main inventory array
-            Field field = PlayerInventory.class.getField("items");
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, items);
-
-            // Access and replace armor inventory array
-            field = PlayerInventory.class.getField("armor");
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, armor);
-
-            // Access and replace offhand inventory array
-            field = PlayerInventory.class.getField("extraSlots");
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, extraSlots);
-
-            // Access and replace array containing all inventory arrays
-            field = PlayerInventory.class.getDeclaredField("g");
-            field.setAccessible(true);
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, Arrays.asList(items, armor, extraSlots));
-        } catch (NoSuchFieldException e) {
-            // Unable to set final fields to item arrays, we're screwed. Noisily fail.
-            e.printStackTrace();
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public @NotNull Inventory getBukkitInventory() {
-        return inventory;
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull Player player) {
-        if (!playerOnline) {
-            this.player = PlayerDataManager.getHandle(player);
-            setItemArrays(this.player.inventory, items, armor, extraSlots);
-            playerOnline = true;
-        }
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        playerOnline = false;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
-    @Override
-    public int getSize() {
-        return super.getSize() + 4;
-    }
-
-    @Override
-    public ItemStack getItem(int i) {
-        NonNullList<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            return ItemStack.a;
-        }
-
-        return list.get(i);
-    }
-
-    @Override
-    public ItemStack splitStack(int i, int j) {
-        NonNullList<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = 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) {
-        NonNullList<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = 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 void setItem(int i, ItemStack itemstack) {
-        NonNullList<ItemStack> list = this.items;
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            player.drop(itemstack, true);
-            return;
-        }
-
-        list.set(i, itemstack);
-    }
-
-    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;
-    }
-
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-}

internal/v1_12_R1/pom.xml

@@ -1,57 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2018 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.0.0</version>
-  </parent>
-
-  <artifactId>openinvadapter1_12_R1</artifactId>
-  <name>OpenInvAdapter1_12_R1</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
-      <version>1.12-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

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

@@ -1,291 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_12_R1;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import java.lang.reflect.Field;
-import net.minecraft.server.v1_12_R1.AxisAlignedBB;
-import net.minecraft.server.v1_12_R1.Block;
-import net.minecraft.server.v1_12_R1.BlockChest;
-import net.minecraft.server.v1_12_R1.BlockEnderChest;
-import net.minecraft.server.v1_12_R1.BlockPosition;
-import net.minecraft.server.v1_12_R1.BlockShulkerBox;
-import net.minecraft.server.v1_12_R1.Entity;
-import net.minecraft.server.v1_12_R1.EntityOcelot;
-import net.minecraft.server.v1_12_R1.EntityPlayer;
-import net.minecraft.server.v1_12_R1.EnumDirection;
-import net.minecraft.server.v1_12_R1.EnumGamemode;
-import net.minecraft.server.v1_12_R1.IBlockData;
-import net.minecraft.server.v1_12_R1.ITileInventory;
-import net.minecraft.server.v1_12_R1.InventoryEnderChest;
-import net.minecraft.server.v1_12_R1.InventoryLargeChest;
-import net.minecraft.server.v1_12_R1.PlayerInteractManager;
-import net.minecraft.server.v1_12_R1.TileEntity;
-import net.minecraft.server.v1_12_R1.TileEntityChest;
-import net.minecraft.server.v1_12_R1.TileEntityEnderChest;
-import net.minecraft.server.v1_12_R1.TileEntityShulkerBox;
-import net.minecraft.server.v1_12_R1.World;
-import org.bukkit.Material;
-import org.bukkit.Statistic;
-import org.bukkit.block.BlockState;
-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 (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;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(@NotNull final Player p, @NotNull final org.bukkit.block.Block bukkitBlock) {
-
-        World world = PlayerDataManager.getHandle(p).world;
-        BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        IBlockData blockData = world.getType(blockPosition);
-        Block block = blockData.getBlock();
-
-        if (block instanceof BlockShulkerBox) {
-            return this.isBlockedShulkerBox(world, blockPosition, blockData);
-        }
-
-        if (block instanceof BlockEnderChest) {
-            // Ender chests are not blocked by ocelots.
-            return world.getType(blockPosition.up()).m();
-        }
-
-        // Check if chest is blocked or has an ocelot on top
-        if (this.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 (this.isBlockedChest(world, localBlockPosition)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedShulkerBox(final World world, final BlockPosition blockPosition,
-                                        final IBlockData blockData) {
-        // For reference, look at net.minecraft.server.BlockShulkerBox
-        TileEntity tile = world.getTileEntity(blockPosition);
-
-        if (!(tile instanceof TileEntityShulkerBox)) {
-            return false;
-        }
-
-        EnumDirection enumDirection = blockData.get(BlockShulkerBox.a);
-        if (((TileEntityShulkerBox) tile).p() == TileEntityShulkerBox.AnimationPhase.CLOSED) {
-            AxisAlignedBB axisAlignedBB = Block.j.b(0.5F * enumDirection.getAdjacentX(),
-                    0.5F * enumDirection.getAdjacentY(), 0.5F * enumDirection.getAdjacentZ())
-                    .a(enumDirection.getAdjacentX(), enumDirection.getAdjacentY(),
-                            enumDirection.getAdjacentZ());
-
-            return world.a(axisAlignedBB.a(blockPosition.shift(enumDirection)));
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedChest(final World world, final BlockPosition blockPosition) {
-        // For reference, loot at net.minecraft.server.BlockChest
-        return world.getType(blockPosition.up()).l() || this.hasOcelotOnTop(world, blockPosition);
-    }
-
-    private boolean hasOcelotOnTop(final World world, final 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 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 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);
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            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.g == BlockChest.Type.BASIC) {
-                bukkitPlayer.incrementStatistic(Statistic.CHEST_OPENED);
-            } else if (blockChest.g == BlockChest.Type.TRAP) {
-                bukkitPlayer.incrementStatistic(Statistic.TRAPPED_CHEST_TRIGGERED);
-            }
-        }
-
-        if (block instanceof BlockShulkerBox) {
-            bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED);
-        }
-
-        // 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;
-        }
-
-        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:
-            break;
-        default:
-            return;
-        }
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
-        this.forceGameMode(player, EnumGamemode.SPECTATOR);
-        player.activeContainer.b(player);
-        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_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/InventoryAccess.java

@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_12_R1;
-
-import com.lishid.openinv.internal.IInventoryAccess;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.util.InternalAccessor;
-import net.minecraft.server.v1_12_R1.IInventory;
-import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class InventoryAccess implements IInventoryAccess {
-
-    @Override
-    public ISpecialEnderChest getSpecialEnderChest(@NotNull final Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialEnderChest) {
-            return (SpecialEnderChest) inv;
-        }
-        return null;
-    }
-
-    @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull final Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialPlayerInventory) {
-            return (SpecialPlayerInventory) inv;
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isSpecialEnderChest(@NotNull final Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class,
-                inventory) instanceof ISpecialEnderChest;
-    }
-
-    @Override
-    public boolean isSpecialPlayerInventory(@NotNull final Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class,
-                inventory) instanceof ISpecialPlayerInventory;
-    }
-
-}

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

@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_12_R1;
-
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.mojang.authlib.GameProfile;
-import java.util.Collection;
-import java.util.UUID;
-import net.minecraft.server.v1_12_R1.EntityPlayer;
-import net.minecraft.server.v1_12_R1.MinecraftServer;
-import net.minecraft.server.v1_12_R1.PlayerInteractManager;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_12_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    public static EntityPlayer getHandle(final Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException(
-                    "Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
-    @Override
-    public @NotNull Collection<? extends Player> getOnlinePlayers() {
-        return Bukkit.getOnlinePlayers();
-    }
-
-    @Override
-    public OfflinePlayer getPlayerByID(@NotNull final String identifier) {
-        try {
-            UUID uuid = UUID.fromString(identifier);
-            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
-            // Ensure player is a real player, otherwise return null
-            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-                return null;
-            }
-            return player;
-        } catch (IllegalArgumentException e) {
-            // Not a UUID
-            return null;
-        }
-    }
-
-    @NotNull @Override
-    public String getPlayerDataID(@NotNull final OfflinePlayer offline) {
-        return offline.getUniqueId().toString();
-    }
-
-    @Override
-    public Player loadPlayer(@NotNull final OfflinePlayer offline) {
-        // Ensure player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        // Create a profile and entity to load the player data
-        GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
-                new PlayerInteractManager(server.getWorldServer(0)));
-
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
-    }
-
-    @Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-        return player.openInventory(inventory.getBukkitInventory());
-    }
-
-}

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

@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_12_R1;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.List;
-import net.minecraft.server.v1_12_R1.EntityPlayer;
-import net.minecraft.server.v1_12_R1.IInventory;
-import net.minecraft.server.v1_12_R1.InventoryEnderChest;
-import net.minecraft.server.v1_12_R1.InventorySubcontainer;
-import net.minecraft.server.v1_12_R1.ItemStack;
-import org.bukkit.craftbukkit.v1_12_R1.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(final Player player, final 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.setItemLists(this, this.enderChest.getContents());
-    }
-
-    @Override
-    public @NotNull Inventory getBukkitInventory() {
-        return inventory;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
-    private void setItemLists(final InventorySubcontainer subcontainer,
-            final List<ItemStack> list) {
-        try {
-            // Prepare to remove final modifier
-            Field modifiers = Field.class.getDeclaredField("modifiers");
-            modifiers.setAccessible(true);
-            // Access and replace main inventory array
-            Field field = InventorySubcontainer.class.getField("items");
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(subcontainer, list);
-        } catch (NoSuchFieldException | SecurityException | IllegalArgumentException
-                | IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        this.playerOnline = false;
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull final Player player) {
-        if (!this.playerOnline) {
-            try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
-                this.bukkitOwner = nmsPlayer.getBukkitEntity();
-                this.setItemLists(nmsPlayer.getEnderChest(), this.items);
-            } catch (Exception ignored) {}
-            this.playerOnline = true;
-        }
-    }
-
-    @Override
-    public void update() {
-        super.update();
-        this.enderChest.update();
-    }
-
-}

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

@@ -1,256 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_12_R1;
-
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import net.minecraft.server.v1_12_R1.ContainerUtil;
-import net.minecraft.server.v1_12_R1.EntityHuman;
-import net.minecraft.server.v1_12_R1.ItemStack;
-import net.minecraft.server.v1_12_R1.NonNullList;
-import net.minecraft.server.v1_12_R1.PlayerInventory;
-import org.bukkit.craftbukkit.v1_12_R1.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 CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline;
-
-    public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
-        this.playerOnline = online;
-        this.setItemArrays(this, this.player.inventory.items, this.player.inventory.armor,
-                this.player.inventory.extraSlots);
-    }
-
-    @Override
-    public boolean a(final EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public @NotNull Inventory getBukkitInventory() {
-        return inventory;
-    }
-
-    @Override
-    public ItemStack getItem(int i) {
-        NonNullList<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);
-    }
-
-    @Override
-    public String getName() {
-        if (this.player.getName().length() > 16) {
-            return this.player.getName().substring(0, 16);
-        }
-        return this.player.getName();
-    }
-
-    @Override
-    public boolean hasCustomName() {
-        return true;
-    }
-
-    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 super.getSize() + 4;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
-    @Override
-    public void setItem(int i, final ItemStack itemstack) {
-        NonNullList<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);
-    }
-
-    private void setItemArrays(final PlayerInventory inventory, final NonNullList<ItemStack> items,
-            final NonNullList<ItemStack> armor, final NonNullList<ItemStack> extraSlots) {
-        try {
-            // Prepare to remove final modifier
-            Field modifiers = Field.class.getDeclaredField("modifiers");
-            modifiers.setAccessible(true);
-
-            // Access and replace main inventory list
-            Field field = PlayerInventory.class.getField("items");
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, items);
-
-            // Access and replace armor inventory list
-            field = PlayerInventory.class.getField("armor");
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, armor);
-
-            // Access and replace offhand inventory list
-            field = PlayerInventory.class.getField("extraSlots");
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, extraSlots);
-
-            // Access and replace list containing all inventory lists
-            field = PlayerInventory.class.getDeclaredField("f");
-            field.setAccessible(true);
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, Arrays.asList(items, armor, extraSlots));
-        } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
-            // Unable to set final fields to item lists, we're screwed. Noisily fail.
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        this.playerOnline = false;
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull final Player player) {
-        if (!this.playerOnline) {
-            this.player = PlayerDataManager.getHandle(player);
-            this.setItemArrays(this.player.inventory, this.items, this.armor, this.extraSlots);
-            this.playerOnline = true;
-        }
-    }
-
-    @Override
-    public ItemStack splitStack(int i, final int j) {
-        NonNullList<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) {
-        NonNullList<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;
-    }
-
-}

internal/v1_13_R1/pom.xml

@@ -1,57 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2018 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.0.0</version>
-  </parent>
-
-  <artifactId>openinvadapter1_13_R1</artifactId>
-  <name>OpenInvAdapter1_13_R1</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
-      <version>1.13-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

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

@@ -1,297 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_13_R1;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import java.lang.reflect.Field;
-import net.minecraft.server.v1_13_R1.AxisAlignedBB;
-import net.minecraft.server.v1_13_R1.Block;
-import net.minecraft.server.v1_13_R1.BlockChest;
-import net.minecraft.server.v1_13_R1.BlockChestTrapped;
-import net.minecraft.server.v1_13_R1.BlockEnderChest;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.BlockPropertyChestType;
-import net.minecraft.server.v1_13_R1.BlockShulkerBox;
-import net.minecraft.server.v1_13_R1.ChatMessage;
-import net.minecraft.server.v1_13_R1.Entity;
-import net.minecraft.server.v1_13_R1.EntityOcelot;
-import net.minecraft.server.v1_13_R1.EntityPlayer;
-import net.minecraft.server.v1_13_R1.EnumDirection;
-import net.minecraft.server.v1_13_R1.EnumGamemode;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.ITileInventory;
-import net.minecraft.server.v1_13_R1.InventoryEnderChest;
-import net.minecraft.server.v1_13_R1.InventoryLargeChest;
-import net.minecraft.server.v1_13_R1.PlayerInteractManager;
-import net.minecraft.server.v1_13_R1.TileEntity;
-import net.minecraft.server.v1_13_R1.TileEntityChest;
-import net.minecraft.server.v1_13_R1.TileEntityEnderChest;
-import net.minecraft.server.v1_13_R1.TileEntityShulkerBox;
-import net.minecraft.server.v1_13_R1.VoxelShapes;
-import net.minecraft.server.v1_13_R1.World;
-import org.bukkit.Material;
-import org.bukkit.Statistic;
-import org.bukkit.block.BlockState;
-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 (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;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(@NotNull final Player bukkitPlayer, @NotNull final org.bukkit.block.Block bukkitBlock) {
-
-        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
-        BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        IBlockData blockData = world.getType(blockPosition);
-        Block block = blockData.getBlock();
-
-        if (block instanceof BlockShulkerBox) {
-            return this.isBlockedShulkerBox(world, blockPosition, blockData);
-        }
-
-        if (block instanceof BlockEnderChest) {
-            // Ender chests are not blocked by ocelots.
-            return world.getType(blockPosition.up()).isOccluding();
-        }
-
-        // Check if chest is blocked or has an ocelot on top
-        if (this.isBlockedChest(world, blockPosition)) {
-            return true;
-        }
-
-        // Check for matching adjacent chests that are blocked or have an ocelot on top
-        BlockPropertyChestType chestType = blockData.get(BlockChest.b);
-
-        if (chestType == BlockPropertyChestType.SINGLE) {
-            return false;
-        }
-
-        BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.k(blockData));
-        IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
-
-        if (adjacentBlockData.getBlock() == block) {
-
-            BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.b);
-
-            if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
-                    && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
-
-                return this.isBlockedChest(world, adjacentBlockPosition);
-            }
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedShulkerBox(final World world, final BlockPosition blockPosition,
-                                        final IBlockData blockData) {
-        // For reference, look at net.minecraft.server.BlockShulkerBox
-        TileEntity tile = world.getTileEntity(blockPosition);
-
-        if (!(tile instanceof TileEntityShulkerBox)) {
-            return false;
-        }
-
-        EnumDirection enumDirection = blockData.get(BlockShulkerBox.a);
-        if (((TileEntityShulkerBox) tile).r() == TileEntityShulkerBox.AnimationPhase.CLOSED) {
-            AxisAlignedBB axisAlignedBB = VoxelShapes.b().a()
-                    .b(0.5F * enumDirection.getAdjacentX(), 0.5F * enumDirection.getAdjacentY(), 0.5F * enumDirection.getAdjacentZ())
-                    .a(enumDirection.getAdjacentX(), enumDirection.getAdjacentY(), enumDirection.getAdjacentZ());
-            return !world.getCubes(null, axisAlignedBB.a(blockPosition.shift(enumDirection)));
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedChest(final World world, final BlockPosition blockPosition) {
-        // For reference, loot at net.minecraft.server.BlockChest
-        return world.getType(blockPosition.up()).isOccluding() || this.hasOcelotOnTop(world, blockPosition);
-    }
-
-    private boolean hasOcelotOnTop(final World world, final BlockPosition blockPosition) {
-        for (Entity entity : world.a(EntityOcelot.class,
-                new AxisAlignedBB(blockPosition.getX(), blockPosition.getY() + 1,
-                        blockPosition.getZ(), blockPosition.getX() + 1, blockPosition.getY() + 2,
-                        blockPosition.getZ() + 1))) {
-            EntityOcelot entityOcelot = (EntityOcelot) entity;
-            if (entityOcelot.isSitting()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean activateContainer(@NotNull final Player bukkitPlayer, final boolean silentsilent,
-            @NotNull final org.bukkit.block.Block bukkitBlock) {
-
-        // Silent ender chest is API-only
-        if (silentsilent && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        EntityPlayer player = com.lishid.openinv.internal.v1_13_R1.PlayerDataManager.getHandle(bukkitPlayer);
-
-        final World world = player.world;
-        final BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        final 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);
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        if (!(tile instanceof ITileInventory)) {
-            return false;
-        }
-
-        ITileInventory tileInventory = (ITileInventory) tile;
-        IBlockData blockData = world.getType(blockPosition);
-        Block block = blockData.getBlock();
-
-        if (block instanceof BlockChest) {
-
-            BlockPropertyChestType chestType = blockData.get(BlockChest.b);
-
-            if (chestType != BlockPropertyChestType.SINGLE) {
-
-                BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.k(blockData));
-                IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
-
-                if (adjacentBlockData.getBlock() == block) {
-
-                    BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.b);
-
-                    if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
-                            && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
-
-                        TileEntity adjacentTile = world.getTileEntity(adjacentBlockPosition);
-
-                        if (adjacentTile instanceof TileEntityChest) {
-                            ITileInventory rightChest = chestType == BlockPropertyChestType.RIGHT ? tileInventory : (ITileInventory) adjacentTile;
-                            ITileInventory leftChest = chestType == BlockPropertyChestType.RIGHT ? (ITileInventory) adjacentTile : tileInventory;
-                            tileInventory = new InventoryLargeChest(new ChatMessage("container.chestDouble"), rightChest, leftChest);
-                        }
-                    }
-                }
-            }
-
-            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);
-        }
-
-        // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
-        if (!silentsilent || 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:
-        case SHULKER_BOX:
-            break;
-        default:
-            return;
-        }
-
-        EntityPlayer player = com.lishid.openinv.internal.v1_13_R1.PlayerDataManager.getHandle(bukkitPlayer);
-
-        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
-        this.forceGameMode(player, EnumGamemode.SPECTATOR);
-        player.activeContainer.b(player);
-        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_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/InventoryAccess.java

@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_13_R1;
-
-import com.lishid.openinv.internal.IInventoryAccess;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.util.InternalAccessor;
-import net.minecraft.server.v1_13_R1.IInventory;
-import org.bukkit.craftbukkit.v1_13_R1.inventory.CraftInventory;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class InventoryAccess implements IInventoryAccess {
-
-    @Override
-    public ISpecialEnderChest getSpecialEnderChest(@NotNull final Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof com.lishid.openinv.internal.v1_13_R1.SpecialEnderChest) {
-            return (com.lishid.openinv.internal.v1_13_R1.SpecialEnderChest) inv;
-        }
-        return null;
-    }
-
-    @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull final Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof com.lishid.openinv.internal.v1_13_R1.SpecialPlayerInventory) {
-            return (com.lishid.openinv.internal.v1_13_R1.SpecialPlayerInventory) inv;
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isSpecialEnderChest(@NotNull final Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class,
-                inventory) instanceof ISpecialEnderChest;
-    }
-
-    @Override
-    public boolean isSpecialPlayerInventory(@NotNull final Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class,
-                inventory) instanceof ISpecialPlayerInventory;
-    }
-
-}

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

@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_13_R1;
-
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.mojang.authlib.GameProfile;
-import java.util.Collection;
-import java.util.UUID;
-import net.minecraft.server.v1_13_R1.EntityPlayer;
-import net.minecraft.server.v1_13_R1.MinecraftServer;
-import net.minecraft.server.v1_13_R1.PlayerInteractManager;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    public static EntityPlayer getHandle(final Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
-    @Override
-    public @NotNull Collection<? extends Player> getOnlinePlayers() {
-        return Bukkit.getOnlinePlayers();
-    }
-
-    @Override
-    public OfflinePlayer getPlayerByID(@NotNull final String identifier) {
-        try {
-            UUID uuid = UUID.fromString(identifier);
-            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
-            // Ensure player is a real player, otherwise return null
-            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-                return null;
-            }
-            return player;
-        } catch (IllegalArgumentException e) {
-            // Not a UUID
-            return null;
-        }
-    }
-
-    @Override
-    public @NotNull String getPlayerDataID(@NotNull final OfflinePlayer offline) {
-        return offline.getUniqueId().toString();
-    }
-
-    @Override
-    public Player loadPlayer(@NotNull final OfflinePlayer offline) {
-        // Ensure player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        // Create a profile and entity to load the player data
-        GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
-                new PlayerInteractManager(server.getWorldServer(0)));
-
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
-    }
-
-    @Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-        return player.openInventory(inventory.getBukkitInventory());
-    }
-
-}

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

@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_13_R1;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.List;
-import net.minecraft.server.v1_13_R1.EntityPlayer;
-import net.minecraft.server.v1_13_R1.IInventory;
-import net.minecraft.server.v1_13_R1.InventoryEnderChest;
-import net.minecraft.server.v1_13_R1.InventorySubcontainer;
-import net.minecraft.server.v1_13_R1.ItemStack;
-import org.bukkit.craftbukkit.v1_13_R1.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(final Player player, final Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getDisplayName(),
-                PlayerDataManager.getHandle(player).getEnderChest().getSize(), player);
-        this.playerOnline = online;
-        this.enderChest = PlayerDataManager.getHandle(player).getEnderChest();
-        this.setItemLists(this, this.enderChest.getContents());
-    }
-
-    @Override
-    public @NotNull Inventory getBukkitInventory() {
-        return inventory;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
-    private void setItemLists(final InventorySubcontainer subcontainer, final List<ItemStack> list) {
-        try {
-            // Prepare to remove final modifier
-            Field modifiers = Field.class.getDeclaredField("modifiers");
-            modifiers.setAccessible(true);
-            // Access and replace main inventory array
-            Field field = InventorySubcontainer.class.getField("items");
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(subcontainer, list);
-        } catch (NoSuchFieldException | SecurityException | IllegalArgumentException
-                | IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        this.playerOnline = false;
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull final Player player) {
-        if (!this.playerOnline) {
-            try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
-                this.bukkitOwner = nmsPlayer.getBukkitEntity();
-                this.setItemLists(nmsPlayer.getEnderChest(), this.items);
-            } catch (Exception ignored) {}
-            this.playerOnline = true;
-        }
-    }
-
-    @Override
-    public void update() {
-        super.update();
-        this.enderChest.update();
-    }
-
-}

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

@@ -1,255 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_13_R1;
-
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import net.minecraft.server.v1_13_R1.ChatMessage;
-import net.minecraft.server.v1_13_R1.ContainerUtil;
-import net.minecraft.server.v1_13_R1.EntityHuman;
-import net.minecraft.server.v1_13_R1.IChatBaseComponent;
-import net.minecraft.server.v1_13_R1.ItemStack;
-import net.minecraft.server.v1_13_R1.NonNullList;
-import net.minecraft.server.v1_13_R1.PlayerInventory;
-import org.bukkit.craftbukkit.v1_13_R1.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 CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline;
-
-    public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
-        this.playerOnline = online;
-        this.setItemArrays(this, this.player.inventory.items, this.player.inventory.armor,
-                this.player.inventory.extraSlots);
-    }
-
-    @Override
-    public boolean a(final EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public @NotNull Inventory getBukkitInventory() {
-        return inventory;
-    }
-
-    @Override
-    public ItemStack getItem(int i) {
-        NonNullList<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);
-    }
-
-    @Override
-    public IChatBaseComponent getDisplayName() {
-        return new ChatMessage(this.player.getName());
-    }
-
-    @Override
-    public boolean hasCustomName() {
-        return true;
-    }
-
-    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 super.getSize() + 4;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
-    }
-
-    @Override
-    public void setItem(int i, final ItemStack itemstack) {
-        NonNullList<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);
-    }
-
-    private void setItemArrays(final PlayerInventory inventory, final NonNullList<ItemStack> items,
-            final NonNullList<ItemStack> armor, final NonNullList<ItemStack> extraSlots) {
-        try {
-            // Prepare to remove final modifier
-            Field modifiers = Field.class.getDeclaredField("modifiers");
-            modifiers.setAccessible(true);
-
-            // Access and replace main inventory list
-            Field field = PlayerInventory.class.getField("items");
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, items);
-
-            // Access and replace armor inventory list
-            field = PlayerInventory.class.getField("armor");
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, armor);
-
-            // Access and replace offhand inventory list
-            field = PlayerInventory.class.getField("extraSlots");
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, extraSlots);
-
-            // Access and replace list containing all inventory lists
-            field = PlayerInventory.class.getDeclaredField("f");
-            field.setAccessible(true);
-            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, Arrays.asList(items, armor, extraSlots));
-        } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
-            // Unable to set final fields to item lists, we're screwed. Noisily fail.
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        this.playerOnline = false;
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull final Player player) {
-        if (!this.playerOnline) {
-            this.player = PlayerDataManager.getHandle(player);
-            this.setItemArrays(this.player.inventory, this.items, this.armor, this.extraSlots);
-            this.playerOnline = true;
-        }
-    }
-
-    @Override
-    public ItemStack splitStack(int i, final int j) {
-        NonNullList<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) {
-        NonNullList<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;
-    }
-
-}

internal/v1_13_R2/pom.xml

@@ -1,57 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2018 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.0.0</version>
-  </parent>
-
-  <artifactId>openinvadapter1_13_R2</artifactId>
-  <name>OpenInvAdapter1_13_R2</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
-      <version>1.13.2-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

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

@@ -1,309 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_13_R2;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import net.minecraft.server.v1_13_R2.AxisAlignedBB;
-import net.minecraft.server.v1_13_R2.Block;
-import net.minecraft.server.v1_13_R2.BlockChest;
-import net.minecraft.server.v1_13_R2.BlockChestTrapped;
-import net.minecraft.server.v1_13_R2.BlockEnderChest;
-import net.minecraft.server.v1_13_R2.BlockPosition;
-import net.minecraft.server.v1_13_R2.BlockPropertyChestType;
-import net.minecraft.server.v1_13_R2.BlockShulkerBox;
-import net.minecraft.server.v1_13_R2.ChatMessage;
-import net.minecraft.server.v1_13_R2.Entity;
-import net.minecraft.server.v1_13_R2.EntityOcelot;
-import net.minecraft.server.v1_13_R2.EntityPlayer;
-import net.minecraft.server.v1_13_R2.EnumDirection;
-import net.minecraft.server.v1_13_R2.EnumGamemode;
-import net.minecraft.server.v1_13_R2.IBlockData;
-import net.minecraft.server.v1_13_R2.ITileInventory;
-import net.minecraft.server.v1_13_R2.InventoryEnderChest;
-import net.minecraft.server.v1_13_R2.InventoryLargeChest;
-import net.minecraft.server.v1_13_R2.PlayerInteractManager;
-import net.minecraft.server.v1_13_R2.TileEntity;
-import net.minecraft.server.v1_13_R2.TileEntityChest;
-import net.minecraft.server.v1_13_R2.TileEntityEnderChest;
-import net.minecraft.server.v1_13_R2.TileEntityShulkerBox;
-import net.minecraft.server.v1_13_R2.VoxelShape;
-import net.minecraft.server.v1_13_R2.VoxelShapes;
-import net.minecraft.server.v1_13_R2.World;
-import org.bukkit.Material;
-import org.bukkit.Statistic;
-import org.bukkit.block.BlockState;
-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 (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;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(@NotNull final Player bukkitPlayer, @NotNull final org.bukkit.block.Block bukkitBlock) {
-
-        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
-        BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        IBlockData blockData = world.getType(blockPosition);
-        Block block = blockData.getBlock();
-
-        if (block instanceof BlockShulkerBox) {
-            return this.isBlockedShulkerBox(world, blockPosition, blockData);
-        }
-
-        if (block instanceof BlockEnderChest) {
-            // Ender chests are not blocked by ocelots.
-            return world.getType(blockPosition.up()).isOccluding();
-        }
-
-        // Check if chest is blocked or has an ocelot on top
-        if (this.isBlockedChest(world, blockPosition)) {
-            return true;
-        }
-
-        // Check for matching adjacent chests that are blocked or have an ocelot on top
-        BlockPropertyChestType chestType = blockData.get(BlockChest.b);
-
-        if (chestType == BlockPropertyChestType.SINGLE) {
-            return false;
-        }
-
-        BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.k(blockData));
-        IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
-
-        if (adjacentBlockData.getBlock() == block) {
-
-            BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.b);
-
-            if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
-                    && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
-
-                return this.isBlockedChest(world, adjacentBlockPosition);
-            }
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedShulkerBox(final World world, final BlockPosition blockPosition,
-                                        final IBlockData blockData) {
-        // For reference, look at net.minecraft.server.BlockShulkerBox
-        TileEntity tile = world.getTileEntity(blockPosition);
-
-        if (!(tile instanceof TileEntityShulkerBox)) {
-            return false;
-        }
-
-        EnumDirection enumDirection = blockData.get(BlockShulkerBox.a);
-        if (((TileEntityShulkerBox) tile).r() == TileEntityShulkerBox.AnimationPhase.CLOSED) {
-            AxisAlignedBB axisAlignedBB;
-            try {
-                Method method = VoxelShape.class.getMethod("a");
-                axisAlignedBB = (AxisAlignedBB) method.invoke(VoxelShapes.b());
-            } catch (NoSuchMethodException e) {
-                axisAlignedBB = VoxelShapes.b().getBoundingBox();
-            } catch (InvocationTargetException | IllegalAccessException e) {
-                return false;
-            }
-            axisAlignedBB = axisAlignedBB
-                    .b(0.5F * enumDirection.getAdjacentX(), 0.5F * enumDirection.getAdjacentY(), 0.5F * enumDirection.getAdjacentZ())
-                    .a(enumDirection.getAdjacentX(), enumDirection.getAdjacentY(), enumDirection.getAdjacentZ());
-            return !world.getCubes(null, axisAlignedBB.a(blockPosition.shift(enumDirection)));
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedChest(final World world, final BlockPosition blockPosition) {
-        // For reference, loot at net.minecraft.server.BlockChest
-        return world.getType(blockPosition.up()).isOccluding() || this.hasOcelotOnTop(world, blockPosition);
-    }
-
-    private boolean hasOcelotOnTop(final World world, final BlockPosition blockPosition) {
-        for (Entity entity : world.a(EntityOcelot.class,
-                new AxisAlignedBB(blockPosition.getX(), blockPosition.getY() + 1,
-                        blockPosition.getZ(), blockPosition.getX() + 1, blockPosition.getY() + 2,
-                        blockPosition.getZ() + 1))) {
-            EntityOcelot entityOcelot = (EntityOcelot) entity;
-            if (entityOcelot.isSitting()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean activateContainer(@NotNull final Player bukkitPlayer, final boolean silent,
-                                     @NotNull final org.bukkit.block.Block bukkitBlock) {
-
-        // Silent ender chest is API-only
-        if (silent && 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 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);
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        if (!(tile instanceof ITileInventory)) {
-            return false;
-        }
-
-        ITileInventory tileInventory = (ITileInventory) tile;
-        IBlockData blockData = world.getType(blockPosition);
-        Block block = blockData.getBlock();
-
-        if (block instanceof BlockChest) {
-
-            BlockPropertyChestType chestType = blockData.get(BlockChest.b);
-
-            if (chestType != BlockPropertyChestType.SINGLE) {
-
-                BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.k(blockData));
-                IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
-
-                if (adjacentBlockData.getBlock() == block) {
-
-                    BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.b);
-
-                    if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
-                            && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
-
-                        TileEntity adjacentTile = world.getTileEntity(adjacentBlockPosition);
-
-                        if (adjacentTile instanceof TileEntityChest) {
-                            ITileInventory rightChest = chestType == BlockPropertyChestType.RIGHT ? tileInventory : (ITileInventory) adjacentTile;
-                            ITileInventory leftChest = chestType == BlockPropertyChestType.RIGHT ? (ITileInventory) adjacentTile : tileInventory;
-                            tileInventory = new InventoryLargeChest(new ChatMessage("container.chestDouble"), rightChest, leftChest);
-                        }
-                    }
-                }
-            }
-
-            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);
-        }
-
-        // 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:
-        case SHULKER_BOX:
-            break;
-        default:
-            return;
-        }
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
-        this.forceGameMode(player, EnumGamemode.SPECTATOR);
-        player.activeContainer.b(player);
-        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_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/InventoryAccess.java

@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_13_R2;
-
-import com.lishid.openinv.internal.IInventoryAccess;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.util.InternalAccessor;
-import net.minecraft.server.v1_13_R2.IInventory;
-import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftInventory;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class InventoryAccess implements IInventoryAccess {
-
-    @Override
-    public ISpecialEnderChest getSpecialEnderChest(@NotNull final Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialEnderChest) {
-            return (SpecialEnderChest) inv;
-        }
-        return null;
-    }
-
-    @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull final Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialPlayerInventory) {
-            return (SpecialPlayerInventory) inv;
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isSpecialEnderChest(@NotNull final Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class,
-                inventory) instanceof ISpecialEnderChest;
-    }
-
-    @Override
-    public boolean isSpecialPlayerInventory(@NotNull final Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class,
-                inventory) instanceof ISpecialPlayerInventory;
-    }
-
-}

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

@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_13_R2;
-
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.mojang.authlib.GameProfile;
-import java.util.Collection;
-import java.util.UUID;
-import net.minecraft.server.v1_13_R2.DimensionManager;
-import net.minecraft.server.v1_13_R2.EntityPlayer;
-import net.minecraft.server.v1_13_R2.MinecraftServer;
-import net.minecraft.server.v1_13_R2.PlayerInteractManager;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    public static EntityPlayer getHandle(final Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
-    @Override
-    public @NotNull Collection<? extends Player> getOnlinePlayers() {
-        return Bukkit.getOnlinePlayers();
-    }
-
-    @Override
-    public OfflinePlayer getPlayerByID(@NotNull final String identifier) {
-        try {
-            UUID uuid = UUID.fromString(identifier);
-            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
-            // Ensure player is a real player, otherwise return null
-            if (!player.hasPlayedBefore() && !player.isOnline()) {
-                return null;
-            }
-            return player;
-        } catch (IllegalArgumentException e) {
-            // Not a UUID
-            return null;
-        }
-    }
-
-    @Override
-    public @NotNull String getPlayerDataID(@NotNull final OfflinePlayer offline) {
-        return offline.getUniqueId().toString();
-    }
-
-    @Override
-    public Player loadPlayer(@NotNull final OfflinePlayer offline) {
-        // Ensure player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        // Create a profile and entity to load the player data
-        GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(DimensionManager.OVERWORLD), profile,
-                new PlayerInteractManager(server.getWorldServer(DimensionManager.OVERWORLD)));
-
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
-    }
-
-    @Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-        return player.openInventory(inventory.getBukkitInventory());
-    }
-
-}

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

@@ -1,266 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_13_R2;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.util.List;
-import javax.annotation.Nullable;
-import net.minecraft.server.v1_13_R2.AutoRecipeOutput;
-import net.minecraft.server.v1_13_R2.AutoRecipeStackManager;
-import net.minecraft.server.v1_13_R2.ContainerUtil;
-import net.minecraft.server.v1_13_R2.EntityHuman;
-import net.minecraft.server.v1_13_R2.EntityPlayer;
-import net.minecraft.server.v1_13_R2.IChatBaseComponent;
-import net.minecraft.server.v1_13_R2.IInventory;
-import net.minecraft.server.v1_13_R2.IInventoryListener;
-import net.minecraft.server.v1_13_R2.InventoryEnderChest;
-import net.minecraft.server.v1_13_R2.ItemStack;
-import net.minecraft.server.v1_13_R2.NonNullList;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_13_R2.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-
-public class SpecialEnderChest implements IInventory, ISpecialEnderChest, AutoRecipeOutput {
-
-    private EntityPlayer owner;
-    private final IChatBaseComponent displayName;
-    private final CraftInventory inventory;
-    private NonNullList<ItemStack> items;
-    private boolean playerOnline;
-
-    public SpecialEnderChest(final Player player, final Boolean online) {
-        this.owner = PlayerDataManager.getHandle(player);
-        this.displayName = this.owner.getEnderChest().getDisplayName();
-        this.inventory = new CraftInventory(this);
-        this.items = this.owner.getEnderChest().items;
-        this.playerOnline = online;
-    }
-
-    @Override
-    public @NotNull Inventory getBukkitInventory() {
-        return this.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();
-    }
-
-    public List<ItemStack> getContents() {
-        return this.items;
-    }
-
-    public void onOpen(CraftHumanEntity who) {
-        this.owner.getEnderChest().onOpen(who);
-    }
-
-    public void onClose(CraftHumanEntity who) {
-        this.owner.getEnderChest().onClose(who);
-    }
-
-    public List<HumanEntity> getViewers() {
-        return this.owner.getEnderChest().getViewers();
-    }
-
-    public void setMaxStackSize(int i) {
-        this.owner.getEnderChest().setMaxStackSize(i);
-    }
-
-    public InventoryHolder getOwner() {
-        return this.owner.getEnderChest().getOwner();
-    }
-
-    public Location getLocation() {
-        return null;
-    }
-
-    public void a(IInventoryListener iinventorylistener) {
-        this.owner.getEnderChest().a(iinventorylistener);
-    }
-
-    public void b(IInventoryListener iinventorylistener) {
-        this.owner.getEnderChest().b(iinventorylistener);
-    }
-
-    public ItemStack getItem(int i) {
-        return i >= 0 && i < this.items.size() ? this.items.get(i) : ItemStack.a;
-    }
-
-    public ItemStack splitStack(int i, int j) {
-        ItemStack itemstack = ContainerUtil.a(this.items, i, j);
-        if (!itemstack.isEmpty()) {
-            this.update();
-        }
-
-        return itemstack;
-    }
-
-    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;
-    }
-
-    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;
-        }
-    }
-
-    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();
-    }
-
-    public int getSize() {
-        return this.owner.getEnderChest().getSize();
-    }
-
-    public boolean P_() {
-
-        for (ItemStack itemstack : this.items) {
-            if (!itemstack.isEmpty()) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    public IChatBaseComponent getDisplayName() {
-        return this.displayName;
-    }
-
-    @Nullable
-    public IChatBaseComponent getCustomName() {
-        return this.displayName;
-    }
-
-    public boolean hasCustomName() {
-        return false;
-    }
-
-    public void a(@Nullable IChatBaseComponent ichatbasecomponent) {
-        // Ignored - name is always player's name.
-    }
-
-    public int getMaxStackSize() {
-        return 64;
-    }
-
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    public void startOpen(EntityHuman entityhuman) {
-    }
-
-    public void closeContainer(EntityHuman entityhuman) {
-    }
-
-    public boolean b(int i, ItemStack itemstack) {
-        return true;
-    }
-
-    public int getProperty(int i) {
-        return 0;
-    }
-
-    public void setProperty(int i, int j) {
-    }
-
-    public int h() {
-        return 0;
-    }
-
-    public void clear() {
-        this.items.clear();
-    }
-
-    public void a(AutoRecipeStackManager autorecipestackmanager) {
-
-        for (ItemStack itemstack : this.items) {
-            autorecipestackmanager.b(itemstack);
-        }
-
-    }
-
-}

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

@@ -1,719 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_13_R2;
-
-import com.google.common.collect.ImmutableList;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Predicate;
-import javax.annotation.Nullable;
-import net.minecraft.server.v1_13_R2.AutoRecipeStackManager;
-import net.minecraft.server.v1_13_R2.ChatMessage;
-import net.minecraft.server.v1_13_R2.ContainerUtil;
-import net.minecraft.server.v1_13_R2.CrashReport;
-import net.minecraft.server.v1_13_R2.CrashReportSystemDetails;
-import net.minecraft.server.v1_13_R2.EntityHuman;
-import net.minecraft.server.v1_13_R2.EntityPlayer;
-import net.minecraft.server.v1_13_R2.IBlockData;
-import net.minecraft.server.v1_13_R2.IChatBaseComponent;
-import net.minecraft.server.v1_13_R2.Item;
-import net.minecraft.server.v1_13_R2.ItemArmor;
-import net.minecraft.server.v1_13_R2.ItemStack;
-import net.minecraft.server.v1_13_R2.NBTTagCompound;
-import net.minecraft.server.v1_13_R2.NBTTagList;
-import net.minecraft.server.v1_13_R2.NonNullList;
-import net.minecraft.server.v1_13_R2.PacketPlayOutSetSlot;
-import net.minecraft.server.v1_13_R2.PlayerInventory;
-import net.minecraft.server.v1_13_R2.ReportedException;
-import net.minecraft.server.v1_13_R2.World;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_13_R2.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-
-public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-
-    private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline;
-    private NonNullList<ItemStack> items, armor, extraSlots;
-    private final List<NonNullList<ItemStack>> f;
-
-    public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
-        this.playerOnline = online;
-        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;
-            this.player.inventory.a(this);
-            this.items = this.player.inventory.items;
-            this.armor = this.player.inventory.armor;
-            this.extraSlots = this.player.inventory.extraSlots;
-            this.playerOnline = true;
-        }
-    }
-
-    @Override
-    public boolean a(final EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public @NotNull Inventory getBukkitInventory() {
-        return 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);
-    }
-
-    @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 super.getSize() + 4;
-    }
-
-    @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) {
-        NonNullList<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) {
-        NonNullList<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;
-    }
-
-    public List<ItemStack> getContents() {
-        List<ItemStack> combined = new ArrayList<>(this.items.size() + this.armor.size() + this.extraSlots.size());
-
-        for (List<ItemStack> sub : this.f) {
-            combined.addAll(sub);
-        }
-
-        return combined;
-    }
-
-    public List<ItemStack> getArmorContents() {
-        return this.armor;
-    }
-
-    public void onOpen(CraftHumanEntity who) {
-        this.transaction.add(who);
-    }
-
-    public void onClose(CraftHumanEntity who) {
-        this.transaction.remove(who);
-    }
-
-    public List<HumanEntity> getViewers() {
-        return this.transaction;
-    }
-
-    public InventoryHolder getOwner() {
-        return this.player.getBukkitEntity();
-    }
-
-    public Location getLocation() {
-        return this.player.getBukkitEntity().getLocation();
-    }
-
-    public ItemStack getItemInHand() {
-        return e(this.itemInHandIndex) ? this.items.get(this.itemInHandIndex) : ItemStack.a;
-    }
-
-    public static int getHotbarSize() {
-        return 9;
-    }
-
-    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);
-    }
-
-    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;
-    }
-
-    public int getFirstEmptySlotIndex() {
-        for(int i = 0; i < this.items.size(); ++i) {
-            if (this.items.get(i).isEmpty()) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    public void d(int i) {
-        this.itemInHandIndex = this.l();
-        ItemStack itemstack = this.items.get(this.itemInHandIndex);
-        this.items.set(this.itemInHandIndex, this.items.get(i));
-        this.items.set(i, itemstack);
-    }
-
-    public static boolean e(int i) {
-        return i >= 0 && i < 9;
-    }
-
-    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;
-    }
-
-    public int l() {
-        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;
-    }
-
-    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;
-        }
-    }
-
-    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;
-        }
-    }
-
-    public void p() {
-
-        for (NonNullList<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);
-                }
-            }
-        }
-
-    }
-
-    public boolean pickup(ItemStack itemstack) {
-        return this.c(-1, itemstack);
-    }
-
-    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);
-            }
-        }
-    }
-
-    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)));
-                }
-            }
-        }
-
-    }
-
-    public void f(ItemStack itemstack) {
-
-        for (NonNullList<ItemStack> nonnulllist : this.f) {
-            for (int i = 0; i < nonnulllist.size(); ++i) {
-                if (nonnulllist.get(i) == itemstack) {
-                    nonnulllist.set(i, ItemStack.a);
-                    break;
-                }
-            }
-        }
-    }
-
-    public float a(IBlockData iblockdata) {
-        return this.items.get(this.itemInHandIndex).a(iblockdata);
-    }
-
-    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;
-    }
-
-    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);
-                }
-            }
-        }
-
-    }
-
-    public boolean P_() {
-        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
-    public IChatBaseComponent getCustomName() {
-        return null;
-    }
-
-    public boolean b(IBlockData iblockdata) {
-        return this.getItem(this.itemInHandIndex).b(iblockdata);
-    }
-
-    public void a(float f) {
-        if (f > 0.0F) {
-            f /= 4.0F;
-            if (f < 1.0F) {
-                f = 1.0F;
-            }
-
-            for (ItemStack itemstack : this.armor) {
-                if (itemstack.getItem() instanceof ItemArmor) {
-                    itemstack.damage((int) f, this.player);
-                }
-            }
-        }
-    }
-
-    public void dropContents() {
-        for (NonNullList<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);
-                }
-            }
-        }
-    }
-
-    public boolean h(ItemStack itemstack) {
-        return this.f.stream().flatMap(NonNullList::stream).anyMatch(itemStack1 -> !itemStack1.isEmpty() && itemStack1.doMaterialsMatch(itemstack));
-    }
-
-    public void a(PlayerInventory playerinventory) {
-        for (int i = 0; i < playerinventory.getSize(); ++i) {
-            this.setItem(i, playerinventory.getItem(i));
-        }
-
-        this.itemInHandIndex = playerinventory.itemInHandIndex;
-    }
-
-    public void clear() {
-        this.f.forEach(NonNullList::clear);
-    }
-
-    public void a(AutoRecipeStackManager autorecipestackmanager) {
-        for (ItemStack itemstack : this.items) {
-            autorecipestackmanager.a(itemstack);
-        }
-    }
-
-}

internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/InventoryAccess.java

@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2011-2019 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_14_R1;
-
-import com.lishid.openinv.internal.IInventoryAccess;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.util.InternalAccessor;
-import net.minecraft.server.v1_14_R1.IInventory;
-import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class InventoryAccess implements IInventoryAccess {
-
-    @Override
-    public ISpecialEnderChest getSpecialEnderChest(@NotNull final Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialEnderChest) {
-            return (SpecialEnderChest) inv;
-        }
-        return null;
-    }
-
-    @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull final Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialPlayerInventory) {
-            return (SpecialPlayerInventory) inv;
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isSpecialEnderChest(@NotNull final Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class,
-                inventory) instanceof ISpecialEnderChest;
-    }
-
-    @Override
-    public boolean isSpecialPlayerInventory(@NotNull final Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class,
-                inventory) instanceof ISpecialPlayerInventory;
-    }
-
-}

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

@@ -1,183 +0,0 @@
-/*
- * Copyright (C) 2011-2019 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_14_R1;
-
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.mojang.authlib.GameProfile;
-import java.util.Collection;
-import java.util.UUID;
-import net.minecraft.server.v1_14_R1.ChatComponentText;
-import net.minecraft.server.v1_14_R1.Container;
-import net.minecraft.server.v1_14_R1.Containers;
-import net.minecraft.server.v1_14_R1.DimensionManager;
-import net.minecraft.server.v1_14_R1.EntityHuman;
-import net.minecraft.server.v1_14_R1.EntityPlayer;
-import net.minecraft.server.v1_14_R1.MinecraftServer;
-import net.minecraft.server.v1_14_R1.PacketPlayOutOpenWindow;
-import net.minecraft.server.v1_14_R1.PlayerInteractManager;
-import net.minecraft.server.v1_14_R1.PlayerInventory;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory;
-import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftContainer;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    public static EntityPlayer getHandle(final Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
-    @Override
-    public @NotNull Collection<? extends Player> getOnlinePlayers() {
-        return Bukkit.getOnlinePlayers();
-    }
-
-    @Override
-    public OfflinePlayer getPlayerByID(@NotNull final String identifier) {
-        try {
-            UUID uuid = UUID.fromString(identifier);
-            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
-            // Ensure player is a real player, otherwise return null
-            if (!player.hasPlayedBefore() && !player.isOnline()) {
-                return null;
-            }
-            return player;
-        } catch (IllegalArgumentException e) {
-            // Not a UUID
-            return null;
-        }
-    }
-
-    @Override
-    public @NotNull String getPlayerDataID(@NotNull final OfflinePlayer offline) {
-        return offline.getUniqueId().toString();
-    }
-
-    @Override
-    public Player loadPlayer(@NotNull final OfflinePlayer offline) {
-        // Ensure player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        // Create a profile and entity to load the player data
-        GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(DimensionManager.OVERWORLD), profile,
-                new PlayerInteractManager(server.getWorldServer(DimensionManager.OVERWORLD)));
-
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
-    }
-
-    @Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-
-        EntityPlayer nmsPlayer = getHandle(player);
-
-        if (nmsPlayer == null || nmsPlayer.playerConnection == null) {
-            return null;
-        }
-
-        String title;
-        if (inventory instanceof SpecialEnderChest) {
-            HumanEntity owner = (HumanEntity) ((SpecialEnderChest) inventory).getBukkitOwner();
-            title = (owner.getName() != null ? owner.getName() : owner.getUniqueId().toString()) + "'s Ender Chest";
-        } else if (inventory instanceof SpecialPlayerInventory) {
-            EntityHuman owner = ((PlayerInventory) inventory).player;
-            title = (owner.getName() != null ? owner.getName() : owner.getUniqueID().toString()) + "'s Inventory";
-        } else {
-            return player.openInventory(inventory.getBukkitInventory());
-        }
-
-        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 title;
-            }
-        }, nmsPlayer, nmsPlayer.nextContainerCounter()) {
-            @Override
-            public Containers<?> getType() {
-                return inventory instanceof SpecialEnderChest ? Containers.GENERIC_9X3 : Containers.GENERIC_9X5;
-            }
-        };
-
-        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();
-
-    }
-
-}

internal/v1_16_R3/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2011-2019 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -22,31 +22,48 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>4.0.0</version>
+    <version>4.1.6-SNAPSHOT</version>
   </parent>
 
-  <artifactId>openinvadapter1_14_R1</artifactId>
+  <artifactId>openinvadapter1_16_R3</artifactId>
-  <name>OpenInvAdapter1_14_R1</name>
+  <name>OpenInvAdapter1_16_R3</name>
 
   <dependencies>
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
-      <version>1.14-R0.1-SNAPSHOT</version>
+      <version>1.16.5-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
+      <artifactId>openinvplugincore</artifactId>
-      <version>4.0.0</version>
+      <version>4.1.6-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.2</version>
+        <configuration>
+          <minimizeJar>true</minimizeJar>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>3.8.1</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
@@ -55,5 +72,4 @@
     </plugins>
   </build>
 
-
 </project>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2019 lishid. All rights reserved.
+ * Copyright (C) 2011-2020 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,47 +14,52 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_14_R1;
+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 javax.annotation.Nullable;
+import net.minecraft.server.v1_16_R3.Block;
-import net.minecraft.server.v1_14_R1.AxisAlignedBB;
+import net.minecraft.server.v1_16_R3.BlockBarrel;
-import net.minecraft.server.v1_14_R1.Block;
+import net.minecraft.server.v1_16_R3.BlockChest;
-import net.minecraft.server.v1_14_R1.BlockChest;
+import net.minecraft.server.v1_16_R3.BlockChestTrapped;
-import net.minecraft.server.v1_14_R1.BlockChestTrapped;
+import net.minecraft.server.v1_16_R3.BlockPosition;
-import net.minecraft.server.v1_14_R1.BlockEnderChest;
+import net.minecraft.server.v1_16_R3.BlockPropertyChestType;
-import net.minecraft.server.v1_14_R1.BlockPosition;
+import net.minecraft.server.v1_16_R3.BlockShulkerBox;
-import net.minecraft.server.v1_14_R1.BlockPropertyChestType;
+import net.minecraft.server.v1_16_R3.ChatMessage;
-import net.minecraft.server.v1_14_R1.BlockShulkerBox;
+import net.minecraft.server.v1_16_R3.Container;
-import net.minecraft.server.v1_14_R1.ChatMessage;
+import net.minecraft.server.v1_16_R3.ContainerChest;
-import net.minecraft.server.v1_14_R1.Container;
+import net.minecraft.server.v1_16_R3.Containers;
-import net.minecraft.server.v1_14_R1.ContainerChest;
+import net.minecraft.server.v1_16_R3.EntityHuman;
-import net.minecraft.server.v1_14_R1.Entity;
+import net.minecraft.server.v1_16_R3.EntityPlayer;
-import net.minecraft.server.v1_14_R1.EntityCat;
+import net.minecraft.server.v1_16_R3.EnumGamemode;
-import net.minecraft.server.v1_14_R1.EntityHuman;
+import net.minecraft.server.v1_16_R3.IBlockData;
-import net.minecraft.server.v1_14_R1.EntityPlayer;
+import net.minecraft.server.v1_16_R3.IChatBaseComponent;
-import net.minecraft.server.v1_14_R1.EnumDirection;
+import net.minecraft.server.v1_16_R3.ITileInventory;
-import net.minecraft.server.v1_14_R1.EnumGamemode;
+import net.minecraft.server.v1_16_R3.InventoryEnderChest;
-import net.minecraft.server.v1_14_R1.IBlockData;
+import net.minecraft.server.v1_16_R3.InventoryLargeChest;
-import net.minecraft.server.v1_14_R1.IChatBaseComponent;
+import net.minecraft.server.v1_16_R3.PlayerInteractManager;
-import net.minecraft.server.v1_14_R1.ITileInventory;
+import net.minecraft.server.v1_16_R3.PlayerInventory;
-import net.minecraft.server.v1_14_R1.InventoryEnderChest;
+import net.minecraft.server.v1_16_R3.TileEntity;
-import net.minecraft.server.v1_14_R1.InventoryLargeChest;
+import net.minecraft.server.v1_16_R3.TileEntityChest;
-import net.minecraft.server.v1_14_R1.PlayerInteractManager;
+import net.minecraft.server.v1_16_R3.TileEntityEnderChest;
-import net.minecraft.server.v1_14_R1.PlayerInventory;
+import net.minecraft.server.v1_16_R3.TileEntityLootable;
-import net.minecraft.server.v1_14_R1.TileEntity;
+import net.minecraft.server.v1_16_R3.TileInventory;
-import net.minecraft.server.v1_14_R1.TileEntityChest;
+import net.minecraft.server.v1_16_R3.World;
-import net.minecraft.server.v1_14_R1.TileEntityEnderChest;
-import net.minecraft.server.v1_14_R1.TileEntityShulkerBox;
-import net.minecraft.server.v1_14_R1.TileInventory;
-import net.minecraft.server.v1_14_R1.VoxelShapes;
-import net.minecraft.server.v1_14_R1.World;
 import org.bukkit.Material;
 import org.bukkit.Statistic;
+import org.bukkit.block.Barrel;
+import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
+import org.bukkit.block.EnderChest;
+import org.bukkit.block.ShulkerBox;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Directional;
+import org.bukkit.block.data.type.Chest;
+import org.bukkit.entity.Cat;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryView;
+import org.bukkit.util.BoundingBox;
 import org.jetbrains.annotations.NotNull;
 
 public class AnySilentContainer implements IAnySilentContainer {
@@ -78,94 +83,87 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
         BlockState state = bukkitBlock.getState();
         return state instanceof org.bukkit.block.Chest
-                || state instanceof org.bukkit.block.ShulkerBox;
+                || 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 bukkitBlock) {
+    public boolean isAnyContainerNeeded(@NotNull final Player p, @NotNull final org.bukkit.block.Block block) {
-        EntityPlayer player = PlayerDataManager.getHandle(p);
+        BlockState blockState = block.getState();
-        World world = player.world;
-        BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        IBlockData blockData = world.getType(blockPosition);
-        Block block = blockData.getBlock();
 
-        if (block instanceof BlockShulkerBox) {
+        // Barrels do not require AnyContainer.
-            return this.isBlockedShulkerBox(world, blockPosition, blockData);
+        if (blockState instanceof Barrel) {
+            return false;
         }
 
-        if (block instanceof BlockEnderChest) {
+        // Enderchests require a non-occluding block on top to open.
-            // Ender chests are not blocked by ocelots.
+        if (blockState instanceof EnderChest) {
-            return world.getType(blockPosition.up()).isOccluding(world, blockPosition);
+            return block.getRelative(0, 1, 0).getType().isOccluding();
         }
 
-        // Check if chest is blocked or has an ocelot on top
+        // Shulker boxes require 1/2 a block clear in the direction they open.
-        if (this.isBlockedChest(world, blockPosition)) {
+        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;
             }
 
-        // Check for matching adjacent chests that are blocked or have an ocelot on top
+            Directional directional = (Directional) blockData;
-        BlockPropertyChestType chestType = blockData.get(BlockChest.b);
+            BlockFace face = directional.getFacing();
+            boundingBox.shift(face.getDirection());
+            // Return whether or not bounding boxes overlap.
+            return block.getRelative(face, 1).getBoundingBox().overlaps(boundingBox);
+        }
 
-        if (chestType == BlockPropertyChestType.SINGLE) {
+        if (!(blockState instanceof org.bukkit.block.Chest)) {
             return false;
         }
 
-        BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.j(blockData));
+        if (isBlockedChest(block)) {
-        IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
-
-        if (adjacentBlockData.getBlock() == block) {
-
-            BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.b);
-
-            if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
-                    && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
-
-                return this.isBlockedChest(world, adjacentBlockPosition);
-            }
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedShulkerBox(final World world, final BlockPosition blockPosition,
-                                        final IBlockData blockData) {
-        // For reference, look at net.minecraft.server.BlockShulkerBox
-        TileEntity tile = world.getTileEntity(blockPosition);
-
-        if (!(tile instanceof TileEntityShulkerBox)) {
-            return false;
-        }
-
-        EnumDirection enumDirection = blockData.get(BlockShulkerBox.a);
-        if (((TileEntityShulkerBox) tile).s() == TileEntityShulkerBox.AnimationPhase.CLOSED) {
-            AxisAlignedBB axisAlignedBB = VoxelShapes.b().getBoundingBox()
-                    .b(0.5F * enumDirection.getAdjacentX(), 0.5F * enumDirection.getAdjacentY(), 0.5F * enumDirection.getAdjacentZ())
-                    .a(enumDirection.getAdjacentX(), enumDirection.getAdjacentY(), enumDirection.getAdjacentZ());
-            return !world.getCubes(null, axisAlignedBB.a(blockPosition.shift(enumDirection)));
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedChest(final World world, final BlockPosition blockPosition) {
-        // For reference, loot at net.minecraft.server.BlockChest
-        return world.getType(blockPosition.up()).isOccluding(world, blockPosition) || this.hasOcelotOnTop(world, blockPosition);
-    }
-
-    private boolean hasOcelotOnTop(final World world, final BlockPosition blockPosition) {
-        for (Entity entity : world.a(EntityCat.class,
-                new AxisAlignedBB(blockPosition.getX(), blockPosition.getY() + 1,
-                        blockPosition.getZ(), blockPosition.getX() + 1, blockPosition.getY() + 2,
-                        blockPosition.getZ() + 1))) {
-            EntityCat entityCat = (EntityCat) entity;
-            if (entityCat.isSitting()) {
             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) {
@@ -181,7 +179,7 @@ public class AnySilentContainer implements IAnySilentContainer {
 
         final World world = player.world;
         final BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        final Object tile = world.getTileEntity(blockPosition);
+        final TileEntity tile = world.getTileEntity(blockPosition);
 
         if (tile == null) {
             return false;
@@ -191,8 +189,11 @@ public class AnySilentContainer implements IAnySilentContainer {
             // Anychest ender chest. See net.minecraft.server.BlockEnderChest
             InventoryEnderChest enderChest = player.getEnderChest();
             enderChest.a((TileEntityEnderChest) tile);
-            player.openContainer(new TileInventory((containerCounter, playerInventory, ignored) ->
+            player.openContainer(new TileInventory((containerCounter, playerInventory, ignored) -> {
-                    ContainerChest.a(containerCounter, playerInventory, enderChest), BlockEnderChest.d));
+                Containers<?> containers = PlayerDataManager.getContainers(enderChest.getSize());
+                int rows = enderChest.getSize() / 9;
+                return new ContainerChest(containers, containerCounter, playerInventory, enderChest, rows);
+            }, new ChatMessage("container.enderchest")));
             bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
             return true;
         }
@@ -207,16 +208,16 @@ public class AnySilentContainer implements IAnySilentContainer {
 
         if (block instanceof BlockChest) {
 
-            BlockPropertyChestType chestType = blockData.get(BlockChest.b);
+            BlockPropertyChestType chestType = blockData.get(BlockChest.c);
 
             if (chestType != BlockPropertyChestType.SINGLE) {
 
-                BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.j(blockData));
+                BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.h(blockData));
                 IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
 
                 if (adjacentBlockData.getBlock() == block) {
 
-                    BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.b);
+                    BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.c);
 
                     if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
                             && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
@@ -226,19 +227,26 @@ public class AnySilentContainer implements IAnySilentContainer {
                         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() {
-                                @Nullable
                                 public Container createMenu(int containerCounter, PlayerInventory playerInventory, EntityHuman entityHuman) {
-                                    if (leftChest.e(entityHuman) && rightChest.e(entityHuman)) {
                                     leftChest.d(playerInventory.player);
                                     rightChest.d(playerInventory.player);
                                     return ContainerChest.b(containerCounter, playerInventory, new InventoryLargeChest(rightChest, leftChest));
-                                    } else {
-                                        return null;
-                                    }
                                 }
 
                                 public IChatBaseComponent getScoreboardDisplayName() {
+                                    if (leftChest.hasCustomName()) {
+                                        return leftChest.getScoreboardDisplayName();
+                                    }
+                                    if (rightChest.hasCustomName()) {
+                                        return rightChest.getScoreboardDisplayName();
+                                    }
                                     return new ChatMessage("container.chestDouble");
                                 }
                             };
@@ -258,6 +266,10 @@ public class AnySilentContainer implements IAnySilentContainer {
             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);
@@ -269,6 +281,14 @@ public class AnySilentContainer implements IAnySilentContainer {
             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);
@@ -287,6 +307,7 @@ public class AnySilentContainer implements IAnySilentContainer {
             case CHEST:
             case ENDER_CHEST:
             case SHULKER_BOX:
+            case BARREL:
                 break;
             default:
                 return;
@@ -297,6 +318,8 @@ public class AnySilentContainer implements IAnySilentContainer {
         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);
     }

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

@@ -0,0 +1,69 @@
+/*
+ * 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 saveData() {
+        super.saveData();
+        EntityPlayer player = this.getHandle();
+        // See net.minecraft.server.WorldNBTStorage#save(EntityPlayer)
+        try {
+            WorldNBTStorage worldNBTStorage = player.server.getPlayerList().playerFileData;
+
+            NBTTagCompound playerData = player.save(new NBTTagCompound());
+
+            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,237 @@
+/*
+ * 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_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;
+        }
+    }
+
+    @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 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-2019 lishid. All rights reserved.
+ * Copyright (C) 2011-2020 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,25 +14,26 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_14_R1;
+package com.lishid.openinv.internal.v1_16_R3;
 
 import com.lishid.openinv.internal.ISpecialEnderChest;
 import java.util.List;
-import net.minecraft.server.v1_14_R1.AutoRecipeStackManager;
+import net.minecraft.server.v1_16_R3.AutoRecipeStackManager;
-import net.minecraft.server.v1_14_R1.ContainerUtil;
+import net.minecraft.server.v1_16_R3.ContainerUtil;
-import net.minecraft.server.v1_14_R1.EntityHuman;
+import net.minecraft.server.v1_16_R3.EntityHuman;
-import net.minecraft.server.v1_14_R1.EntityPlayer;
+import net.minecraft.server.v1_16_R3.EntityPlayer;
-import net.minecraft.server.v1_14_R1.IInventoryListener;
+import net.minecraft.server.v1_16_R3.IInventoryListener;
-import net.minecraft.server.v1_14_R1.InventoryEnderChest;
+import net.minecraft.server.v1_16_R3.InventoryEnderChest;
-import net.minecraft.server.v1_14_R1.ItemStack;
+import net.minecraft.server.v1_16_R3.ItemStack;
-import net.minecraft.server.v1_14_R1.NonNullList;
+import net.minecraft.server.v1_16_R3.NonNullList;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_16_R3.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftInventory;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryHolder;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEnderChest {
 
@@ -115,7 +116,7 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
     }
 
     @Override
-    public Location getLocation() {
+    public @Nullable Location getLocation() {
         return null;
     }
 
@@ -131,7 +132,7 @@ 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.a;
+        return i >= 0 && i < this.items.size() ? this.items.get(i) : ItemStack.b;
     }
 
     @Override
@@ -153,7 +154,7 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
             if (itemstack2.isEmpty()) {
                 this.setItem(i, itemstack1);
                 this.update();
-                return ItemStack.a;
+                return ItemStack.b;
             }
 
             if (ItemStack.c(itemstack2, itemstack1)) {
@@ -164,7 +165,7 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
                     itemstack1.subtract(k);
                     if (itemstack1.isEmpty()) {
                         this.update();
-                        return ItemStack.a;
+                        return ItemStack.b;
                     }
                 }
             }
@@ -181,9 +182,9 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
     public ItemStack splitWithoutUpdate(int i) {
         ItemStack itemstack = this.items.get(i);
         if (itemstack.isEmpty()) {
-            return ItemStack.a;
+            return ItemStack.b;
         } else {
-            this.items.set(i, ItemStack.a);
+            this.items.set(i, ItemStack.b);
             return itemstack;
         }
     }
@@ -204,7 +205,7 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
     }
 
     @Override
-    public boolean isNotEmpty() {
+    public boolean isEmpty() {
 
         for (ItemStack itemstack : this.items) {
             if (!itemstack.isEmpty()) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2019 lishid. All rights reserved.
+ * Copyright (C) 2011-2020 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_14_R1;
+package com.lishid.openinv.internal.v1_16_R3;
 
 import com.google.common.collect.ImmutableList;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
@@ -22,29 +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_14_R1.AutoRecipeStackManager;
+import net.minecraft.server.v1_16_R3.AutoRecipeStackManager;
-import net.minecraft.server.v1_14_R1.ChatMessage;
+import net.minecraft.server.v1_16_R3.ChatMessage;
-import net.minecraft.server.v1_14_R1.ContainerUtil;
+import net.minecraft.server.v1_16_R3.ContainerUtil;
-import net.minecraft.server.v1_14_R1.CrashReport;
+import net.minecraft.server.v1_16_R3.CrashReport;
-import net.minecraft.server.v1_14_R1.CrashReportSystemDetails;
+import net.minecraft.server.v1_16_R3.CrashReportSystemDetails;
-import net.minecraft.server.v1_14_R1.EntityHuman;
+import net.minecraft.server.v1_16_R3.DamageSource;
-import net.minecraft.server.v1_14_R1.EntityPlayer;
+import net.minecraft.server.v1_16_R3.EntityHuman;
-import net.minecraft.server.v1_14_R1.EnumItemSlot;
+import net.minecraft.server.v1_16_R3.EntityPlayer;
-import net.minecraft.server.v1_14_R1.IBlockData;
+import net.minecraft.server.v1_16_R3.EnumItemSlot;
-import net.minecraft.server.v1_14_R1.IChatBaseComponent;
+import net.minecraft.server.v1_16_R3.IBlockData;
-import net.minecraft.server.v1_14_R1.Item;
+import net.minecraft.server.v1_16_R3.IChatBaseComponent;
-import net.minecraft.server.v1_14_R1.ItemArmor;
+import net.minecraft.server.v1_16_R3.IInventory;
-import net.minecraft.server.v1_14_R1.ItemStack;
+import net.minecraft.server.v1_16_R3.Item;
-import net.minecraft.server.v1_14_R1.NBTTagCompound;
+import net.minecraft.server.v1_16_R3.ItemArmor;
-import net.minecraft.server.v1_14_R1.NBTTagList;
+import net.minecraft.server.v1_16_R3.ItemStack;
-import net.minecraft.server.v1_14_R1.NonNullList;
+import net.minecraft.server.v1_16_R3.NBTTagCompound;
-import net.minecraft.server.v1_14_R1.PacketPlayOutSetSlot;
+import net.minecraft.server.v1_16_R3.NBTTagList;
-import net.minecraft.server.v1_14_R1.PlayerInventory;
+import net.minecraft.server.v1_16_R3.NonNullList;
-import net.minecraft.server.v1_14_R1.ReportedException;
+import net.minecraft.server.v1_16_R3.PacketPlayOutSetSlot;
-import net.minecraft.server.v1_14_R1.World;
+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_14_R1.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_16_R3.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftInventory;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryHolder;
@@ -57,7 +59,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline;
     private EntityHuman player;
     private NonNullList<ItemStack> items, armor, extraSlots;
-    private final List<NonNullList<ItemStack>> f;
+    private List<NonNullList<ItemStack>> f;
 
     public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) {
         super(PlayerDataManager.getHandle(bukkitPlayer));
@@ -76,10 +78,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             EntityPlayer entityPlayer = PlayerDataManager.getHandle(player);
             entityPlayer.inventory.transaction.addAll(this.transaction);
             this.player = entityPlayer;
-            this.player.inventory.a(this);
+            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;
         }
     }
@@ -113,12 +119,25 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         }
 
         if (i >= list.size()) {
-            return ItemStack.a;
+            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());
@@ -212,10 +231,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         }
 
         if (i >= list.size()) {
-            return ItemStack.a;
+            return ItemStack.b;
         }
 
-        return list.get(i).isEmpty() ? ItemStack.a : ContainerUtil.a(list, i, j);
+        return list.get(i).isEmpty() ? ItemStack.b : ContainerUtil.a(list, i, j);
     }
 
     @Override
@@ -237,17 +256,17 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         }
 
         if (i >= list.size()) {
-            return ItemStack.a;
+            return ItemStack.b;
         }
 
         if (!list.get(i).isEmpty()) {
             ItemStack itemstack = list.get(i);
 
-            list.set(i, ItemStack.a);
+            list.set(i, ItemStack.b);
             return itemstack;
         }
 
-        return ItemStack.a;
+        return ItemStack.b;
     }
 
     @Override
@@ -287,10 +306,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
     @Override
     public ItemStack getItemInHand() {
-        return d(this.itemInHandIndex) ? this.items.get(this.itemInHandIndex) : ItemStack.a;
+        return d(this.itemInHandIndex) ? this.items.get(this.itemInHandIndex) : ItemStack.b;
     }
 
-    private boolean a(ItemStack itemstack, ItemStack itemstack1) {
+    private boolean isSimilarAndNotFull(ItemStack itemstack, ItemStack itemstack1) {
         return !itemstack.isEmpty() && this.b(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize();
     }
 
@@ -308,8 +327,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack.getCount();
             }
 
-            if (!this.a(itemstack, itemstack1)) {
+            if (!this.isSimilarAndNotFull(itemstack, itemstack1)) {
-                remains -= (itemstack1.getMaxStackSize() < this.getMaxStackSize() ? itemstack1.getMaxStackSize() : this.getMaxStackSize()) - itemstack1.getCount();
+                remains -= Math.min(itemstack1.getMaxStackSize(), this.getMaxStackSize()) - itemstack1.getCount();
             }
 
             if (remains <= 0) {
@@ -317,6 +336,11 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             }
         }
 
+        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;
     }
 
@@ -373,41 +397,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public int a(Predicate<ItemStack> predicate, int i) {
+    public int a(Predicate<ItemStack> predicate, int i, IInventory iinventory) {
-        int j = 0;
+        byte b0 = 0;
-
+        boolean flag = i == 0;
-        int k;
+        int j = b0 + ContainerUtil.a(this, predicate, i - b0, flag);
-        for (k = 0; k < this.getSize(); ++k) {
+        j += ContainerUtil.a(iinventory, predicate, i - j, flag);
-            ItemStack itemstack = this.getItem(k);
+        j += ContainerUtil.a(this.getCarried(), predicate, i - j, flag);
-            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);
+            this.setCarried(ItemStack.b);
-                }
-
-                if (i > 0 && j >= i) {
-                    return j;
-                }
-            }
         }
 
         return j;
@@ -428,8 +425,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         ItemStack itemstack1 = this.getItem(i);
         if (itemstack1.isEmpty()) {
             itemstack1 = new ItemStack(item, 0);
-            if (itemstack.hasTag()) {
+            NBTTagCompound tag = itemstack.getTag();
-                itemstack1.setTag(itemstack.getTag().clone());
+            if (tag != null) {
+                itemstack1.setTag(tag.clone());
             }
 
             this.setItem(i, itemstack1);
@@ -444,25 +442,23 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             k = this.getMaxStackSize() - itemstack1.getCount();
         }
 
-        if (k == 0) {
+        if (k != 0) {
-            return j;
-        } else {
             j -= k;
             itemstack1.add(k);
             itemstack1.d(5);
-            return j;
         }
+        return j;
     }
 
     @Override
     public int firstPartial(ItemStack itemstack) {
-        if (this.a(this.getItem(this.itemInHandIndex), itemstack)) {
+        if (this.isSimilarAndNotFull(this.getItem(this.itemInHandIndex), itemstack)) {
             return this.itemInHandIndex;
-        } else if (this.a(this.getItem(40), itemstack)) {
+        } else if (this.isSimilarAndNotFull(this.getItem(40), itemstack)) {
             return 40;
         } else {
             for (int i = 0; i < this.items.size(); ++i) {
-                if (this.a(this.items.get(i), itemstack)) {
+                if (this.isSimilarAndNotFull(this.items.get(i), itemstack)) {
                     return i;
                 }
             }
@@ -569,7 +565,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         for (List<ItemStack> list : this.f) {
             for (int i = 0; i < list.size(); ++i) {
                 if (list.get(i) == itemstack) {
-                    list.set(i, ItemStack.a);
+                    list.set(i, ItemStack.b);
                     break;
                 }
             }
@@ -639,12 +635,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean isNotEmpty() {
+    public boolean isEmpty() {
-        Iterator iterator = this.items.iterator();
+        Iterator<ItemStack> iterator = this.items.iterator();
 
         ItemStack itemstack;
         while (iterator.hasNext()) {
-            itemstack = (ItemStack)iterator.next();
+            itemstack = iterator.next();
             if (!itemstack.isEmpty()) {
                 return false;
             }
@@ -653,7 +649,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         iterator = this.armor.iterator();
 
         while (iterator.hasNext()) {
-            itemstack = (ItemStack)iterator.next();
+            itemstack = iterator.next();
             if (!itemstack.isEmpty()) {
                 return false;
             }
@@ -662,7 +658,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         iterator = this.extraSlots.iterator();
 
         while (iterator.hasNext()) {
-            itemstack = (ItemStack)iterator.next();
+            itemstack = iterator.next();
             if (!itemstack.isEmpty()) {
                 return false;
             }
@@ -678,12 +674,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean b(IBlockData iblockdata) {
+    public void a(DamageSource damagesource, float f) {
-        return this.getItem(this.itemInHandIndex).b(iblockdata);
-    }
-
-    @Override
-    public void a(float f) {
         if (f > 0.0F) {
             f /= 4.0F;
             if (f < 1.0F) {
@@ -693,8 +684,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             for (int i = 0; i < this.armor.size(); ++i) {
                 ItemStack itemstack = this.armor.get(0);
                 int index = i;
-                if (itemstack.getItem() instanceof ItemArmor) {
+                if ((!damagesource.isFire() || !itemstack.getItem().u()) && itemstack.getItem() instanceof ItemArmor) {
-                    itemstack.damage((int) f, this.player, (entityhuman) -> entityhuman.c(EnumItemSlot.a(EnumItemSlot.Function.ARMOR, index)));
+                    itemstack.damage((int) f, this.player, (entityHuman) -> entityHuman.broadcastItemBreak(EnumItemSlot.a(EnumItemSlot.Function.ARMOR, index)));
                 }
             }
         }
@@ -706,7 +697,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             for (int i = 0; i < itemStacks.size(); ++i) {
                 ItemStack itemstack = itemStacks.get(i);
                 if (!itemstack.isEmpty()) {
-                    itemStacks.set(i, ItemStack.a);
+                    itemStacks.set(i, ItemStack.b);
                     this.player.a(itemstack, true, false);
                 }
             }

internal/v1_4_R1/pom.xml

@@ -1,44 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2018 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.0.0</version>
-  </parent>
-
-  <artifactId>openinvadapter1_4_R1</artifactId>
-  <name>OpenInvAdapter1_4_R1</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>craftbukkit</artifactId>
-      <version>1.4.7-R1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-  </dependencies>
-
-</project>

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

@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_R1;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import net.minecraft.server.v1_4_R1.AxisAlignedBB;
-import net.minecraft.server.v1_4_R1.BlockEnderChest;
-import net.minecraft.server.v1_4_R1.Container;
-import net.minecraft.server.v1_4_R1.EntityOcelot;
-import net.minecraft.server.v1_4_R1.EntityPlayer;
-import net.minecraft.server.v1_4_R1.IInventory;
-import net.minecraft.server.v1_4_R1.InventoryEnderChest;
-import net.minecraft.server.v1_4_R1.InventoryLargeChest;
-import net.minecraft.server.v1_4_R1.Packet100OpenWindow;
-import net.minecraft.server.v1_4_R1.TileEntityChest;
-import net.minecraft.server.v1_4_R1.TileEntityEnderChest;
-import net.minecraft.server.v1_4_R1.World;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_4_R1.event.CraftEventFactory;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class AnySilentContainer implements IAnySilentContainer {
-
-    @Override
-    public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
-        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
-        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
-
-        if (bukkitBlock instanceof BlockEnderChest) {
-            // Ender chests are not blocked by ocelots.
-            return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        }
-
-        // If block or ocelot on top
-        if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
-            return true;
-        }
-
-        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        // If block next to chest is chest and has a block or ocelot on top
-        if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
-            return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() + 1);
-        } else if(world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
-            return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() - 1);
-        } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            return isBlockedChest(world, bukkitBlock.getX() + 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            return isBlockedChest(world, bukkitBlock.getX() - 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedChest(World world, int x, int y, int z) {
-        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
-    }
-
-    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
-        for (Object localEntity : world.a(EntityOcelot.class,
-                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
-            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
-            if (localEntityOcelot.isSitting()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        // Silent ender chest is API-only
-        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            return true;
-        }
-
-        World world = player.world;
-        Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        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);
-            return true;
-        }
-
-        if (!(tile instanceof IInventory)) {
-            return false;
-        }
-
-        IInventory inventory = (IInventory) tile;
-        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1));
-        } else if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1), inventory);
-        } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()));
-        } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()), inventory);
-        }
-
-        // AnyChest only
-        if (!silent) {
-            player.openContainer(inventory);
-            return true;
-        }
-
-        // SilentChest
-        try {
-            // Call InventoryOpenEvent
-            Container container = new SilentContainerChest(player.inventory, inventory);
-            container = CraftEventFactory.callInventoryOpenEvent(player, container);
-            if (container == null) {
-                return false;
-            }
-
-            // Open window
-            int windowId = player.nextContainerCounter();
-            player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize()));
-            player.activeContainer = container;
-            player.activeContainer.windowId = windowId;
-            player.activeContainer.addSlotListener(player);
-
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
-            return false;
-        }
-    }
-
-    @Override
-    public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
-
-}

internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/InventoryAccess.java

@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_R1;
-
-import com.lishid.openinv.internal.IInventoryAccess;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.util.InternalAccessor;
-import net.minecraft.server.v1_4_R1.IInventory;
-import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class InventoryAccess implements IInventoryAccess {
-
-    @Override
-    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
-    }
-
-    @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialPlayerInventory) {
-            return (SpecialPlayerInventory) inv;
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
-    }
-
-    @Override
-    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialEnderChest) {
-            return (SpecialEnderChest) inv;
-        }
-        return null;
-    }
-
-}

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

@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_R1;
-
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import java.util.Arrays;
-import java.util.Collection;
-import net.minecraft.server.v1_4_R1.EntityPlayer;
-import net.minecraft.server.v1_4_R1.MinecraftServer;
-import net.minecraft.server.v1_4_R1.PlayerInteractManager;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_4_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    @Override
-    public Player loadPlayer(@NotNull OfflinePlayer offline) {
-        // Ensure the player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
-                new PlayerInteractManager(server.getWorldServer(0)));
-
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
-    }
-
-    @Override
-    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
-        return offline.getName();
-    }
-
-    @Override
-    public OfflinePlayer getPlayerByID(@NotNull String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
-    @Override
-    public @NotNull Collection<? extends Player> getOnlinePlayers() {
-        return Arrays.asList(Bukkit.getOnlinePlayers());
-    }
-
-    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().f(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 InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-        return player.openInventory(inventory.getBukkitInventory());
-    }
-
-}

internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/SilentContainerChest.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_R1;
-
-import net.minecraft.server.v1_4_R1.ContainerChest;
-import net.minecraft.server.v1_4_R1.EntityHuman;
-import net.minecraft.server.v1_4_R1.IInventory;
-import net.minecraft.server.v1_4_R1.ItemStack;
-import net.minecraft.server.v1_4_R1.PlayerInventory;
-
-class SilentContainerChest extends ContainerChest {
-
-    SilentContainerChest(IInventory i1, IInventory i2) {
-        super(i1, i2);
-        // Send close signal
-        i2.f();
-    }
-
-    @Override
-    public void b(EntityHuman entityHuman) {
-        // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried);
-        }
-    }
-
-}

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

@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_R1;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.server.v1_4_R1.EntityPlayer;
-import net.minecraft.server.v1_4_R1.IInventory;
-import net.minecraft.server.v1_4_R1.InventoryEnderChest;
-import net.minecraft.server.v1_4_R1.InventorySubcontainer;
-import net.minecraft.server.v1_4_R1.ItemStack;
-import org.bukkit.craftbukkit.v1_4_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-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 final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline;
-    private CraftPlayer owner;
-    private int maxStack = MAX_STACK;
-
-    public SpecialEnderChest(Player player, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
-        this.playerOnline = online;
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.owner = 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.owner = 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 ItemStack[] getContents() {
-        return this.items;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        transaction.add(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        transaction.remove(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return transaction;
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner;
-    }
-
-    @Override
-    public void setMaxStackSize(int size) {
-        maxStack = size;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return maxStack;
-    }
-
-    @Override
-    public void update() {
-        super.update();
-        enderChest.update();
-    }
-
-}

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

@@ -1,233 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_4_R1;
-
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import net.minecraft.server.v1_4_R1.ItemStack;
-import net.minecraft.server.v1_4_R1.PlayerInventory;
-import org.bukkit.craftbukkit.v1_4_R1.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].a(j);
-                if (is[i].count == 0) {
-                    is[i] = null;
-                }
-
-                return itemstack;
-            }
-        }
-        else {
-            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;
-        }
-        else {
-            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);
-            itemstack = null;
-        }
-
-        is[i] = itemstack;
-
-        player.defaultContainer.b();
-    }
-
-    private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
-            return i - 27;
-        else
-            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;
-        else
-            return i;
-    }
-
-    @Override
-    public String getName() {
-        if (player.getName().length() > 16) {
-            return player.getName().substring(0, 16);
-        }
-        return player.getName();
-    }
-
-}

internal/v1_5_R2/pom.xml

@@ -1,44 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2018 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.0.0</version>
-  </parent>
-
-  <artifactId>openinvadapter1_5_R2</artifactId>
-  <name>OpenInvAdapter1_5_R2</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>craftbukkit</artifactId>
-      <version>1.5.1-R0.2</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-  </dependencies>
-
-</project>

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

@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_5_R2;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import net.minecraft.server.v1_5_R2.AxisAlignedBB;
-import net.minecraft.server.v1_5_R2.BlockEnderChest;
-import net.minecraft.server.v1_5_R2.Container;
-import net.minecraft.server.v1_5_R2.EntityOcelot;
-import net.minecraft.server.v1_5_R2.EntityPlayer;
-import net.minecraft.server.v1_5_R2.IInventory;
-import net.minecraft.server.v1_5_R2.InventoryEnderChest;
-import net.minecraft.server.v1_5_R2.InventoryLargeChest;
-import net.minecraft.server.v1_5_R2.Packet100OpenWindow;
-import net.minecraft.server.v1_5_R2.TileEntityChest;
-import net.minecraft.server.v1_5_R2.TileEntityEnderChest;
-import net.minecraft.server.v1_5_R2.World;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_5_R2.event.CraftEventFactory;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class AnySilentContainer implements IAnySilentContainer {
-
-    @Override
-    public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
-        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
-        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
-
-        if (bukkitBlock instanceof BlockEnderChest) {
-            // Ender chests are not blocked by ocelots.
-            return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        }
-
-        // If block or ocelot on top
-        if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
-            return true;
-        }
-
-        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        // If block next to chest is chest and has a block or ocelot on top
-        if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
-            return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() + 1);
-        } else if(world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
-            return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() - 1);
-        } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            return isBlockedChest(world, bukkitBlock.getX() + 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            return isBlockedChest(world, bukkitBlock.getX() - 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedChest(World world, int x, int y, int z) {
-        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
-    }
-
-    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
-        for (Object localEntity : world.a(EntityOcelot.class,
-                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
-            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
-            if (localEntityOcelot.isSitting()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        // Silent ender chest is API-only
-        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            return true;
-        }
-
-        World world = player.world;
-        Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        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);
-            return true;
-        }
-
-        if (!(tile instanceof IInventory)) {
-            return false;
-        }
-
-        IInventory inventory = (IInventory) tile;
-        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1));
-        } else if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1), inventory);
-        } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()));
-        } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()), inventory);
-        }
-
-        // AnyChest only
-        if (!silent) {
-            player.openContainer(inventory);
-            return true;
-        }
-
-        // SilentChest
-        try {
-            // Call InventoryOpenEvent
-            Container container = new SilentContainerChest(player.inventory, inventory);
-            container = CraftEventFactory.callInventoryOpenEvent(player, container);
-            if (container == null) {
-                return false;
-            }
-
-            // Open window
-            int windowId = player.nextContainerCounter();
-            player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize(), true));
-            player.activeContainer = container;
-            player.activeContainer.windowId = windowId;
-            player.activeContainer.addSlotListener(player);
-
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
-            return false;
-        }
-    }
-
-    @Override
-    public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
-
-}

internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/InventoryAccess.java

@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_5_R2;
-
-import com.lishid.openinv.internal.IInventoryAccess;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.util.InternalAccessor;
-import net.minecraft.server.v1_5_R2.IInventory;
-import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class InventoryAccess implements IInventoryAccess {
-
-    @Override
-    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
-    }
-
-    @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialPlayerInventory) {
-            return (SpecialPlayerInventory) inv;
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
-    }
-
-    @Override
-    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialEnderChest) {
-            return (SpecialEnderChest) inv;
-        }
-        return null;
-    }
-
-}

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

@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_5_R2;
-
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import java.util.Arrays;
-import java.util.Collection;
-import net.minecraft.server.v1_5_R2.EntityPlayer;
-import net.minecraft.server.v1_5_R2.MinecraftServer;
-import net.minecraft.server.v1_5_R2.PlayerInteractManager;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_5_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    @Override
-    public Player loadPlayer(@NotNull OfflinePlayer offline) {
-        // Ensure the player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
-                new PlayerInteractManager(server.getWorldServer(0)));
-
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
-    }
-
-    @Override
-    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
-        return offline.getName();
-    }
-
-    @Override
-    public OfflinePlayer getPlayerByID(@NotNull String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
-    @Override
-    public @NotNull Collection<? extends Player> getOnlinePlayers() {
-        return Arrays.asList(Bukkit.getOnlinePlayers());
-    }
-
-    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().f(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 InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-        return player.openInventory(inventory.getBukkitInventory());
-    }
-
-}

internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/SilentContainerChest.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_5_R2;
-
-import net.minecraft.server.v1_5_R2.ContainerChest;
-import net.minecraft.server.v1_5_R2.EntityHuman;
-import net.minecraft.server.v1_5_R2.IInventory;
-import net.minecraft.server.v1_5_R2.ItemStack;
-import net.minecraft.server.v1_5_R2.PlayerInventory;
-
-class SilentContainerChest extends ContainerChest {
-
-    SilentContainerChest(IInventory i1, IInventory i2) {
-        super(i1, i2);
-        // Send close signal
-        i2.g();
-    }
-
-    @Override
-    public void b(EntityHuman entityHuman) {
-        // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried);
-        }
-    }
-
-}

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

@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_5_R2;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.server.v1_5_R2.EntityPlayer;
-import net.minecraft.server.v1_5_R2.IInventory;
-import net.minecraft.server.v1_5_R2.InventoryEnderChest;
-import net.minecraft.server.v1_5_R2.InventorySubcontainer;
-import net.minecraft.server.v1_5_R2.ItemStack;
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-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 final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline;
-    private CraftPlayer owner;
-    private int maxStack = MAX_STACK;
-
-    public SpecialEnderChest(Player player, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
-                PlayerDataManager.getHandle(player).getEnderChest().c(),
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
-        this.playerOnline = online;
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.owner = 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.owner = 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 ItemStack[] getContents() {
-        return this.items;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        transaction.add(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        transaction.remove(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return transaction;
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner;
-    }
-
-    @Override
-    public void setMaxStackSize(int size) {
-        maxStack = size;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return maxStack;
-    }
-
-    @Override
-    public void update() {
-        super.update();
-        enderChest.update();
-    }
-
-}

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

@@ -1,225 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_5_R2;
-
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import net.minecraft.server.v1_5_R2.ItemStack;
-import net.minecraft.server.v1_5_R2.PlayerInventory;
-import org.bukkit.craftbukkit.v1_5_R2.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].a(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);
-            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();
-    }
-
-}

internal/v1_5_R3/pom.xml

@@ -1,44 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2018 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.0.0</version>
-  </parent>
-
-  <artifactId>openinvadapter1_5_R3</artifactId>
-  <name>OpenInvAdapter1_5_R3</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>craftbukkit</artifactId>
-      <version>1.5.2-R1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-  </dependencies>
-
-</project>

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

@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_5_R3;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import net.minecraft.server.v1_5_R3.AxisAlignedBB;
-import net.minecraft.server.v1_5_R3.BlockEnderChest;
-import net.minecraft.server.v1_5_R3.Container;
-import net.minecraft.server.v1_5_R3.EntityOcelot;
-import net.minecraft.server.v1_5_R3.EntityPlayer;
-import net.minecraft.server.v1_5_R3.IInventory;
-import net.minecraft.server.v1_5_R3.InventoryEnderChest;
-import net.minecraft.server.v1_5_R3.InventoryLargeChest;
-import net.minecraft.server.v1_5_R3.Packet100OpenWindow;
-import net.minecraft.server.v1_5_R3.TileEntityChest;
-import net.minecraft.server.v1_5_R3.TileEntityEnderChest;
-import net.minecraft.server.v1_5_R3.World;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_5_R3.event.CraftEventFactory;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class AnySilentContainer implements IAnySilentContainer {
-
-    @Override
-    public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
-        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
-        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
-
-        if (bukkitBlock instanceof BlockEnderChest) {
-            // Ender chests are not blocked by ocelots.
-            return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        }
-
-        // If block or ocelot on top
-        if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
-            return true;
-        }
-
-        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        // If block next to chest is chest and has a block or ocelot on top
-        if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
-            return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() + 1);
-        } else if(world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
-            return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() - 1);
-        } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            return isBlockedChest(world, bukkitBlock.getX() + 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            return isBlockedChest(world, bukkitBlock.getX() - 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedChest(World world, int x, int y, int z) {
-        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
-    }
-
-    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
-        for (Object localEntity : world.a(EntityOcelot.class,
-                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
-            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
-            if (localEntityOcelot.isSitting()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        // Silent ender chest is API-only
-        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            return true;
-        }
-
-        World world = player.world;
-        Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        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);
-            return true;
-        }
-
-        if (!(tile instanceof IInventory)) {
-            return false;
-        }
-
-        IInventory inventory = (IInventory) tile;
-        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1));
-        } else if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1), inventory);
-        } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()));
-        } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()), inventory);
-        }
-
-        // AnyChest only
-        if (!silent) {
-            player.openContainer(inventory);
-            return true;
-        }
-
-        // SilentChest
-        try {
-            // Call InventoryOpenEvent
-            Container container = new SilentContainerChest(player.inventory, inventory);
-            container = CraftEventFactory.callInventoryOpenEvent(player, container);
-            if (container == null) {
-                return false;
-            }
-
-            // Open window
-            int windowId = player.nextContainerCounter();
-            player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize(), true));
-            player.activeContainer = container;
-            player.activeContainer.windowId = windowId;
-            player.activeContainer.addSlotListener(player);
-
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
-            return false;
-        }
-    }
-
-    @Override
-    public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
-
-}

internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/InventoryAccess.java

@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_5_R3;
-
-import com.lishid.openinv.internal.IInventoryAccess;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.util.InternalAccessor;
-import net.minecraft.server.v1_5_R3.IInventory;
-import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class InventoryAccess implements IInventoryAccess {
-
-    @Override
-    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
-    }
-
-    @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialPlayerInventory) {
-            return (SpecialPlayerInventory) inv;
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
-    }
-
-    @Override
-    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialEnderChest) {
-            return (SpecialEnderChest) inv;
-        }
-        return null;
-    }
-
-}

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

@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_5_R3;
-
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import java.util.Arrays;
-import java.util.Collection;
-import net.minecraft.server.v1_5_R3.EntityPlayer;
-import net.minecraft.server.v1_5_R3.MinecraftServer;
-import net.minecraft.server.v1_5_R3.PlayerInteractManager;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_5_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    @Override
-    public Player loadPlayer(@NotNull OfflinePlayer offline) {
-        // Ensure the player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
-                new PlayerInteractManager(server.getWorldServer(0)));
-
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
-    }
-
-    @Override
-    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
-        return offline.getName();
-    }
-
-    @Override
-    public OfflinePlayer getPlayerByID(@NotNull String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
-    @Override
-    public @NotNull Collection<? extends Player> getOnlinePlayers() {
-        return Arrays.asList(Bukkit.getOnlinePlayers());
-    }
-
-    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;
-    }
-
-    @Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-        return player.openInventory(inventory.getBukkitInventory());
-    }
-
-}

internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/SilentContainerChest.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_5_R3;
-
-import net.minecraft.server.v1_5_R3.ContainerChest;
-import net.minecraft.server.v1_5_R3.EntityHuman;
-import net.minecraft.server.v1_5_R3.IInventory;
-import net.minecraft.server.v1_5_R3.ItemStack;
-import net.minecraft.server.v1_5_R3.PlayerInventory;
-
-class SilentContainerChest extends ContainerChest {
-
-    SilentContainerChest(IInventory i1, IInventory i2) {
-        super(i1, i2);
-        // Send close signal
-        i2.g();
-    }
-
-    @Override
-    public void b(EntityHuman entityHuman) {
-        // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried);
-        }
-    }
-
-}

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

@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_5_R3;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.server.v1_5_R3.EntityPlayer;
-import net.minecraft.server.v1_5_R3.IInventory;
-import net.minecraft.server.v1_5_R3.InventoryEnderChest;
-import net.minecraft.server.v1_5_R3.InventorySubcontainer;
-import net.minecraft.server.v1_5_R3.ItemStack;
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-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 final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline;
-    private CraftPlayer owner;
-    private int maxStack = MAX_STACK;
-
-    public SpecialEnderChest(Player player, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
-                PlayerDataManager.getHandle(player).getEnderChest().c(),
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
-        this.playerOnline = online;
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.owner = 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.owner = 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 ItemStack[] getContents() {
-        return this.items;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        transaction.add(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        transaction.remove(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return transaction;
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner;
-    }
-
-    @Override
-    public void setMaxStackSize(int size) {
-        maxStack = size;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return maxStack;
-    }
-
-    @Override
-    public void update() {
-        super.update();
-        enderChest.update();
-    }
-
-}

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

@@ -1,225 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_5_R3;
-
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import net.minecraft.server.v1_5_R3.ItemStack;
-import net.minecraft.server.v1_5_R3.PlayerInventory;
-import org.bukkit.craftbukkit.v1_5_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].a(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);
-            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();
-    }
-
-}

internal/v1_6_R1/pom.xml

@@ -1,44 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2018 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.0.0</version>
-  </parent>
-
-  <artifactId>openinvadapter1_6_R1</artifactId>
-  <name>OpenInvAdapter1_6_R1</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>craftbukkit</artifactId>
-      <version>1.6.1-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-  </dependencies>
-
-</project>

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

@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_6_R1;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import net.minecraft.server.v1_6_R1.AxisAlignedBB;
-import net.minecraft.server.v1_6_R1.BlockEnderChest;
-import net.minecraft.server.v1_6_R1.Container;
-import net.minecraft.server.v1_6_R1.EntityOcelot;
-import net.minecraft.server.v1_6_R1.EntityPlayer;
-import net.minecraft.server.v1_6_R1.IInventory;
-import net.minecraft.server.v1_6_R1.InventoryEnderChest;
-import net.minecraft.server.v1_6_R1.InventoryLargeChest;
-import net.minecraft.server.v1_6_R1.Packet100OpenWindow;
-import net.minecraft.server.v1_6_R1.TileEntityChest;
-import net.minecraft.server.v1_6_R1.TileEntityEnderChest;
-import net.minecraft.server.v1_6_R1.World;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_6_R1.event.CraftEventFactory;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class AnySilentContainer implements IAnySilentContainer {
-
-    @Override
-    public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
-        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
-        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
-
-        if (bukkitBlock instanceof BlockEnderChest) {
-            // Ender chests are not blocked by ocelots.
-            return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        }
-
-        // If block or ocelot on top
-        if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
-            return true;
-        }
-
-        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        // If block next to chest is chest and has a block or ocelot on top
-        if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
-            return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() + 1);
-        } else if(world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
-            return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() - 1);
-        } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            return isBlockedChest(world, bukkitBlock.getX() + 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            return isBlockedChest(world, bukkitBlock.getX() - 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedChest(World world, int x, int y, int z) {
-        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
-    }
-
-    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
-        for (Object localEntity : world.a(EntityOcelot.class,
-                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
-            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
-            if (localEntityOcelot.isSitting()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        // Silent ender chest is API-only
-        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            return true;
-        }
-
-        World world = player.world;
-        Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        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);
-            return true;
-        }
-
-        if (!(tile instanceof IInventory)) {
-            return false;
-        }
-
-        IInventory inventory = (IInventory) tile;
-        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1));
-        } else if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1), inventory);
-        } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()));
-        } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()), inventory);
-        }
-
-        // AnyChest only
-        if (!silent) {
-            player.openContainer(inventory);
-            return true;
-        }
-
-        // SilentChest
-        try {
-            // Call InventoryOpenEvent
-            Container container = new SilentContainerChest(player.inventory, inventory);
-            container = CraftEventFactory.callInventoryOpenEvent(player, container);
-            if (container == null) {
-                return false;
-            }
-
-            // Open window
-            int windowId = player.nextContainerCounter();
-            player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize(), true));
-            player.activeContainer = container;
-            player.activeContainer.windowId = windowId;
-            player.activeContainer.addSlotListener(player);
-
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
-            return false;
-        }
-    }
-
-    @Override
-    public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
-
-}

internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/InventoryAccess.java

@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_6_R1;
-
-import com.lishid.openinv.internal.IInventoryAccess;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.util.InternalAccessor;
-import net.minecraft.server.v1_6_R1.IInventory;
-import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-
-public class InventoryAccess implements IInventoryAccess {
-
-    @Override
-    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
-    }
-
-    @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialPlayerInventory) {
-            return (SpecialPlayerInventory) inv;
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
-        if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
-        }
-        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
-    }
-
-    @Override
-    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
-        IInventory inv;
-        if (inventory instanceof CraftInventory) {
-            inv = ((CraftInventory) inventory).getInventory();
-        } else {
-            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
-        }
-
-        if (inv instanceof SpecialEnderChest) {
-            return (SpecialEnderChest) inv;
-        }
-        return null;
-    }
-
-}

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

@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_6_R1;
-
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import java.util.Arrays;
-import java.util.Collection;
-import net.minecraft.server.v1_6_R1.EntityPlayer;
-import net.minecraft.server.v1_6_R1.MinecraftServer;
-import net.minecraft.server.v1_6_R1.PlayerInteractManager;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_6_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-public class PlayerDataManager implements IPlayerDataManager {
-
-    @Override
-    public Player loadPlayer(@NotNull OfflinePlayer offline) {
-        // Ensure the player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
-                new PlayerInteractManager(server.getWorldServer(0)));
-
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
-    }
-
-    @Override
-    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
-        return offline.getName();
-    }
-
-    @Override
-    public OfflinePlayer getPlayerByID(@NotNull String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
-    @Override
-    public @NotNull Collection<? extends Player> getOnlinePlayers() {
-        return Arrays.asList(Bukkit.getOnlinePlayers());
-    }
-
-    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;
-    }
-
-    @Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-        return player.openInventory(inventory.getBukkitInventory());
-    }
-
-}

internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/SilentContainerChest.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_6_R1;
-
-import net.minecraft.server.v1_6_R1.ContainerChest;
-import net.minecraft.server.v1_6_R1.EntityHuman;
-import net.minecraft.server.v1_6_R1.IInventory;
-import net.minecraft.server.v1_6_R1.ItemStack;
-import net.minecraft.server.v1_6_R1.PlayerInventory;
-
-class SilentContainerChest extends ContainerChest {
-
-    SilentContainerChest(IInventory i1, IInventory i2) {
-        super(i1, i2);
-        // Send close signal
-        i2.g();
-    }
-
-    @Override
-    public void b(EntityHuman entityHuman) {
-        // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried);
-        }
-    }
-
-}

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

@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_6_R1;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.server.v1_6_R1.EntityPlayer;
-import net.minecraft.server.v1_6_R1.IInventory;
-import net.minecraft.server.v1_6_R1.InventoryEnderChest;
-import net.minecraft.server.v1_6_R1.InventorySubcontainer;
-import net.minecraft.server.v1_6_R1.ItemStack;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-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 final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline;
-    private CraftPlayer owner;
-    private int maxStack = MAX_STACK;
-
-    public SpecialEnderChest(Player player, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
-                PlayerDataManager.getHandle(player).getEnderChest().c(),
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
-        this.playerOnline = online;
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.owner = 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.owner = 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 ItemStack[] getContents() {
-        return this.items;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        transaction.add(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        transaction.remove(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return transaction;
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner;
-    }
-
-    @Override
-    public void setMaxStackSize(int size) {
-        maxStack = size;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return maxStack;
-    }
-
-    @Override
-    public void update() {
-        super.update();
-        enderChest.update();
-    }
-
-}

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

@@ -1,225 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_6_R1;
-
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import net.minecraft.server.v1_6_R1.ItemStack;
-import net.minecraft.server.v1_6_R1.PlayerInventory;
-import org.bukkit.craftbukkit.v1_6_R1.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].a(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);
-            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();
-    }
-
-}

internal/v1_6_R2/pom.xml

@@ -1,44 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2018 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.0.0</version>
-  </parent>
-
-  <artifactId>openinvadapter1_6_R2</artifactId>
-  <name>OpenInvAdapter1_6_R2</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>craftbukkit</artifactId>
-      <version>1.6.2-R1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-  </dependencies>
-
-</project>

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

@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2011-2018 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_6_R2;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import net.minecraft.server.v1_6_R2.AxisAlignedBB;
-import net.minecraft.server.v1_6_R2.BlockEnderChest;
-import net.minecraft.server.v1_6_R2.Container;
-import net.minecraft.server.v1_6_R2.EntityOcelot;
-import net.minecraft.server.v1_6_R2.EntityPlayer;
-import net.minecraft.server.v1_6_R2.IInventory;
-import net.minecraft.server.v1_6_R2.InventoryEnderChest;
-import net.minecraft.server.v1_6_R2.InventoryLargeChest;
-import net.minecraft.server.v1_6_R2.Packet100OpenWindow;
-import net.minecraft.server.v1_6_R2.TileEntityChest;
-import net.minecraft.server.v1_6_R2.TileEntityEnderChest;
-import net.minecraft.server.v1_6_R2.World;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_6_R2.event.CraftEventFactory;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class AnySilentContainer implements IAnySilentContainer {
-
-    @Override
-    public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
-        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
-        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
-
-        if (bukkitBlock instanceof BlockEnderChest) {
-            // Ender chests are not blocked by ocelots.
-            return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        }
-
-        // If block or ocelot on top
-        if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
-            return true;
-        }
-
-        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        // If block next to chest is chest and has a block or ocelot on top
-        if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
-            return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() + 1);
-        } else if(world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
-            return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() - 1);
-        } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            return isBlockedChest(world, bukkitBlock.getX() + 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            return isBlockedChest(world, bukkitBlock.getX() - 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
-        }
-
-        return false;
-    }
-
-    private boolean isBlockedChest(World world, int x, int y, int z) {
-        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
-    }
-
-    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
-        for (Object localEntity : world.a(EntityOcelot.class,
-                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
-            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
-            if (localEntityOcelot.isSitting()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
-
-        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
-
-        // Silent ender chest is API-only
-        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            return true;
-        }
-
-        World world = player.world;
-        Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        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);
-            return true;
-        }
-
-        if (!(tile instanceof IInventory)) {
-            return false;
-        }
-
-        IInventory inventory = (IInventory) tile;
-        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-
-        if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1));
-        } else if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1), inventory);
-        } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()));
-        } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()), inventory);
-        }
-
-        // AnyChest only
-        if (!silent) {
-            player.openContainer(inventory);
-            return true;
-        }
-
-        // SilentChest
-        try {
-            // Call InventoryOpenEvent
-            Container container = new SilentContainerChest(player.inventory, inventory);
-            container = CraftEventFactory.callInventoryOpenEvent(player, container);
-            if (container == null) {
-                return false;
-            }
-
-            // Open window
-            int windowId = player.nextContainerCounter();
-            player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize(), true));
-            player.activeContainer = container;
-            player.activeContainer.windowId = windowId;
-            player.activeContainer.addSlotListener(player);
-
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
-            return false;
-        }
-    }
-
-    @Override
-    public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
-
-}