Bump version to 4.0.0 for release

To continue providing renamed ender chests/player inventories we can no longer just provide an Inventory, a full InventoryView is required. To avoid confusion the old method has been removed entirely, leading to a major API revision bump.

api/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.5</version>
+    <version>4.0.0</version>
   </parent>
 
   <artifactId>openinvapi</artifactId>

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

@@ -16,16 +16,17 @@
 
 package com.lishid.openinv;
 
-import javax.annotation.Nullable;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
 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 org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.InventoryView;
 import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Interface defining behavior for the OpenInv plugin.
@@ -45,50 +46,20 @@ public interface IOpenInv {
     boolean disableSaving();
 
     /**
-     * Gets the active ISilentContainer implementation. May return null if the server version is
-     * unsupported.
+     * Gets the active ISilentContainer implementation.
      *
      * @return the ISilentContainer
      * @throws IllegalStateException if the server version is unsupported
      */
-    IAnySilentContainer getAnySilentContainer();
+    @NotNull IAnySilentContainer getAnySilentContainer();
 
     /**
-     * Gets an ISpecialEnderChest for the given Player. Returns null if the ISpecialEnderChest could
-     * not be instantiated.
-     *
-     * @param player the Player
-     * @param online true if the Player is currently online
-     * @return the ISpecialEnderChest
-     * @throws IllegalStateException if the server version is unsupported
-     * @deprecated Use {@link IOpenInv#getSpecialEnderChest(Player, boolean)}
-     */
-    @Deprecated
-    @Nullable
-    ISpecialEnderChest getEnderChest(Player player, boolean online);
-
-    /**
-     * Gets an ISpecialPlayerInventory for the given Player. Returns null if the
-     * ISpecialPlayerInventory could not be instantiated.
-     *
-     * @param player the Player
-     * @param online true if the Player is currently online
-     * @return the ISpecialPlayerInventory
-     * @throws IllegalStateException if the server version is unsupported
-     * @deprecated Use {@link IOpenInv#getSpecialInventory(Player, boolean)}
-     */
-    @Deprecated
-    @Nullable
-    ISpecialPlayerInventory getInventory(Player player, boolean online);
-
-    /**
-     * Gets the active IInventoryAccess implementation. May return null if the server version is
-     * unsupported.
+     * Gets the active IInventoryAccess implementation.
      *
      * @return the IInventoryAccess
      * @throws IllegalStateException if the server version is unsupported
      */
-    IInventoryAccess getInventoryAccess();
+    @NotNull IInventoryAccess getInventoryAccess();
 
     /**
      * Gets the provided player's AnyChest setting.
@@ -97,7 +68,7 @@ public interface IOpenInv {
      * @return true if AnyChest is enabled
      * @throws IllegalStateException if the server version is unsupported
      */
-    boolean getPlayerAnyChestStatus(OfflinePlayer player);
+    boolean getPlayerAnyChestStatus(@NotNull OfflinePlayer player);
 
     /**
      * Gets a unique identifier by which the OfflinePlayer can be referenced. Using the value
@@ -107,16 +78,16 @@ public interface IOpenInv {
      * @return the identifier
      * @throws IllegalStateException if the server version is unsupported
      */
-    String getPlayerID(OfflinePlayer offline);
+    @NotNull String getPlayerID(@NotNull OfflinePlayer offline);
 
     /**
      * Gets a player's SilentChest setting.
      *
-     * @param player the OfflinePlayer
+     * @param offline the OfflinePlayer
      * @return true if SilentChest is enabled
      * @throws IllegalStateException if the server version is unsupported
      */
-    boolean getPlayerSilentChestStatus(OfflinePlayer player);
+    boolean getPlayerSilentChestStatus(@NotNull OfflinePlayer offline);
 
     /**
      * Gets an ISpecialEnderChest for the given Player.
@@ -127,7 +98,7 @@ public interface IOpenInv {
      * @throws IllegalStateException  if the server version is unsupported
      * @throws InstantiationException if the ISpecialEnderChest could not be instantiated
      */
-    ISpecialEnderChest getSpecialEnderChest(Player player, boolean online) throws InstantiationException;
+    @NotNull ISpecialEnderChest getSpecialEnderChest(@NotNull Player player, boolean online) throws InstantiationException;
 
     /**
      * Gets an ISpecialPlayerInventory for the given Player.
@@ -138,7 +109,7 @@ public interface IOpenInv {
      * @throws IllegalStateException  if the server version is unsupported
      * @throws InstantiationException if the ISpecialPlayerInventory could not be instantiated
      */
-    ISpecialPlayerInventory getSpecialInventory(Player player, boolean online) throws InstantiationException;
+    @NotNull ISpecialPlayerInventory getSpecialInventory(@NotNull Player player, boolean online) throws InstantiationException;
 
     /**
      * Checks if the server version is supported by OpenInv.
@@ -154,8 +125,7 @@ public interface IOpenInv {
      * @return the Player, or null
      * @throws IllegalStateException if the server version is unsupported
      */
-    @Nullable
-    Player loadPlayer(final OfflinePlayer offline);
+    @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline);
 
     /**
      * Get an OfflinePlayer by name.
@@ -167,8 +137,16 @@ 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(String name);
+    @Nullable OfflinePlayer matchPlayer(@NotNull String name);
+
+    /**
+     * Open an ISpecialInventory for a Player.
+     *
+     * @param player the Player
+     * @param inventory the ISpecialInventory
+     * @return the InventoryView for the opened ISpecialInventory
+     */
+    @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory);
 
     /**
      * Check the configuration value for whether or not OpenInv displays a notification to the user
@@ -194,7 +172,7 @@ public interface IOpenInv {
      * @param plugin the Plugin no longer holding a reference to the Player
      * @throws IllegalStateException if the server version is unsupported
      */
-    void releasePlayer(Player player, Plugin plugin);
+    void releasePlayer(@NotNull Player player, @NotNull Plugin plugin);
 
     /**
      * Mark a Player as in use by a Plugin to prevent it from being removed from the cache. Used to
@@ -219,32 +197,32 @@ public interface IOpenInv {
      * @param plugin the Plugin holding the reference to the Player
      * @throws IllegalStateException if the server version is unsupported
      */
-    void retainPlayer(Player player, Plugin plugin);
+    void retainPlayer(@NotNull Player player, @NotNull Plugin plugin);
 
     /**
      * Sets a player's AnyChest setting.
      *
-     * @param player the OfflinePlayer
+     * @param offline the OfflinePlayer
      * @param status the status
      * @throws IllegalStateException if the server version is unsupported
      */
-    void setPlayerAnyChestStatus(OfflinePlayer player, boolean status);
+    void setPlayerAnyChestStatus(@NotNull OfflinePlayer offline, boolean status);
 
     /**
      * Sets a player's SilentChest setting.
      *
-     * @param player the OfflinePlayer
+     * @param offline the OfflinePlayer
      * @param status the status
      * @throws IllegalStateException if the server version is unsupported
      */
-    void setPlayerSilentChestStatus(OfflinePlayer player, boolean status);
+    void setPlayerSilentChestStatus(@NotNull OfflinePlayer offline, boolean status);
 
     /**
      * Forcibly unload a cached Player's data.
      *
-     * @param player the OfflinePlayer to unload
+     * @param offline the OfflinePlayer to unload
      * @throws IllegalStateException if the server version is unsupported
      */
-    void unload(OfflinePlayer player);
+    void unload(@NotNull OfflinePlayer offline);
 
 }

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

@@ -18,6 +18,7 @@ package com.lishid.openinv.internal;
 
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 public interface IAnySilentContainer {
 
@@ -26,19 +27,19 @@ public interface IAnySilentContainer {
      * containers to open, be sure to check {@link #isAnyContainerNeeded(Player, Block)}
      * first.
      *
-     * @param player      the Player opening the container
-     * @param silentchest whether the container's noise is to be silenced
-     * @param block       the Block
+     * @param player    the Player opening the container
+     * @param silent    whether the container's noise is to be silenced
+     * @param block     the Block
      * @return true if the container can be opened
      */
-    boolean activateContainer(Player player, boolean silentchest, Block block);
+    boolean activateContainer(@NotNull Player player, boolean silent, @NotNull Block block);
 
     /**
      * Closes the Player's currently open container silently, if necessary.
      *
      * @param player the Player closing a container
      */
-    void deactivateContainer(Player player);
+    void deactivateContainer(@NotNull Player player);
 
     /**
      * Checks if the container at the given coordinates is blocked.
@@ -47,7 +48,7 @@ public interface IAnySilentContainer {
      * @param block  the Block
      * @return true if the container is blocked
      */
-    boolean isAnyContainerNeeded(Player player, Block block);
+    boolean isAnyContainerNeeded(@NotNull Player player, @NotNull Block block);
 
     /**
      * Checks if the given block is a container which can be unblocked or silenced.
@@ -55,6 +56,6 @@ public interface IAnySilentContainer {
      * @param block the BlockState
      * @return true if the Block is a supported container
      */
-    boolean isAnySilentContainer(Block block);
+    boolean isAnySilentContainer(@NotNull Block block);
 
 }

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

@@ -16,9 +16,9 @@
 
 package com.lishid.openinv.internal;
 
-import javax.annotation.Nullable;
-
 import org.bukkit.inventory.Inventory;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public interface IInventoryAccess {
 
@@ -29,8 +29,7 @@ public interface IInventoryAccess {
      * @param inventory the Inventory
      * @return the ISpecialEnderChest or null
      */
-    @Nullable
-    ISpecialEnderChest getSpecialEnderChest(Inventory inventory);
+    @Nullable ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory);
 
     /**
      * Gets an ISpecialPlayerInventory from an Inventory or null if the Inventory is not backed by
@@ -39,8 +38,7 @@ public interface IInventoryAccess {
      * @param inventory the Inventory
      * @return the ISpecialPlayerInventory or null
      */
-    @Nullable
-    ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory);
+    @Nullable ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory);
 
     /**
      * Check if an Inventory is an ISpecialEnderChest implementation.
@@ -48,7 +46,7 @@ public interface IInventoryAccess {
      * @param inventory the Inventory
      * @return true if the Inventory is backed by an ISpecialEnderChest
      */
-    boolean isSpecialEnderChest(Inventory inventory);
+    boolean isSpecialEnderChest(@NotNull Inventory inventory);
 
     /**
      * Check if an Inventory is an ISpecialPlayerInventory implementation.
@@ -56,6 +54,6 @@ public interface IInventoryAccess {
      * @param inventory the Inventory
      * @return true if the Inventory is backed by an ISpecialPlayerInventory
      */
-    boolean isSpecialPlayerInventory(Inventory inventory);
+    boolean isSpecialPlayerInventory(@NotNull Inventory inventory);
 
 }

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

@@ -16,35 +16,6 @@
 
 package com.lishid.openinv.internal;
 
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
-public interface ISpecialEnderChest {
-
-    /**
-     * Gets the Inventory associated with this ISpecialEnderChest.
-     *
-     * @return the Inventory
-     */
-    Inventory getBukkitInventory();
-
-    /**
-     * Sets the Player associated with this ISpecialEnderChest online.
-     *
-     * @param player the Player coming online
-     */
-    void setPlayerOnline(Player player);
-
-    /**
-     * Sets the Player associated with this ISpecialEnderChest offline.
-     */
-    void setPlayerOffline();
-
-    /**
-     * Gets whether or not this ISpecialEnderChest is in use.
-     *
-     * @return true if the ISpecialEnderChest is in use
-     */
-    boolean isInUse();
+public interface ISpecialEnderChest extends ISpecialInventory {
 
 }

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

@@ -0,0 +1,51 @@
+/*
+ * 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;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.jetbrains.annotations.NotNull;
+
+public interface ISpecialInventory {
+
+    /**
+     * Gets the Inventory associated with this ISpecialInventory.
+     *
+     * @return the Inventory
+     */
+    @NotNull Inventory getBukkitInventory();
+
+    /**
+     * Sets the Player associated with this ISpecialInventory online.
+     *
+     * @param player the Player coming online
+     */
+    void setPlayerOnline(@NotNull Player player);
+
+    /**
+     * Sets the Player associated with this ISpecialInventory offline.
+     */
+    void setPlayerOffline();
+
+    /**
+     * Gets whether or not this ISpecialInventory is in use.
+     *
+     * @return true if the ISpecialInventory is in use
+     */
+    boolean isInUse();
+
+}

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

@@ -16,35 +16,6 @@
 
 package com.lishid.openinv.internal;
 
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
-public interface ISpecialPlayerInventory {
-
-    /**
-     * Gets the Inventory associated with this ISpecialPlayerInventory.
-     *
-     * @return the Inventory
-     */
-    Inventory getBukkitInventory();
-
-    /**
-     * Sets the Player associated with this ISpecialPlayerInventory online.
-     *
-     * @param player the Player coming online
-     */
-    void setPlayerOnline(Player player);
-
-    /**
-     * Sets the Player associated with this ISpecialPlayerInventory offline.
-     */
-    void setPlayerOffline();
-
-    /**
-     * Gets whether or not this ISpecialPlayerInventory is in use.
-     *
-     * @return true if the ISpecialPlayerInventory is in use
-     */
-    boolean isInUse();
+public interface ISpecialPlayerInventory extends ISpecialInventory {
 
 }

assembly/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.5</version>
+    <version>4.0.0</version>
   </parent>
 
   <artifactId>openinvassembly</artifactId>

common/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.5</version>
+    <version>4.0.0</version>
   </parent>
 
   <artifactId>openinvcommon</artifactId>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvapi</artifactId>
-      <version>3.3.5</version>
+      <version>4.0.0</version>
     </dependency>
   </dependencies>
 

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

@@ -17,9 +17,11 @@
 package com.lishid.openinv.internal;
 
 import java.util.Collection;
-
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.InventoryView;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public interface IPlayerDataManager {
 
@@ -31,7 +33,7 @@ public interface IPlayerDataManager {
      * @param offline the OfflinePlayer
      * @return the Player loaded
      */
-	Player loadPlayer(OfflinePlayer offline);
+    @Nullable Player loadPlayer(@NotNull OfflinePlayer offline);
 
     /**
      * Gets a unique identifying string for an OfflinePlayer.
@@ -39,7 +41,7 @@ public interface IPlayerDataManager {
      * @param offline the OfflinePlayer
      * @return the unique identifier
      */
-	String getPlayerDataID(OfflinePlayer offline);
+    @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline);
 
     /**
      * Gets an OfflinePlayer by the given unique identifier.
@@ -47,13 +49,23 @@ public interface IPlayerDataManager {
      * @param identifier the unique identifier
      * @return the OfflinePlayer, or null if no exact match was found
      */
-	OfflinePlayer getPlayerByID(String identifier);
+    @Nullable OfflinePlayer getPlayerByID(@NotNull String identifier);
 
     /**
      * Gets a Collection of all Players currently online.
      *
      * @return the Collection of Players
      */
-	Collection<? extends Player> getOnlinePlayers();
+    @NotNull Collection<? extends Player> getOnlinePlayers();
+
+    /**
+     * Opens an ISpecialInventory for a Player.
+     *
+     * @param player the Player opening the ISpecialInventory
+     * @param inventory the Inventory
+     *`
+     * @return the InventoryView opened
+     */
+    InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory);
 
 }

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.util;
 
+import com.google.common.collect.Multimap;
+import com.google.common.collect.TreeMultimap;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -23,9 +25,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import com.google.common.collect.Multimap;
-import com.google.common.collect.TreeMultimap;
-
 /**
  * A minimal thread-safe time-based cache implementation backed by a HashMap and TreeMultimap.
  *

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

@@ -16,16 +16,14 @@
 
 package com.lishid.openinv.util;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
 import com.lishid.openinv.internal.IInventoryAccess;
 import com.lishid.openinv.internal.IPlayerDataManager;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
@@ -63,13 +61,14 @@ public class InternalAccessor {
         this.version = packageName.substring(packageName.lastIndexOf('.') + 1);
 
         try {
+            // TODO: implement support for CraftMagicNumbers#getMappingsVersion
             Class.forName("com.lishid.openinv.internal." + this.version + ".SpecialPlayerInventory");
             Class.forName("com.lishid.openinv.internal." + this.version + ".SpecialEnderChest");
             this.playerDataManager = this.createObject(IPlayerDataManager.class, "PlayerDataManager");
             this.inventoryAccess = this.createObject(IInventoryAccess.class, "InventoryAccess");
             this.anySilentContainer = this.createObject(IAnySilentContainer.class, "AnySilentContainer");
             this.supported = true;
-        } catch (Exception e) {}
+        } catch (Exception ignored) {}
     }
 
     private <T> T createObject(final Class<? extends T> assignableClass, final String className,

internal/1_4_5/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.5</version>
+    <version>4.0.0</version>
   </parent>
 
   <artifactId>openinvadapter1_4_5</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.5</version>
+      <version>4.0.0</version>
     </dependency>
   </dependencies>
 

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

@@ -17,11 +17,6 @@
 package com.lishid.openinv.internal.v1_4_5;
 
 import com.lishid.openinv.internal.IAnySilentContainer;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
 import net.minecraft.server.v1_4_5.AxisAlignedBB;
 import net.minecraft.server.v1_4_5.BlockEnderChest;
 import net.minecraft.server.v1_4_5.Container;
@@ -34,43 +29,46 @@ 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(org.bukkit.block.Block block) {
-        return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
+    public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
+        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
     }
 
     @Override
-    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = PlayerDataManager.getHandle(p);
-        World world = player.world;
+        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
 
-        if (block instanceof BlockEnderChest) {
+        if (bukkitBlock instanceof BlockEnderChest) {
             // Ender chests are not blocked by ocelots.
-            return world.t(block.getX(), block.getY() + 1, block.getZ());
+            return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
         }
 
         // If block or ocelot on top
-        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+        if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
             return true;
         }
 
-        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+        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(block.getX(), block.getY(), block.getZ() + 1) == id) {
-            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
-        } else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
-        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
-        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        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;
@@ -93,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
 
-        EntityPlayer player = PlayerDataManager.getHandle(p);
+        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
         // Silent ender chest is API-only
-        if (silentchest && block.getType() == Material.ENDER_CHEST) {
-            p.openInventory(p.getEnderChest());
+        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
+            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
             return true;
         }
 
         World world = player.world;
-        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+        Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
 
         if (tile == null) {
             return false;
@@ -123,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         IInventory inventory = (IInventory) tile;
-        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
 
-        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
-        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
-        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
-        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
+        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 (!silentchest) {
+        if (!silent) {
             player.openContainer(inventory);
             return true;
         }
@@ -160,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
             return true;
         } catch (Exception e) {
             e.printStackTrace();
-            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
             return false;
         }
     }
 
     @Override
-    public void deactivateContainer(final Player bukkitPlayer) {}
+    public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
 
 }

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

@@ -20,17 +20,15 @@ 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 org.bukkit.inventory.Inventory;
-
 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(Inventory inventory) {
+    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
         }
@@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();
@@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public boolean isSpecialEnderChest(Inventory inventory) {
+    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
         }
@@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();

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

@@ -16,29 +16,28 @@
 
 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 com.lishid.openinv.internal.IPlayerDataManager;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-
 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(OfflinePlayer offline) {
+    public Player loadPlayer(@NotNull OfflinePlayer offline) {
         // Ensure the player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
+        if (!offline.hasPlayedBefore()) {
             return null;
         }
 
@@ -49,7 +48,7 @@ public class PlayerDataManager implements IPlayerDataManager {
                 new ItemInWorldManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
-        Player target = (entity == null) ? null : entity.getBukkitEntity();
+        Player target = entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
@@ -59,12 +58,12 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public String getPlayerDataID(OfflinePlayer offline) {
+    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
         return offline.getName();
     }
 
     @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
+    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()) {
@@ -74,7 +73,7 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public Collection<? extends Player> getOnlinePlayers() {
+    public @NotNull Collection<? extends Player> getOnlinePlayers() {
         return Arrays.asList(Bukkit.getOnlinePlayers());
     }
 
@@ -98,4 +97,9 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -24,7 +24,7 @@ import net.minecraft.server.v1_4_5.PlayerInventory;
 
 class SilentContainerChest extends ContainerChest {
 
-    public SilentContainerChest(IInventory i1, IInventory i2) {
+    SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
         // Send close signal
         i2.f();

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

@@ -16,26 +16,23 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
-
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-
 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 {
 
@@ -57,12 +54,12 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public void setPlayerOnline(@NotNull Player player) {
         if (!playerOnline) {
             try {
                 EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
@@ -71,7 +68,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            } catch (Exception ignored) {}
             playerOnline = true;
         }
     }

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

@@ -17,14 +17,12 @@
 package com.lishid.openinv.internal.v1_4_5;
 
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 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 {
 
@@ -40,12 +38,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public void setPlayerOnline(@NotNull Player player) {
         if (!playerOnline) {
             this.player = PlayerDataManager.getHandle(player);
             this.player.inventory.items = this.items;

internal/1_4_6/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.5</version>
+    <version>4.0.0</version>
   </parent>
 
   <artifactId>openinvadapter1_4_6</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.5</version>
+      <version>4.0.0</version>
     </dependency>
   </dependencies>
 

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

@@ -17,11 +17,6 @@
 package com.lishid.openinv.internal.v1_4_6;
 
 import com.lishid.openinv.internal.IAnySilentContainer;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
 import net.minecraft.server.v1_4_6.AxisAlignedBB;
 import net.minecraft.server.v1_4_6.BlockEnderChest;
 import net.minecraft.server.v1_4_6.Container;
@@ -34,43 +29,46 @@ 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(org.bukkit.block.Block block) {
-        return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
+    public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
+        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
     }
 
     @Override
-    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = PlayerDataManager.getHandle(p);
-        World world = player.world;
+        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
 
-        if (block instanceof BlockEnderChest) {
+        if (bukkitBlock instanceof BlockEnderChest) {
             // Ender chests are not blocked by ocelots.
-            return world.t(block.getX(), block.getY() + 1, block.getZ());
+            return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
         }
 
         // If block or ocelot on top
-        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+        if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
             return true;
         }
 
-        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+        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(block.getX(), block.getY(), block.getZ() + 1) == id) {
-            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
-        } else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
-        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
-        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        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;
@@ -93,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
 
-        EntityPlayer player = PlayerDataManager.getHandle(p);
+        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
         // Silent ender chest is API-only
-        if (silentchest && block.getType() == Material.ENDER_CHEST) {
-            p.openInventory(p.getEnderChest());
+        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
+            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
             return true;
         }
 
         World world = player.world;
-        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+        Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
 
         if (tile == null) {
             return false;
@@ -123,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         IInventory inventory = (IInventory) tile;
-        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
 
-        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
-        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
-        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
-        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
+        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 (!silentchest) {
+        if (!silent) {
             player.openContainer(inventory);
             return true;
         }
@@ -160,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
             return true;
         } catch (Exception e) {
             e.printStackTrace();
-            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
             return false;
         }
     }
 
     @Override
-    public void deactivateContainer(final Player bukkitPlayer) {}
+    public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
 
 }

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

@@ -20,17 +20,15 @@ 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 org.bukkit.inventory.Inventory;
-
 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(Inventory inventory) {
+    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
         }
@@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();
@@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public boolean isSpecialEnderChest(Inventory inventory) {
+    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
         }
@@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();

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

@@ -16,29 +16,28 @@
 
 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 com.lishid.openinv.internal.IPlayerDataManager;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-
 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(OfflinePlayer offline) {
+    public Player loadPlayer(@NotNull OfflinePlayer offline) {
         // Ensure the player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
+        if (!offline.hasPlayedBefore()) {
             return null;
         }
 
@@ -49,7 +48,7 @@ public class PlayerDataManager implements IPlayerDataManager {
                 new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
-        Player target = (entity == null) ? null : entity.getBukkitEntity();
+        Player target = entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
@@ -59,12 +58,12 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public String getPlayerDataID(OfflinePlayer offline) {
+    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
         return offline.getName();
     }
 
     @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
+    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()) {
@@ -74,7 +73,7 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public Collection<? extends Player> getOnlinePlayers() {
+    public @NotNull Collection<? extends Player> getOnlinePlayers() {
         return Arrays.asList(Bukkit.getOnlinePlayers());
     }
 
@@ -98,4 +97,9 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -24,7 +24,7 @@ import net.minecraft.server.v1_4_6.PlayerInventory;
 
 class SilentContainerChest extends ContainerChest {
 
-    public SilentContainerChest(IInventory i1, IInventory i2) {
+    SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
         // Send close signal
         i2.f();

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

@@ -16,26 +16,23 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
-
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-
 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 {
 
@@ -57,12 +54,12 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public void setPlayerOnline(@NotNull Player player) {
         if (!playerOnline) {
             try {
                 EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
@@ -71,7 +68,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            } catch (Exception ignored) {}
             playerOnline = true;
         }
     }

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

@@ -17,14 +17,12 @@
 package com.lishid.openinv.internal.v1_4_6;
 
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 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 {
 
@@ -40,12 +38,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public void setPlayerOnline(@NotNull Player player) {
         if (!playerOnline) {
             this.player = PlayerDataManager.getHandle(player);
             this.player.inventory.items = this.items;

internal/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.5</version>
+    <version>4.0.0</version>
   </parent>
 
   <artifactId>openinvinternal</artifactId>
@@ -33,7 +33,7 @@
     <profile>
       <id>latest</id>
       <modules>
-        <module>v1_12_R1</module>
+        <module>v1_14_R1</module>
       </modules>
     </profile>
 
@@ -41,8 +41,8 @@
       <id>recent</id>
       <!-- The recent profile is for the most recent 2 versions. -->
       <modules>
-        <module>v1_12_R1</module>
-        <module>v1_13_R1</module>
+        <module>v1_13_R2</module>
+        <module>v1_14_R1</module>
       </modules>
     </profile>
 
@@ -72,6 +72,8 @@
         <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

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.5</version>
+    <version>4.0.0</version>
   </parent>
 
   <artifactId>openinvadapter1_10_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.5</version>
+      <version>4.0.0</version>
     </dependency>
   </dependencies>
 

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

@@ -16,14 +16,8 @@
 
 package com.lishid.openinv.internal.v1_10_R1;
 
-import java.lang.reflect.Field;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
-
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-
+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;
@@ -43,6 +37,10 @@ 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 {
 
@@ -59,15 +57,15 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean isAnySilentContainer(org.bukkit.block.Block block) {
-        return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
+    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(Player p, org.bukkit.block.Block b) {
-        EntityPlayer player = PlayerDataManager.getHandle(p);
-        World world = player.world;
-        BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
+    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) {
@@ -122,19 +120,19 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block b) {
+    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull org.bukkit.block.Block bukkitBlock) {
 
-        EntityPlayer player = PlayerDataManager.getHandle(p);
+        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
         // Silent ender chest is pretty much API-only
-        if (silentchest && b.getType() == Material.ENDER_CHEST) {
-            p.openInventory(p.getEnderChest());
+        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(b.getX(), b.getY(), b.getZ());
+        BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
         Object tile = world.getTileEntity(blockPosition);
 
         if (tile == null) {
@@ -190,7 +188,7 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
-        if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
+        if (!silent || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
             player.openContainer(tileInventory);
             return true;
         }
@@ -208,7 +206,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public void deactivateContainer(final Player bukkitPlayer) {
+    public void deactivateContainer(@NotNull final Player bukkitPlayer) {
         if (this.playerInteractManagerGamemode == null) {
             return;
         }

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

@@ -20,17 +20,15 @@ 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 org.bukkit.inventory.Inventory;
-
 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(Inventory inventory) {
+    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
         }
@@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();
@@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public boolean isSpecialEnderChest(Inventory inventory) {
+    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
         }
@@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();

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

@@ -16,31 +16,29 @@
 
 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 com.lishid.openinv.internal.IPlayerDataManager;
-
-import com.mojang.authlib.GameProfile;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-
 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(OfflinePlayer offline) {
+    public Player loadPlayer(@NotNull OfflinePlayer offline) {
         // Ensure player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
+        if (!offline.hasPlayedBefore()) {
             return null;
         }
 
@@ -51,7 +49,7 @@ public class PlayerDataManager implements IPlayerDataManager {
                 new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
-        Player target = (entity == null) ? null : entity.getBukkitEntity();
+        Player target = entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
@@ -61,12 +59,12 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public String getPlayerDataID(OfflinePlayer offline) {
+    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
         return offline.getUniqueId().toString();
     }
 
     @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
+    public OfflinePlayer getPlayerByID(@NotNull String identifier) {
         try {
             UUID uuid = UUID.fromString(identifier);
             OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
@@ -82,7 +80,7 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public Collection<? extends Player> getOnlinePlayers() {
+    public @NotNull Collection<? extends Player> getOnlinePlayers() {
         return Bukkit.getOnlinePlayers();
     }
 
@@ -106,4 +104,9 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -16,21 +16,18 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 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 {
 
@@ -70,18 +67,18 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    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 e) {}
+            } catch (Exception ignored) {}
             playerOnline = true;
         }
     }

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

@@ -16,19 +16,16 @@
 
 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 com.lishid.openinv.internal.ISpecialPlayerInventory;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 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 {
 
@@ -80,12 +77,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public void setPlayerOnline(@NotNull Player player) {
         if (!playerOnline) {
             this.player = PlayerDataManager.getHandle(player);
             setItemArrays(this.player.inventory, items, armor, extraSlots);

internal/v1_11_R1/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.5</version>
+    <version>4.0.0</version>
   </parent>
 
   <artifactId>openinvadapter1_11_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.5</version>
+      <version>4.0.0</version>
     </dependency>
   </dependencies>
 

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

@@ -16,15 +16,8 @@
 
 package com.lishid.openinv.internal.v1_11_R1;
 
-import java.lang.reflect.Field;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
-
-import org.bukkit.Material;
-import org.bukkit.block.BlockState;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-
+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;
@@ -35,18 +28,23 @@ 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 net.minecraft.server.v1_11_R1.EnumGamemode;
-import net.minecraft.server.v1_11_R1.PlayerInteractManager;
+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 {
 
@@ -63,19 +61,19 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean isAnySilentContainer(org.bukkit.block.Block block) {
-        if (block.getType() == Material.ENDER_CHEST) {
+    public boolean isAnySilentContainer(@NotNull org.bukkit.block.Block bukkitBlock) {
+        if (bukkitBlock.getType() == Material.ENDER_CHEST) {
             return true;
         }
-        BlockState state = block.getState();
+        BlockState state = bukkitBlock.getState();
         return state instanceof org.bukkit.block.Chest || state instanceof org.bukkit.block.ShulkerBox;
     }
 
     @Override
-    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block b) {
-        EntityPlayer player = PlayerDataManager.getHandle(p);
-        World world = player.world;
-        BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
+    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();
 
@@ -162,19 +160,19 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block b) {
+    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull org.bukkit.block.Block bukkitBlock) {
 
-        EntityPlayer player = PlayerDataManager.getHandle(p);
+        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
         // Silent ender chest is pretty much API-only
-        if (silentchest && b.getType() == Material.ENDER_CHEST) {
-            p.openInventory(p.getEnderChest());
+        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(b.getX(), b.getY(), b.getZ());
+        final BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
         final Object tile = world.getTileEntity(blockPosition);
 
         if (tile == null) {
@@ -234,7 +232,7 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
-        if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
+        if (!silent || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
             player.openContainer(tileInventory);
             return true;
         }
@@ -252,7 +250,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public void deactivateContainer(final Player bukkitPlayer) {
+    public void deactivateContainer(@NotNull final Player bukkitPlayer) {
         if (this.playerInteractManagerGamemode == null) {
             return;
         }

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

@@ -20,17 +20,15 @@ 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 org.bukkit.inventory.Inventory;
-
 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(Inventory inventory) {
+    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
         }
@@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();
@@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public boolean isSpecialEnderChest(Inventory inventory) {
+    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
         }
@@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();

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

@@ -16,31 +16,29 @@
 
 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 com.lishid.openinv.internal.IPlayerDataManager;
-
-import com.mojang.authlib.GameProfile;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-
 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(OfflinePlayer offline) {
+    public Player loadPlayer(@NotNull OfflinePlayer offline) {
         // Ensure player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
+        if (!offline.hasPlayedBefore()) {
             return null;
         }
 
@@ -51,7 +49,7 @@ public class PlayerDataManager implements IPlayerDataManager {
                 new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
-        Player target = (entity == null) ? null : entity.getBukkitEntity();
+        Player target = entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
@@ -61,12 +59,12 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public String getPlayerDataID(OfflinePlayer offline) {
+    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
         return offline.getUniqueId().toString();
     }
 
     @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
+    public OfflinePlayer getPlayerByID(@NotNull String identifier) {
         try {
             UUID uuid = UUID.fromString(identifier);
             OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
@@ -82,7 +80,7 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public Collection<? extends Player> getOnlinePlayers() {
+    public @NotNull Collection<? extends Player> getOnlinePlayers() {
         return Bukkit.getOnlinePlayers();
     }
 
@@ -106,4 +104,9 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -16,22 +16,19 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 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 {
 
@@ -71,18 +68,18 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    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 e) {}
+            } catch (Exception ignored) {}
             playerOnline = true;
         }
     }

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

@@ -16,22 +16,19 @@
 
 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 com.lishid.openinv.internal.ISpecialPlayerInventory;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 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 {
 
@@ -82,12 +79,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public void setPlayerOnline(@NotNull Player player) {
         if (!playerOnline) {
             this.player = PlayerDataManager.getHandle(player);
             setItemArrays(this.player.inventory, items, armor, extraSlots);

internal/v1_12_R1/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.5</version>
+    <version>4.0.0</version>
   </parent>
 
   <artifactId>openinvadapter1_12_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.5</version>
+      <version>4.0.0</version>
     </dependency>
   </dependencies>
 

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

@@ -16,16 +16,8 @@
 
 package com.lishid.openinv.internal.v1_12_R1;
 
-import java.lang.reflect.Field;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
-
-import org.bukkit.Material;
-import org.bukkit.Statistic;
-import org.bukkit.block.BlockState;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-
+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;
@@ -47,6 +39,12 @@ 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 {
 
@@ -63,20 +61,20 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean isAnySilentContainer(final org.bukkit.block.Block block) {
-        if (block.getType() == Material.ENDER_CHEST) {
+    public boolean isAnySilentContainer(@NotNull final org.bukkit.block.Block bukkitBlock) {
+        if (bukkitBlock.getType() == Material.ENDER_CHEST) {
             return true;
         }
-        BlockState state = block.getState();
+        BlockState state = bukkitBlock.getState();
         return state instanceof org.bukkit.block.Chest
                 || state instanceof org.bukkit.block.ShulkerBox;
     }
 
     @Override
-    public boolean isAnyContainerNeeded(final Player p, final org.bukkit.block.Block b) {
-        EntityPlayer player = PlayerDataManager.getHandle(p);
-        World world = player.world;
-        BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
+    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();
 
@@ -158,8 +156,8 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(final Player bukkitPlayer, final boolean silentchest,
-            final org.bukkit.block.Block bukkitBlock) {
+    public boolean activateContainer(@NotNull final Player bukkitPlayer, final boolean silentchest,
+                                     @NotNull final org.bukkit.block.Block bukkitBlock) {
 
         // Silent ender chest is API-only
         if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) {
@@ -250,7 +248,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public void deactivateContainer(final Player bukkitPlayer) {
+    public void deactivateContainer(@NotNull final Player bukkitPlayer) {
         if (this.playerInteractManagerGamemode == null) {
             return;
         }

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

@@ -20,17 +20,15 @@ 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 org.bukkit.inventory.Inventory;
-
 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(final Inventory inventory) {
+    public ISpecialEnderChest getSpecialEnderChest(@NotNull final Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();
@@ -45,7 +43,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(final Inventory inventory) {
+    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull final Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();
@@ -60,7 +58,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public boolean isSpecialEnderChest(final Inventory inventory) {
+    public boolean isSpecialEnderChest(@NotNull final Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
         }
@@ -69,7 +67,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public boolean isSpecialPlayerInventory(final Inventory inventory) {
+    public boolean isSpecialPlayerInventory(@NotNull final Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
         }

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

@@ -16,24 +16,22 @@
 
 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 com.lishid.openinv.internal.IPlayerDataManager;
-
-import com.mojang.authlib.GameProfile;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-
 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 {
 
@@ -59,12 +57,12 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public Collection<? extends Player> getOnlinePlayers() {
+    public @NotNull Collection<? extends Player> getOnlinePlayers() {
         return Bukkit.getOnlinePlayers();
     }
 
     @Override
-    public OfflinePlayer getPlayerByID(final String identifier) {
+    public OfflinePlayer getPlayerByID(@NotNull final String identifier) {
         try {
             UUID uuid = UUID.fromString(identifier);
             OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
@@ -79,15 +77,15 @@ public class PlayerDataManager implements IPlayerDataManager {
         }
     }
 
-    @Override
-    public String getPlayerDataID(final OfflinePlayer offline) {
+    @NotNull @Override
+    public String getPlayerDataID(@NotNull final OfflinePlayer offline) {
         return offline.getUniqueId().toString();
     }
 
     @Override
-    public Player loadPlayer(final OfflinePlayer offline) {
+    public Player loadPlayer(@NotNull final OfflinePlayer offline) {
         // Ensure player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
+        if (!offline.hasPlayedBefore()) {
             return null;
         }
 
@@ -98,7 +96,7 @@ public class PlayerDataManager implements IPlayerDataManager {
                 new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
-        Player target = entity == null ? null : entity.getBukkitEntity();
+        Player target = entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
@@ -107,4 +105,9 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -16,22 +16,19 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 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 {
@@ -52,8 +49,8 @@ public class SpecialEnderChest extends InventorySubcontainer
     }
 
     @Override
-    public Inventory getBukkitInventory() {
-        return this.inventory;
+    public @NotNull Inventory getBukkitInventory() {
+        return inventory;
     }
 
     @Override
@@ -83,13 +80,13 @@ public class SpecialEnderChest extends InventorySubcontainer
     }
 
     @Override
-    public void setPlayerOnline(final Player player) {
+    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 e) {}
+            } catch (Exception ignored) {}
             this.playerOnline = true;
         }
     }

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

@@ -16,22 +16,19 @@
 
 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 com.lishid.openinv.internal.ISpecialPlayerInventory;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 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 {
 
@@ -51,8 +48,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public Inventory getBukkitInventory() {
-        return this.inventory;
+    public @NotNull Inventory getBukkitInventory() {
+        return inventory;
     }
 
     @Override
@@ -191,7 +188,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public void setPlayerOnline(final Player player) {
+    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);

internal/v1_13_R1/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.5</version>
+    <version>4.0.0</version>
   </parent>
 
   <artifactId>openinvadapter1_13_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.5</version>
+      <version>4.0.0</version>
     </dependency>
   </dependencies>
 

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

@@ -16,26 +16,17 @@
 
 package com.lishid.openinv.internal.v1_13_R1;
 
-import java.lang.reflect.Field;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
-
-import net.minecraft.server.v1_13_R1.BlockChestTrapped;
-import net.minecraft.server.v1_13_R1.BlockPropertyChestType;
-import net.minecraft.server.v1_13_R1.ChatMessage;
-import net.minecraft.server.v1_13_R1.VoxelShapes;
-import org.bukkit.Material;
-import org.bukkit.Statistic;
-import org.bukkit.block.BlockState;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-
+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;
@@ -50,7 +41,14 @@ 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 {
 
@@ -67,20 +65,20 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean isAnySilentContainer(final org.bukkit.block.Block block) {
-        if (block.getType() == Material.ENDER_CHEST) {
+    public boolean isAnySilentContainer(@NotNull final org.bukkit.block.Block bukkitBlock) {
+        if (bukkitBlock.getType() == Material.ENDER_CHEST) {
             return true;
         }
-        BlockState state = block.getState();
+        BlockState state = bukkitBlock.getState();
         return state instanceof org.bukkit.block.Chest
                 || state instanceof org.bukkit.block.ShulkerBox;
     }
 
     @Override
-    public boolean isAnyContainerNeeded(final Player p, final org.bukkit.block.Block b) {
-        EntityPlayer player = com.lishid.openinv.internal.v1_13_R1.PlayerDataManager.getHandle(p);
-        World world = player.world;
-        BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
+    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();
 
@@ -99,21 +97,23 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         // 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();
+        BlockPropertyChestType chestType = blockData.get(BlockChest.b);
 
-            if (localBlock != block) {
-                continue;
-            }
+        if (chestType == BlockPropertyChestType.SINGLE) {
+            return false;
+        }
 
-            TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
-            if (!(localTileEntity instanceof TileEntityChest)) {
-                continue;
-            }
+        BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.k(blockData));
+        IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
 
-            if (this.isBlockedChest(world, localBlockPosition)) {
-                return true;
+        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);
             }
         }
 
@@ -160,11 +160,11 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(final Player bukkitPlayer, final boolean silentchest,
-            final org.bukkit.block.Block bukkitBlock) {
+    public boolean activateContainer(@NotNull final Player bukkitPlayer, final boolean silentsilent,
+            @NotNull final org.bukkit.block.Block bukkitBlock) {
 
         // Silent ender chest is API-only
-        if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) {
+        if (silentsilent && bukkitBlock.getType() == Material.ENDER_CHEST) {
             bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
             bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
             return true;
@@ -236,7 +236,7 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
-        if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
+        if (!silentsilent || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
             player.openContainer(tileInventory);
             return true;
         }
@@ -254,7 +254,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public void deactivateContainer(final Player bukkitPlayer) {
+    public void deactivateContainer(@NotNull final Player bukkitPlayer) {
         if (this.playerInteractManagerGamemode == null) {
             return;
         }

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

@@ -20,17 +20,15 @@ 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 org.bukkit.inventory.Inventory;
-
 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(final Inventory inventory) {
+    public ISpecialEnderChest getSpecialEnderChest(@NotNull final Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();
@@ -45,7 +43,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(final Inventory inventory) {
+    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull final Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();
@@ -60,7 +58,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public boolean isSpecialEnderChest(final Inventory inventory) {
+    public boolean isSpecialEnderChest(@NotNull final Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
         }
@@ -69,7 +67,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public boolean isSpecialPlayerInventory(final Inventory inventory) {
+    public boolean isSpecialPlayerInventory(@NotNull final Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
         }

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

@@ -16,24 +16,22 @@
 
 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 com.lishid.openinv.internal.IPlayerDataManager;
-
-import com.mojang.authlib.GameProfile;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-
 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 {
 
@@ -58,12 +56,12 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public Collection<? extends Player> getOnlinePlayers() {
+    public @NotNull Collection<? extends Player> getOnlinePlayers() {
         return Bukkit.getOnlinePlayers();
     }
 
     @Override
-    public OfflinePlayer getPlayerByID(final String identifier) {
+    public OfflinePlayer getPlayerByID(@NotNull final String identifier) {
         try {
             UUID uuid = UUID.fromString(identifier);
             OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
@@ -79,14 +77,14 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public String getPlayerDataID(final OfflinePlayer offline) {
+    public @NotNull String getPlayerDataID(@NotNull final OfflinePlayer offline) {
         return offline.getUniqueId().toString();
     }
 
     @Override
-    public Player loadPlayer(final OfflinePlayer offline) {
+    public Player loadPlayer(@NotNull final OfflinePlayer offline) {
         // Ensure player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
+        if (!offline.hasPlayedBefore()) {
             return null;
         }
 
@@ -106,4 +104,9 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -16,22 +16,19 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 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 {
@@ -49,8 +46,8 @@ public class SpecialEnderChest extends InventorySubcontainer
     }
 
     @Override
-    public Inventory getBukkitInventory() {
-        return this.inventory;
+    public @NotNull Inventory getBukkitInventory() {
+        return inventory;
     }
 
     @Override
@@ -79,13 +76,13 @@ public class SpecialEnderChest extends InventorySubcontainer
     }
 
     @Override
-    public void setPlayerOnline(final Player player) {
+    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 e) {}
+            } catch (Exception ignored) {}
             this.playerOnline = true;
         }
     }

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

@@ -16,24 +16,21 @@
 
 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 com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 import net.minecraft.server.v1_13_R1.ChatMessage;
-import net.minecraft.server.v1_13_R1.IChatBaseComponent;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 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 {
 
@@ -53,8 +50,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public Inventory getBukkitInventory() {
-        return this.inventory;
+    public @NotNull Inventory getBukkitInventory() {
+        return inventory;
     }
 
     @Override
@@ -190,7 +187,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public void setPlayerOnline(final Player player) {
+    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);

internal/v1_13_R2/pom.xml

@@ -0,0 +1,57 @@
+<!--
+  ~ 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

@@ -0,0 +1,309 @@
+/*
+ * 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

@@ -0,0 +1,78 @@
+/*
+ * 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

@@ -0,0 +1,113 @@
+/*
+ * 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

@@ -0,0 +1,266 @@
+/*
+ * 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

@@ -0,0 +1,719 @@
+/*
+ * 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/pom.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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/>.
+  -->
+
+<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_14_R1</artifactId>
+  <name>OpenInvAdapter1_14_R1</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.14-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_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/AnySilentContainer.java

@@ -0,0 +1,320 @@
+/*
+ * 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.IAnySilentContainer;
+import java.lang.reflect.Field;
+import javax.annotation.Nullable;
+import net.minecraft.server.v1_14_R1.AxisAlignedBB;
+import net.minecraft.server.v1_14_R1.Block;
+import net.minecraft.server.v1_14_R1.BlockChest;
+import net.minecraft.server.v1_14_R1.BlockChestTrapped;
+import net.minecraft.server.v1_14_R1.BlockEnderChest;
+import net.minecraft.server.v1_14_R1.BlockPosition;
+import net.minecraft.server.v1_14_R1.BlockPropertyChestType;
+import net.minecraft.server.v1_14_R1.BlockShulkerBox;
+import net.minecraft.server.v1_14_R1.ChatMessage;
+import net.minecraft.server.v1_14_R1.Container;
+import net.minecraft.server.v1_14_R1.ContainerChest;
+import net.minecraft.server.v1_14_R1.Entity;
+import net.minecraft.server.v1_14_R1.EntityCat;
+import net.minecraft.server.v1_14_R1.EntityHuman;
+import net.minecraft.server.v1_14_R1.EntityPlayer;
+import net.minecraft.server.v1_14_R1.EnumDirection;
+import net.minecraft.server.v1_14_R1.EnumGamemode;
+import net.minecraft.server.v1_14_R1.IBlockData;
+import net.minecraft.server.v1_14_R1.IChatBaseComponent;
+import net.minecraft.server.v1_14_R1.ITileInventory;
+import net.minecraft.server.v1_14_R1.InventoryEnderChest;
+import net.minecraft.server.v1_14_R1.InventoryLargeChest;
+import net.minecraft.server.v1_14_R1.PlayerInteractManager;
+import net.minecraft.server.v1_14_R1.PlayerInventory;
+import net.minecraft.server.v1_14_R1.TileEntity;
+import net.minecraft.server.v1_14_R1.TileEntityChest;
+import net.minecraft.server.v1_14_R1.TileEntityEnderChest;
+import net.minecraft.server.v1_14_R1.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.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) {
+        EntityPlayer player = PlayerDataManager.getHandle(p);
+        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) {
+            return this.isBlockedShulkerBox(world, blockPosition, blockData);
+        }
+
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.getType(blockPosition.up()).isOccluding(world, blockPosition);
+        }
+
+        // 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.j(blockData));
+        IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
+
+        if (adjacentBlockData.getBlock() == block) {
+
+            BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.b);
+
+            if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
+                    && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
+
+                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;
+            }
+        }
+
+        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(new TileInventory((containerCounter, playerInventory, ignored) ->
+                    ContainerChest.a(containerCounter, playerInventory, enderChest), BlockEnderChest.d));
+            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
+            return true;
+        }
+
+        if (!(tile instanceof ITileInventory)) {
+            return false;
+        }
+
+        ITileInventory tileInventory = (ITileInventory) tile;
+        IBlockData blockData = world.getType(blockPosition);
+        Block block = blockData.getBlock();
+
+        if (block instanceof BlockChest) {
+
+            BlockPropertyChestType chestType = blockData.get(BlockChest.b);
+
+            if (chestType != BlockPropertyChestType.SINGLE) {
+
+                BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.j(blockData));
+                IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
+
+                if (adjacentBlockData.getBlock() == block) {
+
+                    BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.b);
+
+                    if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
+                            && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
+
+                        TileEntity adjacentTile = world.getTileEntity(adjacentBlockPosition);
+
+                        if (adjacentTile instanceof TileEntityChest && tileInventory instanceof  TileEntityChest) {
+                            TileEntityChest rightChest = chestType == BlockPropertyChestType.RIGHT ? ((TileEntityChest) tileInventory) : (TileEntityChest) adjacentTile;
+                            TileEntityChest leftChest = chestType == BlockPropertyChestType.RIGHT ? (TileEntityChest) adjacentTile : ((TileEntityChest) tileInventory);
+                            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() {
+                                    return new ChatMessage("container.chestDouble");
+                                }
+                            };
+                        }
+                    }
+                }
+            }
+
+            if (block instanceof BlockChestTrapped) {
+                bukkitPlayer.incrementStatistic(Statistic.TRAPPED_CHEST_TRIGGERED);
+            } else {
+                bukkitPlayer.incrementStatistic(Statistic.CHEST_OPENED);
+            }
+        }
+
+        if (block instanceof BlockShulkerBox) {
+            bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED);
+        }
+
+        // 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_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/InventoryAccess.java

@@ -0,0 +1,78 @@
+/*
+ * 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

@@ -0,0 +1,183 @@
+/*
+ * 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_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/SpecialEnderChest.java

@@ -0,0 +1,255 @@
+/*
+ * 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.ISpecialEnderChest;
+import java.util.List;
+import net.minecraft.server.v1_14_R1.AutoRecipeStackManager;
+import net.minecraft.server.v1_14_R1.ContainerUtil;
+import net.minecraft.server.v1_14_R1.EntityHuman;
+import net.minecraft.server.v1_14_R1.EntityPlayer;
+import net.minecraft.server.v1_14_R1.IInventoryListener;
+import net.minecraft.server.v1_14_R1.InventoryEnderChest;
+import net.minecraft.server.v1_14_R1.ItemStack;
+import net.minecraft.server.v1_14_R1.NonNullList;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.InventoryHolder;
+import org.jetbrains.annotations.NotNull;
+
+public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEnderChest {
+
+    private final CraftInventory inventory;
+    private EntityPlayer owner;
+    private NonNullList<ItemStack> items;
+    private boolean playerOnline;
+
+    public SpecialEnderChest(final Player player, final Boolean online) {
+        super(PlayerDataManager.getHandle(player));
+        this.inventory = new CraftInventory(this);
+        this.owner = PlayerDataManager.getHandle(player);
+        this.playerOnline = online;
+        this.items = this.owner.getEnderChest().items;
+    }
+
+    @Override
+    public @NotNull CraftInventory getBukkitInventory() {
+        return inventory;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        this.playerOnline = false;
+    }
+
+    @Override
+    public void setPlayerOnline(@NotNull final Player player) {
+        if (!this.playerOnline) {
+            try {
+                this.owner = PlayerDataManager.getHandle(player);
+                InventoryEnderChest enderChest = owner.getEnderChest();
+                for (int i = 0; i < enderChest.getSize(); ++i) {
+                    enderChest.setItem(i, this.items.get(i));
+                }
+                this.items = enderChest.items;
+            } catch (Exception ignored) {}
+            this.playerOnline = true;
+        }
+    }
+
+    @Override
+    public void update() {
+        this.owner.getEnderChest().update();
+    }
+
+    @Override
+    public List<ItemStack> getContents() {
+        return this.items;
+    }
+
+    @Override
+    public void onOpen(CraftHumanEntity who) {
+        this.owner.getEnderChest().onOpen(who);
+    }
+
+    @Override
+    public void onClose(CraftHumanEntity who) {
+        this.owner.getEnderChest().onClose(who);
+    }
+
+    @Override
+    public List<HumanEntity> getViewers() {
+        return this.owner.getEnderChest().getViewers();
+    }
+
+    @Override
+    public void setMaxStackSize(int i) {
+        this.owner.getEnderChest().setMaxStackSize(i);
+    }
+
+    @Override
+    public InventoryHolder getOwner() {
+        return this.owner.getEnderChest().getOwner();
+    }
+
+    @Override
+    public Location getLocation() {
+        return null;
+    }
+
+    @Override
+    public void a(IInventoryListener iinventorylistener) {
+        this.owner.getEnderChest().a(iinventorylistener);
+    }
+
+    @Override
+    public void b(IInventoryListener iinventorylistener) {
+        this.owner.getEnderChest().b(iinventorylistener);
+    }
+
+    @Override
+    public ItemStack getItem(int i) {
+        return i >= 0 && i < this.items.size() ? this.items.get(i) : ItemStack.a;
+    }
+
+    @Override
+    public ItemStack splitStack(int i, int j) {
+        ItemStack itemstack = ContainerUtil.a(this.items, i, j);
+        if (!itemstack.isEmpty()) {
+            this.update();
+        }
+
+        return itemstack;
+    }
+
+    @Override
+    public ItemStack a(ItemStack itemstack) {
+        ItemStack itemstack1 = itemstack.cloneItemStack();
+
+        for (int i = 0; i < this.getSize(); ++i) {
+            ItemStack itemstack2 = this.getItem(i);
+            if (itemstack2.isEmpty()) {
+                this.setItem(i, itemstack1);
+                this.update();
+                return ItemStack.a;
+            }
+
+            if (ItemStack.c(itemstack2, itemstack1)) {
+                int j = Math.min(this.getMaxStackSize(), itemstack2.getMaxStackSize());
+                int k = Math.min(itemstack1.getCount(), j - itemstack2.getCount());
+                if (k > 0) {
+                    itemstack2.add(k);
+                    itemstack1.subtract(k);
+                    if (itemstack1.isEmpty()) {
+                        this.update();
+                        return ItemStack.a;
+                    }
+                }
+            }
+        }
+
+        if (itemstack1.getCount() != itemstack.getCount()) {
+            this.update();
+        }
+
+        return itemstack1;
+    }
+
+    @Override
+    public ItemStack splitWithoutUpdate(int i) {
+        ItemStack itemstack = this.items.get(i);
+        if (itemstack.isEmpty()) {
+            return ItemStack.a;
+        } else {
+            this.items.set(i, ItemStack.a);
+            return itemstack;
+        }
+    }
+
+    @Override
+    public void setItem(int i, ItemStack itemstack) {
+        this.items.set(i, itemstack);
+        if (!itemstack.isEmpty() && itemstack.getCount() > this.getMaxStackSize()) {
+            itemstack.setCount(this.getMaxStackSize());
+        }
+
+        this.update();
+    }
+
+    @Override
+    public int getSize() {
+        return this.owner.getEnderChest().getSize();
+    }
+
+    @Override
+    public boolean isNotEmpty() {
+
+        for (ItemStack itemstack : this.items) {
+            if (!itemstack.isEmpty()) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public int getMaxStackSize() {
+        return 64;
+    }
+
+    @Override
+    public boolean a(EntityHuman entityhuman) {
+        return true;
+    }
+
+    @Override
+    public void startOpen(EntityHuman entityhuman) {
+    }
+
+    @Override
+    public void closeContainer(EntityHuman entityhuman) {
+    }
+
+    @Override
+    public boolean b(int i, ItemStack itemstack) {
+        return true;
+    }
+
+    @Override
+    public void clear() {
+        this.items.clear();
+    }
+
+    @Override
+    public void a(AutoRecipeStackManager autorecipestackmanager) {
+
+        for (ItemStack itemstack : this.items) {
+            autorecipestackmanager.b(itemstack);
+        }
+
+    }
+
+}

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

@@ -0,0 +1,742 @@
+/*
+ * 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.google.common.collect.ImmutableList;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import net.minecraft.server.v1_14_R1.AutoRecipeStackManager;
+import net.minecraft.server.v1_14_R1.ChatMessage;
+import net.minecraft.server.v1_14_R1.ContainerUtil;
+import net.minecraft.server.v1_14_R1.CrashReport;
+import net.minecraft.server.v1_14_R1.CrashReportSystemDetails;
+import net.minecraft.server.v1_14_R1.EntityHuman;
+import net.minecraft.server.v1_14_R1.EntityPlayer;
+import net.minecraft.server.v1_14_R1.EnumItemSlot;
+import net.minecraft.server.v1_14_R1.IBlockData;
+import net.minecraft.server.v1_14_R1.IChatBaseComponent;
+import net.minecraft.server.v1_14_R1.Item;
+import net.minecraft.server.v1_14_R1.ItemArmor;
+import net.minecraft.server.v1_14_R1.ItemStack;
+import net.minecraft.server.v1_14_R1.NBTTagCompound;
+import net.minecraft.server.v1_14_R1.NBTTagList;
+import net.minecraft.server.v1_14_R1.NonNullList;
+import net.minecraft.server.v1_14_R1.PacketPlayOutSetSlot;
+import net.minecraft.server.v1_14_R1.PlayerInventory;
+import net.minecraft.server.v1_14_R1.ReportedException;
+import net.minecraft.server.v1_14_R1.World;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.InventoryHolder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
+
+    private final CraftInventory inventory;
+    private boolean playerOnline;
+    private EntityHuman player;
+    private NonNullList<ItemStack> items, armor, extraSlots;
+    private final List<NonNullList<ItemStack>> f;
+
+    public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) {
+        super(PlayerDataManager.getHandle(bukkitPlayer));
+        this.inventory = new CraftInventory(this);
+        this.playerOnline = online;
+        this.player = super.player;
+        this.items = this.player.inventory.items;
+        this.armor = this.player.inventory.armor;
+        this.extraSlots = this.player.inventory.extraSlots;
+        this.f = ImmutableList.of(this.items, this.armor, this.extraSlots);
+    }
+
+    @Override
+    public void setPlayerOnline(@NotNull final Player player) {
+        if (!this.playerOnline) {
+            EntityPlayer entityPlayer = PlayerDataManager.getHandle(player);
+            entityPlayer.inventory.transaction.addAll(this.transaction);
+            this.player = entityPlayer;
+            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 CraftInventory getBukkitInventory() {
+        return this.inventory;
+    }
+
+    @Override
+    public ItemStack getItem(int i) {
+        List<ItemStack> list = this.items;
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.armor;
+        } else {
+            i = this.getReversedItemSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.extraSlots;
+        } else if (list == this.armor) {
+            i = this.getReversedArmorSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            return ItemStack.a;
+        }
+
+        return list.get(i);
+    }
+
+    @Override
+    public IChatBaseComponent getDisplayName() {
+        return new ChatMessage(this.player.getName());
+    }
+
+    @Override
+    public boolean hasCustomName() {
+        return false;
+    }
+
+    private int getReversedArmorSlotNum(final int i) {
+        if (i == 0) {
+            return 3;
+        }
+        if (i == 1) {
+            return 2;
+        }
+        if (i == 2) {
+            return 1;
+        }
+        if (i == 3) {
+            return 0;
+        }
+        return i;
+    }
+
+    private int getReversedItemSlotNum(final int i) {
+        if (i >= 27) {
+            return i - 27;
+        }
+        return i + 9;
+    }
+
+    @Override
+    public int getSize() {
+        return 45;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public void setItem(int i, final ItemStack itemstack) {
+        List<ItemStack> list = this.items;
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.armor;
+        } else {
+            i = this.getReversedItemSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.extraSlots;
+        } else if (list == this.armor) {
+            i = this.getReversedArmorSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            this.player.drop(itemstack, true);
+            return;
+        }
+
+        list.set(i, itemstack);
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        this.playerOnline = false;
+    }
+
+    @Override
+    public ItemStack splitStack(int i, final int j) {
+        List<ItemStack> list = this.items;
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.armor;
+        } else {
+            i = this.getReversedItemSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.extraSlots;
+        } else if (list == this.armor) {
+            i = this.getReversedArmorSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            return ItemStack.a;
+        }
+
+        return list.get(i).isEmpty() ? ItemStack.a : ContainerUtil.a(list, i, j);
+    }
+
+    @Override
+    public ItemStack splitWithoutUpdate(int i) {
+        List<ItemStack> list = this.items;
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.armor;
+        } else {
+            i = this.getReversedItemSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.extraSlots;
+        } else if (list == this.armor) {
+            i = this.getReversedArmorSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            return ItemStack.a;
+        }
+
+        if (!list.get(i).isEmpty()) {
+            ItemStack itemstack = list.get(i);
+
+            list.set(i, ItemStack.a);
+            return itemstack;
+        }
+
+        return ItemStack.a;
+    }
+
+    @Override
+    public List<ItemStack> getContents() {
+        return this.f.stream().flatMap(List::stream).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<ItemStack> getArmorContents() {
+        return this.armor;
+    }
+
+    @Override
+    public void onOpen(CraftHumanEntity who) {
+        this.transaction.add(who);
+    }
+
+    @Override
+    public void onClose(CraftHumanEntity who) {
+        this.transaction.remove(who);
+    }
+
+    @Override
+    public List<HumanEntity> getViewers() {
+        return this.transaction;
+    }
+
+    @Override
+    public InventoryHolder getOwner() {
+        return this.player.getBukkitEntity();
+    }
+
+    @Override
+    public Location getLocation() {
+        return this.player.getBukkitEntity().getLocation();
+    }
+
+    @Override
+    public ItemStack getItemInHand() {
+        return d(this.itemInHandIndex) ? this.items.get(this.itemInHandIndex) : ItemStack.a;
+    }
+
+    private boolean a(ItemStack itemstack, ItemStack itemstack1) {
+        return !itemstack.isEmpty() && this.b(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize();
+    }
+
+    private boolean b(ItemStack itemstack, ItemStack itemstack1) {
+        return itemstack.getItem() == itemstack1.getItem() && ItemStack.equals(itemstack, itemstack1);
+    }
+
+    @Override
+    public int canHold(ItemStack itemstack) {
+        int remains = itemstack.getCount();
+
+        for (int i = 0; i < this.items.size(); ++i) {
+            ItemStack itemstack1 = this.getItem(i);
+            if (itemstack1.isEmpty()) {
+                return itemstack.getCount();
+            }
+
+            if (!this.a(itemstack, itemstack1)) {
+                remains -= (itemstack1.getMaxStackSize() < this.getMaxStackSize() ? itemstack1.getMaxStackSize() : this.getMaxStackSize()) - itemstack1.getCount();
+            }
+
+            if (remains <= 0) {
+                return itemstack.getCount();
+            }
+        }
+
+        return itemstack.getCount() - remains;
+    }
+
+    @Override
+    public int getFirstEmptySlotIndex() {
+        for (int i = 0; i < this.items.size(); ++i) {
+            if (this.items.get(i).isEmpty()) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    @Override
+    public void c(int i) {
+        this.itemInHandIndex = this.i();
+        ItemStack itemstack = this.items.get(this.itemInHandIndex);
+        this.items.set(this.itemInHandIndex, this.items.get(i));
+        this.items.set(i, itemstack);
+    }
+
+    @Override
+    public int c(ItemStack itemstack) {
+        for (int i = 0; i < this.items.size(); ++i) {
+            ItemStack itemstack1 = this.items.get(i);
+            if (!this.items.get(i).isEmpty() && this.b(itemstack, this.items.get(i)) && !this.items.get(i).f() && !itemstack1.hasEnchantments() && !itemstack1.hasName()) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    @Override
+    public int i() {
+        int i;
+        int j;
+        for (j = 0; j < 9; ++j) {
+            i = (this.itemInHandIndex + j) % 9;
+            if (this.items.get(i).isEmpty()) {
+                return i;
+            }
+        }
+
+        for (j = 0; j < 9; ++j) {
+            i = (this.itemInHandIndex + j) % 9;
+            if (!this.items.get(i).hasEnchantments()) {
+                return i;
+            }
+        }
+
+        return this.itemInHandIndex;
+    }
+
+    @Override
+    public int a(Predicate<ItemStack> predicate, int i) {
+        int j = 0;
+
+        int k;
+        for (k = 0; k < this.getSize(); ++k) {
+            ItemStack itemstack = this.getItem(k);
+            if (!itemstack.isEmpty() && predicate.test(itemstack)) {
+                int l = i <= 0 ? itemstack.getCount() : Math.min(i - j, itemstack.getCount());
+                j += l;
+                if (i != 0) {
+                    itemstack.subtract(l);
+                    if (itemstack.isEmpty()) {
+                        this.setItem(k, ItemStack.a);
+                    }
+
+                    if (i > 0 && j >= i) {
+                        return j;
+                    }
+                }
+            }
+        }
+
+        if (!this.getCarried().isEmpty() && predicate.test(this.getCarried())) {
+            k = i <= 0 ? this.getCarried().getCount() : Math.min(i - j, this.getCarried().getCount());
+            j += k;
+            if (i != 0) {
+                this.getCarried().subtract(k);
+                if (this.getCarried().isEmpty()) {
+                    this.setCarried(ItemStack.a);
+                }
+
+                if (i > 0 && j >= i) {
+                    return j;
+                }
+            }
+        }
+
+        return j;
+    }
+
+    private int i(ItemStack itemstack) {
+        int i = this.firstPartial(itemstack);
+        if (i == -1) {
+            i = this.getFirstEmptySlotIndex();
+        }
+
+        return i == -1 ? itemstack.getCount() : this.d(i, itemstack);
+    }
+
+    private int d(int i, ItemStack itemstack) {
+        Item item = itemstack.getItem();
+        int j = itemstack.getCount();
+        ItemStack itemstack1 = this.getItem(i);
+        if (itemstack1.isEmpty()) {
+            itemstack1 = new ItemStack(item, 0);
+            if (itemstack.hasTag()) {
+                itemstack1.setTag(itemstack.getTag().clone());
+            }
+
+            this.setItem(i, itemstack1);
+        }
+
+        int k = j;
+        if (j > itemstack1.getMaxStackSize() - itemstack1.getCount()) {
+            k = itemstack1.getMaxStackSize() - itemstack1.getCount();
+        }
+
+        if (k > this.getMaxStackSize() - itemstack1.getCount()) {
+            k = this.getMaxStackSize() - itemstack1.getCount();
+        }
+
+        if (k == 0) {
+            return j;
+        } else {
+            j -= k;
+            itemstack1.add(k);
+            itemstack1.d(5);
+            return j;
+        }
+    }
+
+    @Override
+    public int firstPartial(ItemStack itemstack) {
+        if (this.a(this.getItem(this.itemInHandIndex), itemstack)) {
+            return this.itemInHandIndex;
+        } else if (this.a(this.getItem(40), itemstack)) {
+            return 40;
+        } else {
+            for (int i = 0; i < this.items.size(); ++i) {
+                if (this.a(this.items.get(i), itemstack)) {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+    }
+
+    @Override
+    public void j() {
+
+        for (List<ItemStack> itemStacks : this.f) {
+            for (int i = 0; i < itemStacks.size(); ++i) {
+                if (!itemStacks.get(i).isEmpty()) {
+                    itemStacks.get(i).a(this.player.world, this.player, i, this.itemInHandIndex == i);
+                }
+            }
+        }
+
+    }
+
+    @Override
+    public boolean pickup(ItemStack itemstack) {
+        return this.c(-1, itemstack);
+    }
+
+    @Override
+    public boolean c(int i, ItemStack itemstack) {
+        if (itemstack.isEmpty()) {
+            return false;
+        } else {
+            try {
+                if (itemstack.f()) {
+                    if (i == -1) {
+                        i = this.getFirstEmptySlotIndex();
+                    }
+
+                    if (i >= 0) {
+                        this.items.set(i, itemstack.cloneItemStack());
+                        this.items.get(i).d(5);
+                        itemstack.setCount(0);
+                        return true;
+                    } else if (this.player.abilities.canInstantlyBuild) {
+                        itemstack.setCount(0);
+                        return true;
+                    } else {
+                        return false;
+                    }
+                } else {
+                    int j;
+                    do {
+                        j = itemstack.getCount();
+                        if (i == -1) {
+                            itemstack.setCount(this.i(itemstack));
+                        } else {
+                            itemstack.setCount(this.d(i, itemstack));
+                        }
+                    } while(!itemstack.isEmpty() && itemstack.getCount() < j);
+
+                    if (itemstack.getCount() == j && this.player.abilities.canInstantlyBuild) {
+                        itemstack.setCount(0);
+                        return true;
+                    } else {
+                        return itemstack.getCount() < j;
+                    }
+                }
+            } catch (Throwable var6) {
+                CrashReport crashreport = CrashReport.a(var6, "Adding item to inventory");
+                CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Item being added");
+                crashreportsystemdetails.a("Item ID", Item.getId(itemstack.getItem()));
+                crashreportsystemdetails.a("Item data", itemstack.getDamage());
+                crashreportsystemdetails.a("Item name", () -> itemstack.getName().getString());
+                throw new ReportedException(crashreport);
+            }
+        }
+    }
+
+    @Override
+    public void a(World world, ItemStack itemstack) {
+        if (!world.isClientSide) {
+            while(!itemstack.isEmpty()) {
+                int i = this.firstPartial(itemstack);
+                if (i == -1) {
+                    i = this.getFirstEmptySlotIndex();
+                }
+
+                if (i == -1) {
+                    this.player.drop(itemstack, false);
+                    break;
+                }
+
+                int j = itemstack.getMaxStackSize() - this.getItem(i).getCount();
+                if (this.c(i, itemstack.cloneAndSubtract(j))) {
+                    ((EntityPlayer)this.player).playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, i, this.getItem(i)));
+                }
+            }
+        }
+
+    }
+
+    @Override
+    public void f(ItemStack itemstack) {
+
+        for (List<ItemStack> list : this.f) {
+            for (int i = 0; i < list.size(); ++i) {
+                if (list.get(i) == itemstack) {
+                    list.set(i, ItemStack.a);
+                    break;
+                }
+            }
+        }
+    }
+
+    @Override
+    public float a(IBlockData iblockdata) {
+        return this.items.get(this.itemInHandIndex).a(iblockdata);
+    }
+
+    @Override
+    public NBTTagList a(NBTTagList nbttaglist) {
+        NBTTagCompound nbttagcompound;
+        int i;
+        for (i = 0; i < this.items.size(); ++i) {
+            if (!this.items.get(i).isEmpty()) {
+                nbttagcompound = new NBTTagCompound();
+                nbttagcompound.setByte("Slot", (byte) i);
+                this.items.get(i).save(nbttagcompound);
+                nbttaglist.add(nbttagcompound);
+            }
+        }
+
+        for (i = 0; i < this.armor.size(); ++i) {
+            if (!this.armor.get(i).isEmpty()) {
+                nbttagcompound = new NBTTagCompound();
+                nbttagcompound.setByte("Slot", (byte) (i + 100));
+                this.armor.get(i).save(nbttagcompound);
+                nbttaglist.add(nbttagcompound);
+            }
+        }
+
+        for (i = 0; i < this.extraSlots.size(); ++i) {
+            if (!this.extraSlots.get(i).isEmpty()) {
+                nbttagcompound = new NBTTagCompound();
+                nbttagcompound.setByte("Slot", (byte) (i + 150));
+                this.extraSlots.get(i).save(nbttagcompound);
+                nbttaglist.add(nbttagcompound);
+            }
+        }
+
+        return nbttaglist;
+    }
+
+    @Override
+    public void b(NBTTagList nbttaglist) {
+        this.items.clear();
+        this.armor.clear();
+        this.extraSlots.clear();
+
+        for(int i = 0; i < nbttaglist.size(); ++i) {
+            NBTTagCompound nbttagcompound = nbttaglist.getCompound(i);
+            int j = nbttagcompound.getByte("Slot") & 255;
+            ItemStack itemstack = ItemStack.a(nbttagcompound);
+            if (!itemstack.isEmpty()) {
+                if (j < this.items.size()) {
+                    this.items.set(j, itemstack);
+                } else if (j >= 100 && j < this.armor.size() + 100) {
+                    this.armor.set(j - 100, itemstack);
+                } else if (j >= 150 && j < this.extraSlots.size() + 150) {
+                    this.extraSlots.set(j - 150, itemstack);
+                }
+            }
+        }
+
+    }
+
+    @Override
+    public boolean isNotEmpty() {
+        Iterator iterator = this.items.iterator();
+
+        ItemStack itemstack;
+        while (iterator.hasNext()) {
+            itemstack = (ItemStack)iterator.next();
+            if (!itemstack.isEmpty()) {
+                return false;
+            }
+        }
+
+        iterator = this.armor.iterator();
+
+        while (iterator.hasNext()) {
+            itemstack = (ItemStack)iterator.next();
+            if (!itemstack.isEmpty()) {
+                return false;
+            }
+        }
+
+        iterator = this.extraSlots.iterator();
+
+        while (iterator.hasNext()) {
+            itemstack = (ItemStack)iterator.next();
+            if (!itemstack.isEmpty()) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    @Nullable
+    @Override
+    public IChatBaseComponent getCustomName() {
+        return null;
+    }
+
+    @Override
+    public boolean b(IBlockData iblockdata) {
+        return this.getItem(this.itemInHandIndex).b(iblockdata);
+    }
+
+    @Override
+    public void a(float f) {
+        if (f > 0.0F) {
+            f /= 4.0F;
+            if (f < 1.0F) {
+                f = 1.0F;
+            }
+
+            for (int i = 0; i < this.armor.size(); ++i) {
+                ItemStack itemstack = this.armor.get(0);
+                int index = i;
+                if (itemstack.getItem() instanceof ItemArmor) {
+                    itemstack.damage((int) f, this.player, (entityhuman) -> entityhuman.c(EnumItemSlot.a(EnumItemSlot.Function.ARMOR, index)));
+                }
+            }
+        }
+    }
+
+    @Override
+    public void dropContents() {
+        for (List<ItemStack> itemStacks : this.f) {
+            for (int i = 0; i < itemStacks.size(); ++i) {
+                ItemStack itemstack = itemStacks.get(i);
+                if (!itemstack.isEmpty()) {
+                    itemStacks.set(i, ItemStack.a);
+                    this.player.a(itemstack, true, false);
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean h(ItemStack itemstack) {
+        return this.f.stream().flatMap(List::stream).anyMatch(itemStack1 -> !itemStack1.isEmpty() && itemStack1.doMaterialsMatch(itemstack));
+    }
+
+    @Override
+    public void a(PlayerInventory playerinventory) {
+        for (int i = 0; i < playerinventory.getSize(); ++i) {
+            this.setItem(i, playerinventory.getItem(i));
+        }
+
+        this.itemInHandIndex = playerinventory.itemInHandIndex;
+    }
+
+    @Override
+    public void clear() {
+        this.f.forEach(List::clear);
+    }
+
+    @Override
+    public void a(AutoRecipeStackManager autorecipestackmanager) {
+        for (ItemStack itemstack : this.items) {
+            autorecipestackmanager.a(itemstack);
+        }
+    }
+
+}

internal/v1_4_R1/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.5</version>
+    <version>4.0.0</version>
   </parent>
 
   <artifactId>openinvadapter1_4_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.5</version>
+      <version>4.0.0</version>
     </dependency>
   </dependencies>
 

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

@@ -17,11 +17,6 @@
 package com.lishid.openinv.internal.v1_4_R1;
 
 import com.lishid.openinv.internal.IAnySilentContainer;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
 import net.minecraft.server.v1_4_R1.AxisAlignedBB;
 import net.minecraft.server.v1_4_R1.BlockEnderChest;
 import net.minecraft.server.v1_4_R1.Container;
@@ -34,43 +29,46 @@ 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(org.bukkit.block.Block block) {
-        return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
+    public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
+        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
     }
 
     @Override
-    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = PlayerDataManager.getHandle(p);
-        World world = player.world;
+        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
 
-        if (block instanceof BlockEnderChest) {
+        if (bukkitBlock instanceof BlockEnderChest) {
             // Ender chests are not blocked by ocelots.
-            return world.t(block.getX(), block.getY() + 1, block.getZ());
+            return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
         }
 
         // If block or ocelot on top
-        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+        if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
             return true;
         }
 
-        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+        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(block.getX(), block.getY(), block.getZ() + 1) == id) {
-            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
-        } else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
-        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
-        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        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;
@@ -93,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
 
-        EntityPlayer player = PlayerDataManager.getHandle(p);
+        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
         // Silent ender chest is API-only
-        if (silentchest && block.getType() == Material.ENDER_CHEST) {
-            p.openInventory(p.getEnderChest());
+        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
+            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
             return true;
         }
 
         World world = player.world;
-        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+        Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
 
         if (tile == null) {
             return false;
@@ -123,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         IInventory inventory = (IInventory) tile;
-        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
 
-        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
-        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
-        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
-        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
+        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 (!silentchest) {
+        if (!silent) {
             player.openContainer(inventory);
             return true;
         }
@@ -160,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
             return true;
         } catch (Exception e) {
             e.printStackTrace();
-            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
             return false;
         }
     }
 
     @Override
-    public void deactivateContainer(final Player bukkitPlayer) {}
+    public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
 
 }

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

@@ -20,17 +20,15 @@ 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 org.bukkit.inventory.Inventory;
-
 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(Inventory inventory) {
+    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
         }
@@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();
@@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public boolean isSpecialEnderChest(Inventory inventory) {
+    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
         }
@@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();

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

@@ -16,30 +16,29 @@
 
 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 com.lishid.openinv.internal.IPlayerDataManager;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-
 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(OfflinePlayer offline) {
+    public Player loadPlayer(@NotNull OfflinePlayer offline) {
         // Ensure the player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
+        if (!offline.hasPlayedBefore()) {
             return null;
         }
 
@@ -50,7 +49,7 @@ public class PlayerDataManager implements IPlayerDataManager {
                 new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
-        Player target = (entity == null) ? null : entity.getBukkitEntity();
+        Player target = entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
@@ -60,12 +59,12 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public String getPlayerDataID(OfflinePlayer offline) {
+    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
         return offline.getName();
     }
 
     @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
+    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()) {
@@ -75,7 +74,7 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public Collection<? extends Player> getOnlinePlayers() {
+    public @NotNull Collection<? extends Player> getOnlinePlayers() {
         return Arrays.asList(Bukkit.getOnlinePlayers());
     }
 
@@ -99,4 +98,9 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -24,7 +24,7 @@ import net.minecraft.server.v1_4_R1.PlayerInventory;
 
 class SilentContainerChest extends ContainerChest {
 
-    public SilentContainerChest(IInventory i1, IInventory i2) {
+    SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
         // Send close signal
         i2.f();

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

@@ -16,26 +16,23 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
-
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-
 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 {
 
@@ -57,12 +54,12 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public void setPlayerOnline(@NotNull Player player) {
         if (!playerOnline) {
             try {
                 EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
@@ -71,7 +68,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            } catch (Exception ignored) {}
             playerOnline = true;
         }
     }

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

@@ -17,14 +17,12 @@
 package com.lishid.openinv.internal.v1_4_R1;
 
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 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 {
 
@@ -40,12 +38,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public void setPlayerOnline(@NotNull Player player) {
         if (!playerOnline) {
             this.player = PlayerDataManager.getHandle(player);
             this.player.inventory.items = this.items;

internal/v1_5_R2/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.5</version>
+    <version>4.0.0</version>
   </parent>
 
   <artifactId>openinvadapter1_5_R2</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.5</version>
+      <version>4.0.0</version>
     </dependency>
   </dependencies>
 

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

@@ -17,11 +17,6 @@
 package com.lishid.openinv.internal.v1_5_R2;
 
 import com.lishid.openinv.internal.IAnySilentContainer;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
 import net.minecraft.server.v1_5_R2.AxisAlignedBB;
 import net.minecraft.server.v1_5_R2.BlockEnderChest;
 import net.minecraft.server.v1_5_R2.Container;
@@ -34,43 +29,46 @@ 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(org.bukkit.block.Block block) {
-        return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
+    public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
+        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
     }
 
     @Override
-    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = PlayerDataManager.getHandle(p);
-        World world = player.world;
+        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
 
-        if (block instanceof BlockEnderChest) {
+        if (bukkitBlock instanceof BlockEnderChest) {
             // Ender chests are not blocked by ocelots.
-            return world.t(block.getX(), block.getY() + 1, block.getZ());
+            return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
         }
 
         // If block or ocelot on top
-        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+        if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
             return true;
         }
 
-        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+        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(block.getX(), block.getY(), block.getZ() + 1) == id) {
-            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
-        } else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
-        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
-        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        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;
@@ -93,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
 
-        EntityPlayer player = PlayerDataManager.getHandle(p);
+        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
         // Silent ender chest is API-only
-        if (silentchest && block.getType() == Material.ENDER_CHEST) {
-            p.openInventory(p.getEnderChest());
+        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
+            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
             return true;
         }
 
         World world = player.world;
-        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+        Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
 
         if (tile == null) {
             return false;
@@ -123,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         IInventory inventory = (IInventory) tile;
-        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
 
-        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
-        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
-        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
-        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
+        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 (!silentchest) {
+        if (!silent) {
             player.openContainer(inventory);
             return true;
         }
@@ -160,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
             return true;
         } catch (Exception e) {
             e.printStackTrace();
-            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
             return false;
         }
     }
 
     @Override
-    public void deactivateContainer(final Player bukkitPlayer) {}
+    public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
 
 }

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

@@ -20,17 +20,15 @@ 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 org.bukkit.inventory.Inventory;
-
 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(Inventory inventory) {
+    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
         }
@@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();
@@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public boolean isSpecialEnderChest(Inventory inventory) {
+    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
         }
@@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();

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

@@ -16,29 +16,28 @@
 
 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 com.lishid.openinv.internal.IPlayerDataManager;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-
 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(OfflinePlayer offline) {
+    public Player loadPlayer(@NotNull OfflinePlayer offline) {
         // Ensure the player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
+        if (!offline.hasPlayedBefore()) {
             return null;
         }
 
@@ -49,7 +48,7 @@ public class PlayerDataManager implements IPlayerDataManager {
                 new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
-        Player target = (entity == null) ? null : entity.getBukkitEntity();
+        Player target = entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
@@ -59,12 +58,12 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public String getPlayerDataID(OfflinePlayer offline) {
+    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
         return offline.getName();
     }
 
     @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
+    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()) {
@@ -74,7 +73,7 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public Collection<? extends Player> getOnlinePlayers() {
+    public @NotNull Collection<? extends Player> getOnlinePlayers() {
         return Arrays.asList(Bukkit.getOnlinePlayers());
     }
 
@@ -98,4 +97,9 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -24,7 +24,7 @@ import net.minecraft.server.v1_5_R2.PlayerInventory;
 
 class SilentContainerChest extends ContainerChest {
 
-    public SilentContainerChest(IInventory i1, IInventory i2) {
+    SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
         // Send close signal
         i2.g();

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

@@ -16,26 +16,23 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
-
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-
 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 {
 
@@ -58,12 +55,12 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public void setPlayerOnline(@NotNull Player player) {
         if (!playerOnline) {
             try {
                 EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
@@ -72,7 +69,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            } catch (Exception ignored) {}
             playerOnline = true;
         }
     }

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

@@ -17,14 +17,12 @@
 package com.lishid.openinv.internal.v1_5_R2;
 
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 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 {
 
@@ -40,12 +38,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public void setPlayerOnline(@NotNull Player player) {
         if (!playerOnline) {
             this.player = PlayerDataManager.getHandle(player);
             this.player.inventory.items = this.items;

internal/v1_5_R3/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.5</version>
+    <version>4.0.0</version>
   </parent>
 
   <artifactId>openinvadapter1_5_R3</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.5</version>
+      <version>4.0.0</version>
     </dependency>
   </dependencies>
 

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

@@ -17,11 +17,6 @@
 package com.lishid.openinv.internal.v1_5_R3;
 
 import com.lishid.openinv.internal.IAnySilentContainer;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
 import net.minecraft.server.v1_5_R3.AxisAlignedBB;
 import net.minecraft.server.v1_5_R3.BlockEnderChest;
 import net.minecraft.server.v1_5_R3.Container;
@@ -34,43 +29,46 @@ 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(org.bukkit.block.Block block) {
-        return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
+    public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
+        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
     }
 
     @Override
-    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = PlayerDataManager.getHandle(p);
-        World world = player.world;
+        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
 
-        if (block instanceof BlockEnderChest) {
+        if (bukkitBlock instanceof BlockEnderChest) {
             // Ender chests are not blocked by ocelots.
-            return world.t(block.getX(), block.getY() + 1, block.getZ());
+            return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
         }
 
         // If block or ocelot on top
-        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+        if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
             return true;
         }
 
-        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+        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(block.getX(), block.getY(), block.getZ() + 1) == id) {
-            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
-        } else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
-        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
-        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        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;
@@ -93,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
 
-        EntityPlayer player = PlayerDataManager.getHandle(p);
+        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
         // Silent ender chest is API-only
-        if (silentchest && block.getType() == Material.ENDER_CHEST) {
-            p.openInventory(p.getEnderChest());
+        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
+            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
             return true;
         }
 
         World world = player.world;
-        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+        Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
 
         if (tile == null) {
             return false;
@@ -123,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         IInventory inventory = (IInventory) tile;
-        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
 
-        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
-        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
-        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
-        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
+        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 (!silentchest) {
+        if (!silent) {
             player.openContainer(inventory);
             return true;
         }
@@ -160,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
             return true;
         } catch (Exception e) {
             e.printStackTrace();
-            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
             return false;
         }
     }
 
     @Override
-    public void deactivateContainer(final Player bukkitPlayer) {}
+    public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
 
 }

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

@@ -20,17 +20,15 @@ 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 org.bukkit.inventory.Inventory;
-
 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(Inventory inventory) {
+    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
         }
@@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();
@@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public boolean isSpecialEnderChest(Inventory inventory) {
+    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
         }
@@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();

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

@@ -16,29 +16,28 @@
 
 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 com.lishid.openinv.internal.IPlayerDataManager;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-
 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(OfflinePlayer offline) {
+    public Player loadPlayer(@NotNull OfflinePlayer offline) {
         // Ensure the player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
+        if (!offline.hasPlayedBefore()) {
             return null;
         }
 
@@ -49,7 +48,7 @@ public class PlayerDataManager implements IPlayerDataManager {
                 new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
-        Player target = (entity == null) ? null : entity.getBukkitEntity();
+        Player target = entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
@@ -59,12 +58,12 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public String getPlayerDataID(OfflinePlayer offline) {
+    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
         return offline.getName();
     }
 
     @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
+    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()) {
@@ -74,7 +73,7 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public Collection<? extends Player> getOnlinePlayers() {
+    public @NotNull Collection<? extends Player> getOnlinePlayers() {
         return Arrays.asList(Bukkit.getOnlinePlayers());
     }
 
@@ -98,4 +97,9 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -24,7 +24,7 @@ import net.minecraft.server.v1_5_R3.PlayerInventory;
 
 class SilentContainerChest extends ContainerChest {
 
-    public SilentContainerChest(IInventory i1, IInventory i2) {
+    SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
         // Send close signal
         i2.g();

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

@@ -16,26 +16,23 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
-
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-
 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 {
 
@@ -58,12 +55,12 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public void setPlayerOnline(@NotNull Player player) {
         if (!playerOnline) {
             try {
                 EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
@@ -72,7 +69,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            } catch (Exception ignored) {}
             playerOnline = true;
         }
     }

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

@@ -17,14 +17,12 @@
 package com.lishid.openinv.internal.v1_5_R3;
 
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 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 {
 
@@ -40,12 +38,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public void setPlayerOnline(@NotNull Player player) {
         if (!playerOnline) {
             this.player = PlayerDataManager.getHandle(player);
             this.player.inventory.items = this.items;

internal/v1_6_R1/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.5</version>
+    <version>4.0.0</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.5</version>
+      <version>4.0.0</version>
     </dependency>
   </dependencies>
 

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

@@ -17,11 +17,6 @@
 package com.lishid.openinv.internal.v1_6_R1;
 
 import com.lishid.openinv.internal.IAnySilentContainer;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
 import net.minecraft.server.v1_6_R1.AxisAlignedBB;
 import net.minecraft.server.v1_6_R1.BlockEnderChest;
 import net.minecraft.server.v1_6_R1.Container;
@@ -34,43 +29,46 @@ 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(org.bukkit.block.Block block) {
-        return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
+    public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
+        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
     }
 
     @Override
-    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = PlayerDataManager.getHandle(p);
-        World world = player.world;
+        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
 
-        if (block instanceof BlockEnderChest) {
+        if (bukkitBlock instanceof BlockEnderChest) {
             // Ender chests are not blocked by ocelots.
-            return world.t(block.getX(), block.getY() + 1, block.getZ());
+            return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
         }
 
         // If block or ocelot on top
-        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+        if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
             return true;
         }
 
-        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+        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(block.getX(), block.getY(), block.getZ() + 1) == id) {
-            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
-        } else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
-        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
-        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        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;
@@ -93,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
 
-        EntityPlayer player = PlayerDataManager.getHandle(p);
+        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
         // Silent ender chest is API-only
-        if (silentchest && block.getType() == Material.ENDER_CHEST) {
-            p.openInventory(p.getEnderChest());
+        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
+            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
             return true;
         }
 
         World world = player.world;
-        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+        Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
 
         if (tile == null) {
             return false;
@@ -123,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         IInventory inventory = (IInventory) tile;
-        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
 
-        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
-        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
-        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
-        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
+        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 (!silentchest) {
+        if (!silent) {
             player.openContainer(inventory);
             return true;
         }
@@ -160,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
             return true;
         } catch (Exception e) {
             e.printStackTrace();
-            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
             return false;
         }
     }
 
     @Override
-    public void deactivateContainer(final Player bukkitPlayer) {}
+    public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
 
 }

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

@@ -20,17 +20,15 @@ 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 org.bukkit.inventory.Inventory;
-
 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(Inventory inventory) {
+    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
         }
@@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();
@@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public boolean isSpecialEnderChest(Inventory inventory) {
+    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
         }
@@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();

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

@@ -16,29 +16,28 @@
 
 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 com.lishid.openinv.internal.IPlayerDataManager;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-
 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(OfflinePlayer offline) {
+    public Player loadPlayer(@NotNull OfflinePlayer offline) {
         // Ensure the player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
+        if (!offline.hasPlayedBefore()) {
             return null;
         }
 
@@ -49,7 +48,7 @@ public class PlayerDataManager implements IPlayerDataManager {
                 new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
-        Player target = (entity == null) ? null : entity.getBukkitEntity();
+        Player target = entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
@@ -59,12 +58,12 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public String getPlayerDataID(OfflinePlayer offline) {
+    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
         return offline.getName();
     }
 
     @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
+    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()) {
@@ -74,7 +73,7 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public Collection<? extends Player> getOnlinePlayers() {
+    public @NotNull Collection<? extends Player> getOnlinePlayers() {
         return Arrays.asList(Bukkit.getOnlinePlayers());
     }
 
@@ -98,4 +97,9 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -24,7 +24,7 @@ import net.minecraft.server.v1_6_R1.PlayerInventory;
 
 class SilentContainerChest extends ContainerChest {
 
-    public SilentContainerChest(IInventory i1, IInventory i2) {
+    SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
         // Send close signal
         i2.g();

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

@@ -16,26 +16,23 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
-
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-
 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 {
 
@@ -58,12 +55,12 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public void setPlayerOnline(@NotNull Player player) {
         if (!playerOnline) {
             try {
                 EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
@@ -72,7 +69,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            } catch (Exception ignored) {}
             playerOnline = true;
         }
     }

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

@@ -17,14 +17,12 @@
 package com.lishid.openinv.internal.v1_6_R1;
 
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 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 {
 
@@ -40,12 +38,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public void setPlayerOnline(@NotNull Player player) {
         if (!playerOnline) {
             this.player = PlayerDataManager.getHandle(player);
             this.player.inventory.items = this.items;

internal/v1_6_R2/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.5</version>
+    <version>4.0.0</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R2</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.5</version>
+      <version>4.0.0</version>
     </dependency>
   </dependencies>
 

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

@@ -17,11 +17,6 @@
 package com.lishid.openinv.internal.v1_6_R2;
 
 import com.lishid.openinv.internal.IAnySilentContainer;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
 import net.minecraft.server.v1_6_R2.AxisAlignedBB;
 import net.minecraft.server.v1_6_R2.BlockEnderChest;
 import net.minecraft.server.v1_6_R2.Container;
@@ -34,43 +29,46 @@ 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(org.bukkit.block.Block block) {
-        return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
+    public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
+        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
     }
 
     @Override
-    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = PlayerDataManager.getHandle(p);
-        World world = player.world;
+        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
 
-        if (block instanceof BlockEnderChest) {
+        if (bukkitBlock instanceof BlockEnderChest) {
             // Ender chests are not blocked by ocelots.
-            return world.t(block.getX(), block.getY() + 1, block.getZ());
+            return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
         }
 
         // If block or ocelot on top
-        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+        if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
             return true;
         }
 
-        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+        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(block.getX(), block.getY(), block.getZ() + 1) == id) {
-            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
-        } else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
-        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
-        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        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;
@@ -93,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
 
-        EntityPlayer player = PlayerDataManager.getHandle(p);
+        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
         // Silent ender chest is API-only
-        if (silentchest && block.getType() == Material.ENDER_CHEST) {
-            p.openInventory(p.getEnderChest());
+        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
+            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
             return true;
         }
 
         World world = player.world;
-        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+        Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
 
         if (tile == null) {
             return false;
@@ -123,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         IInventory inventory = (IInventory) tile;
-        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
 
-        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
-        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
-        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
-        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
+        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 (!silentchest) {
+        if (!silent) {
             player.openContainer(inventory);
             return true;
         }
@@ -160,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
             return true;
         } catch (Exception e) {
             e.printStackTrace();
-            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
             return false;
         }
     }
 
     @Override
-    public void deactivateContainer(final Player bukkitPlayer) {}
+    public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
 
 }

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

@@ -20,17 +20,15 @@ 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 org.bukkit.inventory.Inventory;
-
 import net.minecraft.server.v1_6_R2.IInventory;
-
 import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
+import org.bukkit.inventory.Inventory;
+import org.jetbrains.annotations.NotNull;
 
 public class InventoryAccess implements IInventoryAccess {
 
     @Override
-    public boolean isSpecialPlayerInventory(Inventory inventory) {
+    public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
         }
@@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+    public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();
@@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public boolean isSpecialEnderChest(Inventory inventory) {
+    public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
         if (inventory instanceof CraftInventory) {
             return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
         }
@@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
     }
 
     @Override
-    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+    public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
         IInventory inv;
         if (inventory instanceof CraftInventory) {
             inv = ((CraftInventory) inventory).getInventory();

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

@@ -16,29 +16,28 @@
 
 package com.lishid.openinv.internal.v1_6_R2;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+import com.lishid.openinv.internal.ISpecialInventory;
 import java.util.Arrays;
 import java.util.Collection;
-
-import com.lishid.openinv.internal.IPlayerDataManager;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-
 import net.minecraft.server.v1_6_R2.EntityPlayer;
 import net.minecraft.server.v1_6_R2.MinecraftServer;
 import net.minecraft.server.v1_6_R2.PlayerInteractManager;
-
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 import org.bukkit.craftbukkit.v1_6_R2.CraftServer;
 import org.bukkit.craftbukkit.v1_6_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(OfflinePlayer offline) {
+    public Player loadPlayer(@NotNull OfflinePlayer offline) {
         // Ensure the player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
+        if (!offline.hasPlayedBefore()) {
             return null;
         }
 
@@ -49,7 +48,7 @@ public class PlayerDataManager implements IPlayerDataManager {
                 new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
-        Player target = (entity == null) ? null : entity.getBukkitEntity();
+        Player target = entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
@@ -59,12 +58,12 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public String getPlayerDataID(OfflinePlayer offline) {
+    public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
         return offline.getName();
     }
 
     @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
+    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()) {
@@ -74,7 +73,7 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     @Override
-    public Collection<? extends Player> getOnlinePlayers() {
+    public @NotNull Collection<? extends Player> getOnlinePlayers() {
         return Arrays.asList(Bukkit.getOnlinePlayers());
     }
 
@@ -98,4 +97,9 @@ public class PlayerDataManager implements IPlayerDataManager {
         return nmsPlayer;
     }
 
+    @Override
+    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
+        return player.openInventory(inventory.getBukkitInventory());
+    }
+
 }

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

@@ -24,7 +24,7 @@ import net.minecraft.server.v1_6_R2.PlayerInventory;
 
 class SilentContainerChest extends ContainerChest {
 
-    public SilentContainerChest(IInventory i1, IInventory i2) {
+    SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
         // Send close signal
         i2.g();

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

@@ -16,26 +16,23 @@
 
 package com.lishid.openinv.internal.v1_6_R2;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-
 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.InventorySubcontainer;
 import net.minecraft.server.v1_6_R2.ItemStack;
-
 import org.bukkit.craftbukkit.v1_6_R2.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_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 {
 
@@ -58,12 +55,12 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public void setPlayerOnline(@NotNull Player player) {
         if (!playerOnline) {
             try {
                 EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
@@ -72,7 +69,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            } catch (Exception ignored) {}
             playerOnline = true;
         }
     }

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

@@ -17,14 +17,12 @@
 package com.lishid.openinv.internal.v1_6_R2;
 
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 import net.minecraft.server.v1_6_R2.ItemStack;
 import net.minecraft.server.v1_6_R2.PlayerInventory;
-
 import org.bukkit.craftbukkit.v1_6_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 {
 
@@ -40,12 +38,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public Inventory getBukkitInventory() {
+    public @NotNull Inventory getBukkitInventory() {
         return inventory;
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public void setPlayerOnline(@NotNull Player player) {
         if (!playerOnline) {
             this.player = PlayerDataManager.getHandle(player);
             this.player.inventory.items = this.items;

internal/v1_6_R3/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.5</version>
+    <version>4.0.0</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R3</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.5</version>
+      <version>4.0.0</version>
     </dependency>
   </dependencies>
 

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

@@ -17,11 +17,6 @@
 package com.lishid.openinv.internal.v1_6_R3;
 
 import com.lishid.openinv.internal.IAnySilentContainer;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
 import net.minecraft.server.v1_6_R3.AxisAlignedBB;
 import net.minecraft.server.v1_6_R3.BlockEnderChest;
 import net.minecraft.server.v1_6_R3.Container;
@@ -34,43 +29,46 @@ import net.minecraft.server.v1_6_R3.Packet100OpenWindow;
 import net.minecraft.server.v1_6_R3.TileEntityChest;
 import net.minecraft.server.v1_6_R3.TileEntityEnderChest;
 import net.minecraft.server.v1_6_R3.World;
-
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
 import org.bukkit.craftbukkit.v1_6_R3.event.CraftEventFactory;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 public class AnySilentContainer implements IAnySilentContainer {
 
     @Override
-    public boolean isAnySilentContainer(org.bukkit.block.Block block) {
-        return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
+    public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
+        return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
     }
 
     @Override
-    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+    public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = PlayerDataManager.getHandle(p);
-        World world = player.world;
+        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
 
-        if (block instanceof BlockEnderChest) {
+        if (bukkitBlock instanceof BlockEnderChest) {
             // Ender chests are not blocked by ocelots.
-            return world.t(block.getX(), block.getY() + 1, block.getZ());
+            return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
         }
 
         // If block or ocelot on top
-        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+        if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
             return true;
         }
 
-        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+        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(block.getX(), block.getY(), block.getZ() + 1) == id) {
-            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
-        } else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
-        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
-        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        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;
@@ -93,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+    public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
 
-        EntityPlayer player = PlayerDataManager.getHandle(p);
+        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
 
         // Silent ender chest is API-only
-        if (silentchest && block.getType() == Material.ENDER_CHEST) {
-            p.openInventory(p.getEnderChest());
+        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
+            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
             return true;
         }
 
         World world = player.world;
-        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+        Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
 
         if (tile == null) {
             return false;
@@ -123,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         IInventory inventory = (IInventory) tile;
-        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+        int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
 
-        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
-        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
-        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
-        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
+        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 (!silentchest) {
+        if (!silent) {
             player.openContainer(inventory);
             return true;
         }
@@ -160,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
             return true;
         } catch (Exception e) {
             e.printStackTrace();
-            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
             return false;
         }
     }
 
     @Override
-    public void deactivateContainer(final Player bukkitPlayer) {}
+    public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
 
 }