Fix issue caused by module cleanup while backporting awarding achievement

The project was very messy and due to older Bukkit packaging conventions, 1_4_5 and 1_4_6 were sorted away from the rest of the versioned code. All of the versioned internals are now submodules of the internal module.
Rather than use the hackish existing method of abusing the shade plugin to combine "dependencies" for a dummy assembly project, we're actually using the assembly plugin.
Profiles are still split up between the parent pom and the internal module pom, but they're much more clean.

The API is now its own module and can be compiled and released as a separate file for developers. Soon, Bukkit ticket 20, you'll be closed.

.gitignore

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

README.MD

@@ -1,13 +1,125 @@
-## Goals
-This fork of OpenInv was created when the lag caused by offline player lookups post-UUID migration became too much to bear. Overall, it does not differ much from the original.
+## About
+OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) which allows users to open and edit anyone's inventory or ender chest - online or not!
 
-### Changes of Note
-- Removed updater
-- Removed wand
-- New configuration option `DisableSaving`: Inventory edits will not be saved unless the user is online.
+## Features
+- **OpenInv**: Open anyone's inventory, even if they're offline.
+  - Read-only mode! No edits allowed! Don't grant the permission `OpenInv.editinv`
+  - Cross-world support! Don't grant `OpenInv.crossworld`
+  - No self-opening! Don't grant `OpenInv.openself`
+  - Drop items as the player! Place items in the unused slots to the right of the armor to drop them
+- **OpenEnder**: Open anyone's inventory, even if they're offline.
+  - Read-only mode! No edits allowed! Don't grant `OpenInv.editender`
+  - Cross-world support! Don't grant `OpenInv.crossworld`
+  - No opening others! Don't grant `OpenInv.openenderall`
+- **SilentChest**: Open containers without displaying an animation or making sound.
+- **AnyChest**: Open containers, even if blocked by ocelots or blocks.
 
-## Previous Versions
-This fork supports any version after 1.4.5. Binaries are available in the [releases tab](https://github.com/Jikoo/OpenInv/releases). Please allow a brief period after the release of a new version for updates.
+## Commands
+<table width=100%>
+  <tr>
+    <th width=175px>Command</th>
+    <th>Aliases</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td>/openinv [player]</td>
+    <td>oi, inv, open</td>
+    <td>Open a player's inventory. If unspecified, will select last player opened or own if none opened previously.</td>
+  </tr>
+  <tr>
+    <td>/openender [player]</td>
+    <td>oe</td>
+    <td>Open a player's ender chest. If unspecified, will select last player opened or own if none opened previously.</td>
+  </tr>
+  <tr>
+    <td>/searchinv &ltitem&gt [minAmount]</td>
+    <td>si</td>
+    <td>Lists all online players that have a certain item in their inventory.</td>
+  </tr>
+  <tr>
+    <td>/searchender &ltitem&gt [minAmount]</td>
+    <td>se</td>
+    <td>Lists all online players that have a certain item in their ender chest.</td>
+  </tr>
+  <tr>
+    <td>/anychest [check]</td>
+    <td>ac</td>
+    <td>Check or toggle the AnyChest function, allowing opening blocked containers.</td>
+  </tr>
+  <tr>
+    <td>/silentchest [check]</td>
+    <td>sc</td>
+    <td>Check or toggle the SilentChest function, allowing opening containers silently.</td>
+  </tr>
+</table>
+
+## Permissions
+<table>
+  <tr>
+    <th>Node</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td>OpenInv.*</td>
+    <td>Gives permission to use all of OpenInv.</td>
+  </tr>
+  <tr>
+    <td>OpenInv.openinv</td>
+    <td>Required to use /openinv.</td>
+  </tr>
+  <tr>
+    <td>OpenInv.openself</td>
+    <td>Required to open own inventory.</td>
+  </tr>
+  <tr>
+    <td>OpenInv.editinv</td>
+    <td>Required to make changes to open inventories.</td>
+  </tr>
+  <tr>
+    <td>OpenInv.openender</td>
+    <td>Required to use /openender.</td>
+  </tr>
+  <tr>
+    <td>OpenInv.editender</td>
+    <td>Required to make changes to open ender chests.</td>
+  </tr>
+  <tr>
+    <td>OpenInv.openenderall</td>
+    <td>Allows users to open others' ender chests. Without it, users can only open their own.</td>
+  </tr>
+  <tr>
+    <td>OpenInv.exempt</td>
+    <td>Prevents the player's inventory being opened by others.</td>
+  </tr>
+  <tr>
+    <td>OpenInv.override</td>
+    <td>Allows bypassing of the exempt permission.</td>
+  </tr>
+  <tr>
+    <td>OpenInv.crossworld</td>
+    <td>Allows cross-world usage of /openinv and /openender.</td>
+  </tr>
+  <tr>
+    <td>OpenInv.search</td>
+    <td>Required to use /searchinv and /searchender.</td>
+  </tr>
+  <tr>
+    <td>OpenInv.anychest</td>
+    <td>Required to use /anychest.</td>
+  </tr>
+  <tr>
+    <td>OpenInv.silent</td>
+    <td>Required to use /silentchest.</td>
+  </tr>
+</table>
+
+## For Developers
+To compile, the relevant Craftbukkit/Spigot jars must be installed in your local repository using the install plugin.  
+Ex: `mvn install:install-file -Dpackaging=jar -Dfile=spigot-1.11-R0.1-SNAPSHOT.jar -DgroupId=org.spigotmc -DartifactId=spigot -Dversion=1.11-R0.1-SNAPSHOT`
+
+To compile for a specific version or set of versions, you'll need to use a profile. Provided profiles are `latest`, `modern` (versions 1.8+), and `all`. Select an existing profile using the `-P` argument (ex: `mvn clean package -am -P all`) or make your own. For more information, check out the [official guide](http://maven.apache.org/guides/introduction/introduction-to-profiles.html).
+
+The final file is target/OpenInv.jar
 
 ## License
 ```

api/pom.xml

@@ -0,0 +1,23 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvapi</artifactId>
+  <name>OpenInvAPI</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>bukkit</artifactId>
+      <version>1.4.5-R1.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -0,0 +1,153 @@
+package com.lishid.openinv;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+import com.lishid.openinv.internal.IInventoryAccess;
+import com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+
+/**
+ * Interface defining behavior for the OpenInv plugin.
+ * 
+ * @author Jikoo
+ */
+public interface IOpenInv {
+
+    /**
+     * Checks if the server version is supported by OpenInv.
+     * 
+     * @return true if the server version is supported
+     */
+    public boolean isSupportedVersion();
+
+    /**
+     * Gets the active IInventoryAccess implementation. May return null if the server version is
+     * unsupported.
+     * 
+     * @return the IInventoryAccess
+     */
+    public IInventoryAccess getInventoryAccess();
+
+    /**
+     * Gets the active ISilentContainer implementation. May return null if the server version is
+     * unsupported.
+     * 
+     * @return the ISilentContainer
+     */
+    public IAnySilentContainer getAnySilentContainer();
+
+    /**
+     * Gets an ISpecialPlayerInventory for the given Player.
+     * 
+     * @param player the Player
+     * @param online true if the Player is currently online
+     * @return the ISpecialPlayerInventory
+     */
+    public ISpecialPlayerInventory getInventory(Player player, boolean online);
+
+    /**
+     * Gets an ISpecialEnderChest for the given Player.
+     * 
+     * @param player the Player
+     * @param online true if the Player is currently online
+     * @return the ISpecialEnderChest
+     */
+    public ISpecialEnderChest getEnderChest(Player player, boolean online);
+
+    /**
+     * Forcibly unload a cached Player's data.
+     * 
+     * @param player the OfflinePlayer to unload
+     */
+    public void unload(OfflinePlayer player);
+
+    /**
+     * Check the configuration value for whether or not OpenInv saves player data when unloading
+     * players. This is exclusively for users who do not allow editing of inventories, only viewing,
+     * and wish to prevent any possibility of bugs such as lishid#40. If true, OpenInv will not ever
+     * save any edits made to players.
+     * 
+     * @return false unless configured otherwise
+     */
+    public boolean disableSaving();
+
+    /**
+     * Check the configuration value for whether or not OpenInv displays a notification to the user
+     * when a container is activated with SilentChest.
+     * 
+     * @return true unless configured otherwise
+     */
+    public boolean notifySilentChest();
+
+    /**
+     * Check the configuration value for whether or not OpenInv displays a notification to the user
+     * when a container is activated with AnyChest.
+     * 
+     * @return true unless configured otherwise
+     */
+    public boolean notifyAnyChest();
+
+    /**
+     * Gets a player's SilentChest setting.
+     * 
+     * @param player the OfflinePlayer
+     * @return true if SilentChest is enabled
+     */
+    public boolean getPlayerSilentChestStatus(OfflinePlayer player);
+
+    /**
+     * Sets a player's SilentChest setting.
+     * 
+     * @param player the OfflinePlayer
+     * @param status the status
+     */
+    public void setPlayerSilentChestStatus(OfflinePlayer player, boolean status);
+
+    /**
+     * Gets the provided player's AnyChest setting.
+     * 
+     * @param player the OfflinePlayer
+     * @return true if AnyChest is enabled
+     */
+    public boolean getPlayerAnyChestStatus(OfflinePlayer player);
+
+    /**
+     * Sets a player's AnyChest setting.
+     * 
+     * @param player the OfflinePlayer
+     * @param status the status
+     */
+    public void setPlayerAnyChestStatus(OfflinePlayer player, boolean status);
+
+    /**
+     * Gets a unique identifier by which the OfflinePlayer can be referenced. Using the value
+     * returned to look up a Player will generally be much faster for later implementations.
+     * 
+     * @param offline the OfflinePlayer
+     * @return the identifier
+     */
+    public String getPlayerID(OfflinePlayer offline);
+
+    /**
+     * Get an OfflinePlayer by name.
+     * <p>
+     * Note: This method is potentially very heavily blocking. It should not ever be called on the
+     * main thread, and if it is, a stack trace will be displayed alerting server owners to the
+     * call.
+     * 
+     * @param name the name of the Player
+     * @return the OfflinePlayer with the closest matching name or null if no players have ever logged in
+     */
+    public OfflinePlayer matchPlayer(String name);
+
+    /**
+     * Load a Player from an OfflinePlayer. May return null under some circumstances.
+     * 
+     * @param offline the OfflinePlayer to load a Player for
+     * @return the Player
+     */
+    public Player loadPlayer(final OfflinePlayer offline);
+
+}

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

@@ -0,0 +1,37 @@
+package com.lishid.openinv.internal;
+
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+
+public interface IAnySilentContainer {
+
+    /**
+     * Checks if the given block is a container which can be unblocked or silenced.
+     * 
+     * @param block the BlockState
+     * @return true if the Block is a supported container
+     */
+    public boolean isAnySilentContainer(Block block);
+
+    /**
+     * Checks if the container at the given coordinates is blocked.
+     * 
+     * @param player the Player opening the container
+     * @param block the Block
+     * @return true if the container is blocked
+     */
+    public boolean isAnyContainerNeeded(Player player, Block block);
+
+    /**
+     * Opens the container at the given coordinates for the Player. If you do not want blocked
+     * containers to open, be sure to check {@link #isAnyContainerNeeded(Player, Block)}
+     * first.
+     * 
+     * @param player
+     * @param silentchest whether the container's noise is to be silenced
+     * @param block the Block
+     * @return true if the container can be opened
+     */
+    public boolean activateContainer(Player player, boolean silentchest, Block block);
+
+}

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

@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This 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.inventory.Inventory;
+
+public interface IInventoryAccess {
+
+    /**
+     * Check if an Inventory is an ISpecialPlayerInventory implementation.
+     * 
+     * @param inventory the Inventory
+     * @return true if the Inventory is backed by an ISpecialPlayerInventory
+     */
+    public boolean isSpecialPlayerInventory(Inventory inventory);
+
+    /**
+     * Gets an ISpecialPlayerInventory from an Inventory or null if the Inventory is not backed by
+     * an ISpecialPlayerInventory.
+     * 
+     * @param inventory the Inventory
+     * @return the ISpecialPlayerInventory or null
+     */
+    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory);
+
+    /**
+     * Check if an Inventory is an ISpecialEnderChest implementation.
+     * 
+     * @param inventory the Inventory
+     * @return true if the Inventory is backed by an ISpecialEnderChest
+     */
+    public boolean isSpecialEnderChest(Inventory inventory);
+
+    /**
+     * Gets an ISpecialEnderChest from an Inventory or null if the Inventory is not backed by an
+     * ISpecialEnderChest.
+     * 
+     * @param inventory the Inventory
+     * @return the ISpecialEnderChest or null
+     */
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory);
+
+}

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

@@ -39,4 +39,12 @@ public interface IPlayerDataManager {
      */
     public String getPlayerDataID(OfflinePlayer player);
 
+    /**
+     * Gets an OfflinePlayer by the given unique identifier.
+     * 
+     * @param identifier the unique identifier
+     * @return the OfflinePlayer, or null if no exact match was found
+     */
+    public OfflinePlayer getPlayerByID(String identifier);
+
 }

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

@@ -21,6 +21,11 @@ import org.bukkit.inventory.Inventory;
 
 public interface ISpecialEnderChest {
 
+    /**
+     * Gets the Inventory associated with this ISpecialEnderChest.
+     * 
+     * @return the Inventory
+     */
     public Inventory getBukkitInventory();
 
     /**

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

@@ -21,6 +21,11 @@ import org.bukkit.inventory.Inventory;
 
 public interface ISpecialPlayerInventory {
 
+    /**
+     * Gets the Inventory associated with this ISpecialPlayerInventory.
+     * 
+     * @return the Inventory
+     */
     public Inventory getBukkitInventory();
 
     /**

assembly/pom.xml

@@ -0,0 +1,42 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvassembly</artifactId>
+  <name>OpenInvAssembly</name>
+
+  <build>
+    <directory>../target</directory>
+    <finalName>OpenInv</finalName>
+
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+          <execution>
+            <id>reactor-uberjar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <appendAssemblyId>false</appendAssemblyId>
+              <descriptors>
+                <descriptor>src/assembly/reactor-uberjar.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+
+  </build>
+
+</project>

assembly/src/assembly/reactor-uberjar.xml

@@ -0,0 +1,28 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+
+  <id>reactor-uberjar</id>
+
+  <formats>
+    <format>jar</format>
+  </formats>
+
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <moduleSets>
+    <moduleSet>
+
+      <useAllReactorProjects>true</useAllReactorProjects>
+
+      <binaries>
+        <outputDirectory>/</outputDirectory>
+        <unpack>true</unpack>
+        <!-- unpackOptions must be present or build breaks. -->
+        <unpackOptions/>
+      </binaries>
+
+    </moduleSet>
+  </moduleSets>
+
+</assembly>

common/pom.xml

@@ -0,0 +1,29 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvcommon</artifactId>
+  <name>OpenInvCommon</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>bukkit</artifactId>
+      <version>1.4.5-R1.0</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvapi</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.util;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+
+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 org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+public class InternalAccessor {
+
+    private final Plugin plugin;
+
+    private final String version;
+    private boolean supported = false;
+
+    public InternalAccessor(Plugin plugin) {
+        this.plugin = plugin;
+
+        String packageName = plugin.getServer().getClass().getPackage().getName();
+        version = packageName.substring(packageName.lastIndexOf('.') + 1);
+
+        try {
+            Class.forName("com.lishid.openinv.internal." + version + ".PlayerDataManager");
+            supported = true;
+        } catch (Exception e) {}
+    }
+
+    /**
+     * Gets the server implementation version. If not initialized, returns the string "null"
+     * instead.
+     * 
+     * @return the version, or "null"
+     */
+    public String getVersion() {
+        return this.version != null ? this.version : "null";
+    }
+
+    /**
+     * Checks if the server implementation is supported.
+     * 
+     * @return true if initialized for a supported server version
+     */
+    public boolean isSupported() {
+        return this.supported;
+    }
+
+    /**
+     * Creates an instance of the IPlayerDataManager implementation for the current server version,
+     * or null if unsupported.
+     * 
+     * @return the IPlayerDataManager
+     */
+    public IPlayerDataManager newPlayerDataManager() {
+        return createObject(IPlayerDataManager.class, "PlayerDataManager");
+    }
+
+    /**
+     * Creates an instance of the IInventoryAccess implementation for the current server version, or
+     * null if unsupported.
+     * 
+     * @return the IInventoryAccess
+     */
+    public IInventoryAccess newInventoryAccess() {
+        return createObject(IInventoryAccess.class, "InventoryAccess");
+    }
+
+    /**
+     * Creates an instance of the IAnySilentContainer implementation for the current server version,
+     * or null if unsupported.
+     * 
+     * @return the IAnySilentContainer
+     */
+    public IAnySilentContainer newAnySilentContainer() {
+        return createObject(IAnySilentContainer.class, "AnySilentContainer");
+    }
+
+    /**
+     * Creates an instance of the ISpecialPlayerInventory implementation for the given Player, or
+     * null if the current version is unsupported.
+     * 
+     * @param player the Player
+     * @param online true if the Player is online
+     * @return the ISpecialPlayerInventory created
+     */
+    public ISpecialPlayerInventory newSpecialPlayerInventory(Player player, boolean online) {
+        return createObject(ISpecialPlayerInventory.class, "SpecialPlayerInventory", player, online);
+    }
+
+    /**
+     * Creates an instance of the ISpecialEnderChest implementation for the given Player, or
+     * null if the current version is unsupported.
+     * 
+     * @param player the Player
+     * @param online true if the Player is online
+     * @return the ISpecialEnderChest created
+     */
+    public ISpecialEnderChest newSpecialEnderChest(Player player, boolean online) {
+        return createObject(ISpecialEnderChest.class, "SpecialEnderChest", player, online);
+    }
+
+    private <T> T createObject(Class<? extends T> assignableClass, String className, Object... params) {
+        try {
+            // Check if internal versioned class exists
+            Class<?> internalClass = Class.forName("com.lishid.openinv.internal." + version + "." + className);
+            if (!assignableClass.isAssignableFrom(internalClass)) {
+                plugin.getLogger().warning("Found class " + internalClass.getName() + " but cannot cast to " + assignableClass.getName());
+                return null;
+            }
+
+            // Quick return: no parameters, no need to fiddle about finding the correct constructor.
+            if (params.length == 0) {
+                return assignableClass.cast(internalClass.getConstructor().newInstance());
+            }
+
+            // Search constructors for one matching the given parameters
+            nextConstructor: for (Constructor<?> constructor : internalClass.getConstructors()) {
+                Class<?>[] requiredClasses = constructor.getParameterTypes();
+                if (requiredClasses.length != params.length) {
+                    continue;
+                }
+                for (int i = 0; i < params.length; ++i) {
+                    if (!requiredClasses[i].isAssignableFrom(params[i].getClass())) {
+                        continue nextConstructor;
+                    }
+                }
+                return assignableClass.cast(constructor.newInstance(params));
+            }
+
+            StringBuilder message = new StringBuilder("Found class ").append(internalClass.getName())
+                    .append(" but cannot find any matching constructors for [");
+            for (Object object : params) {
+                message.append(object.getClass().getName()).append(", ");
+            }
+            if (params.length > 0) {
+                message.delete(message.length() - 2, message.length());
+            }
+
+            plugin.getLogger().warning(message.append(']').toString());
+        } catch (Exception e) {
+            plugin.getLogger().warning("OpenInv encountered an error with the CraftBukkit version \"" + version + "\". Please look for an updated version of OpenInv.");
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    public static <T> T grabFieldOfTypeFromObject(Class<T> type, Object object) {
+        // Use reflection to find the iinventory
+        Class<?> clazz = object.getClass();
+        T result = null;
+        for (Field f : clazz.getDeclaredFields()) {
+            f.setAccessible(true);
+            if (type.isAssignableFrom(f.getDeclaringClass())) {
+                try {
+                    result = type.cast(f.get(object));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return result;
+    }
+
+}

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

@@ -0,0 +1,38 @@
+package com.lishid.openinv.util;
+
+import org.bukkit.permissions.Permissible;
+
+public enum Permissions {
+
+    OPENINV("OpenInv.openinv"),
+    OVERRIDE("OpenInv.override"),
+    EXEMPT("OpenInv.exempt"),
+    CROSSWORLD("OpenInv.crossworld"),
+    SILENT("OpenInv.silent"),
+    ANYCHEST("OpenInv.anychest"),
+    ENDERCHEST("OpenInv.openender"),
+    ENDERCHEST_ALL("OpenInv.openenderall"),
+    SEARCH("OpenInv.search"),
+    EDITINV("OpenInv.editinv"),
+    EDITENDER("OpenInv.editender"),
+    OPENSELF("OpenInv.openself");
+
+    private final String permission;
+
+    private Permissions(String permission) {
+        this.permission = permission;
+    }
+
+    public boolean hasPermission(Permissible permissible) {
+        String[] parts = permission.split("\\.");
+        String perm = "";
+        for (int i = 0; i < parts.length; i++) {
+            if (permissible.hasPermission(perm + "*")) {
+                return true;
+            }
+            perm += parts[i] + ".";
+        }
+        return permissible.hasPermission(permission);
+    }
+
+}

internal/1_4_5/pom.xml

@@ -0,0 +1,28 @@
+<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>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvadapter1_4_5</artifactId>
+  <name>OpenInvAdapter1_4_5</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.4.5-R1.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_4_5;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_4_5.AxisAlignedBB;
+import net.minecraft.server.v1_4_5.BlockEnderChest;
+import net.minecraft.server.v1_4_5.EntityOcelot;
+import net.minecraft.server.v1_4_5.EntityPlayer;
+import net.minecraft.server.v1_4_5.IInventory;
+import net.minecraft.server.v1_4_5.InventoryEnderChest;
+import net.minecraft.server.v1_4_5.InventoryLargeChest;
+import net.minecraft.server.v1_4_5.Packet100OpenWindow;
+import net.minecraft.server.v1_4_5.TileEntityChest;
+import net.minecraft.server.v1_4_5.TileEntityEnderChest;
+import net.minecraft.server.v1_4_5.World;
+
+import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
+
+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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.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());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) tile);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = player.nextContainerCounter();
+                player.netServerHandler.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize()));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+}

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

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

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

@@ -33,20 +33,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new ItemInWorldManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new ItemInWorldManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
@@ -54,4 +59,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -20,16 +20,15 @@ package com.lishid.openinv.internal.v1_4_5;
 import net.minecraft.server.v1_4_5.ContainerChest;
 import net.minecraft.server.v1_4_5.EntityHuman;
 import net.minecraft.server.v1_4_5.IInventory;
+import net.minecraft.server.v1_4_5.ItemStack;
 import net.minecraft.server.v1_4_5.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.f();
+        // Send close signal
+        i2.f();
     }
 
     @Override
@@ -38,8 +37,10 @@ public class SilentContainerChest extends ContainerChest {
         PlayerInventory playerinventory = entityHuman.inventory;
 
         if (playerinventory.getCarried() != null) {
-            entityHuman.drop(playerinventory.getCarried());
+            ItemStack carried = playerinventory.getCarried();
             playerinventory.setCarried(null);
+            entityHuman.drop(carried);
         }
     }
+
 }

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

@@ -41,13 +41,14 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +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 e) {}
             playerOnline = true;
         }
     }

internal/1_4_6/pom.xml

@@ -0,0 +1,28 @@
+<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>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvadapter1_4_6</artifactId>
+  <name>OpenInvAdapter1_4_6</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.4.6-R0.3</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_4_6;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_4_6.AxisAlignedBB;
+import net.minecraft.server.v1_4_6.BlockEnderChest;
+import net.minecraft.server.v1_4_6.EntityOcelot;
+import net.minecraft.server.v1_4_6.EntityPlayer;
+import net.minecraft.server.v1_4_6.IInventory;
+import net.minecraft.server.v1_4_6.InventoryEnderChest;
+import net.minecraft.server.v1_4_6.InventoryLargeChest;
+import net.minecraft.server.v1_4_6.Packet100OpenWindow;
+import net.minecraft.server.v1_4_6.TileEntityChest;
+import net.minecraft.server.v1_4_6.TileEntityEnderChest;
+import net.minecraft.server.v1_4_6.World;
+
+import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
+
+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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.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());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) tile);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = player.nextContainerCounter();
+                player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize()));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+}

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

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

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

@@ -33,20 +33,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
@@ -54,4 +59,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -20,16 +20,15 @@ package com.lishid.openinv.internal.v1_4_6;
 import net.minecraft.server.v1_4_6.ContainerChest;
 import net.minecraft.server.v1_4_6.EntityHuman;
 import net.minecraft.server.v1_4_6.IInventory;
+import net.minecraft.server.v1_4_6.ItemStack;
 import net.minecraft.server.v1_4_6.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.f();
+        // Send close signal
+        i2.f();
     }
 
     @Override
@@ -38,8 +37,10 @@ public class SilentContainerChest extends ContainerChest {
         PlayerInventory playerinventory = entityHuman.inventory;
 
         if (playerinventory.getCarried() != null) {
-            entityHuman.drop(playerinventory.getCarried());
+            ItemStack carried = playerinventory.getCarried();
             playerinventory.setCarried(null);
+            entityHuman.drop(carried);
         }
     }
+
 }

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

@@ -41,13 +41,14 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +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 e) {}
             playerOnline = true;
         }
     }

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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -207,23 +196,26 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override

internal/pom.xml

@@ -0,0 +1,68 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvinternal</artifactId>
+  <name>OpenInvInternal</name>
+
+  <packaging>pom</packaging>
+
+  <profiles>
+
+    <profile>
+      <id>latest</id>
+      <modules>
+        <module>v1_11_R1</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>modern</id>
+      <modules>
+        <module>v1_8_R1</module>
+        <module>v1_8_R2</module>
+        <module>v1_8_R3</module>
+        <module>v1_9_R1</module>
+        <module>v1_9_R2</module>
+        <module>v1_10_R1</module>
+        <module>v1_11_R1</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>all</id>
+      <modules>
+        <module>1_4_5</module>
+        <module>1_4_6</module>
+        <module>v1_4_R1</module>
+        <!-- 1_5_R1 was never released -->
+        <module>v1_5_R2</module>
+        <module>v1_5_R3</module>
+        <!-- 1_6_R1 also had no tagged releases, remove? -->
+        <module>v1_6_R1</module>
+        <module>v1_6_R2</module>
+        <module>v1_6_R3</module>
+        <!-- TODO: Recompile CB for 1_7_R1 through 1_7_R4, currently using whatever jars worked -->
+        <module>v1_7_R1</module>
+        <module>v1_7_R2</module>
+        <module>v1_7_R3</module>
+        <module>v1_7_R4</module>
+        <module>v1_8_R1</module>
+        <module>v1_8_R2</module>
+        <module>v1_8_R3</module>
+        <module>v1_9_R1</module>
+        <module>v1_9_R2</module>
+        <module>v1_10_R1</module>
+        <module>v1_11_R1</module>
+      </modules>
+    </profile>
+
+  </profiles>
+
+</project>

internal/v1_10_R1/pom.xml

@@ -0,0 +1,28 @@
+<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>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvadapter1_10_R1</artifactId>
+  <name>OpenInvAdapter1_10_R1</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.10-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -0,0 +1,209 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_10_R1;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_10_R1.AxisAlignedBB;
+import net.minecraft.server.v1_10_R1.Block;
+import net.minecraft.server.v1_10_R1.BlockChest;
+import net.minecraft.server.v1_10_R1.BlockChest.Type;
+import net.minecraft.server.v1_10_R1.BlockEnderChest;
+import net.minecraft.server.v1_10_R1.BlockPosition;
+import net.minecraft.server.v1_10_R1.Container;
+import net.minecraft.server.v1_10_R1.Entity;
+import net.minecraft.server.v1_10_R1.EntityOcelot;
+import net.minecraft.server.v1_10_R1.EntityPlayer;
+import net.minecraft.server.v1_10_R1.EnumDirection;
+import net.minecraft.server.v1_10_R1.IInventory;
+import net.minecraft.server.v1_10_R1.ITileInventory;
+import net.minecraft.server.v1_10_R1.InventoryEnderChest;
+import net.minecraft.server.v1_10_R1.InventoryLargeChest;
+import net.minecraft.server.v1_10_R1.PacketPlayOutOpenWindow;
+import net.minecraft.server.v1_10_R1.StatisticList;
+import net.minecraft.server.v1_10_R1.TileEntity;
+import net.minecraft.server.v1_10_R1.TileEntityChest;
+import net.minecraft.server.v1_10_R1.TileEntityEnderChest;
+import net.minecraft.server.v1_10_R1.World;
+
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
+
+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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block b) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
+        Block block = world.getType(blockPosition).getBlock();
+
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.getType(blockPosition.up()).m();
+        }
+
+        // Check if chest is blocked or has an ocelot on top
+        if (isBlockedChest(world, blockPosition)) {
+            return true;
+        }
+
+        // Check for matching adjacent chests that are blocked or have an ocelot on top
+        for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
+            BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
+            Block localBlock = world.getType(localBlockPosition).getBlock();
+
+            if (localBlock != block) {
+                continue;
+            }
+
+            TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
+            if (!(localTileEntity instanceof TileEntityChest)) {
+                continue;
+            }
+
+            if (isBlockedChest(world, localBlockPosition)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, BlockPosition blockPosition) {
+        // For reference, loot at net.minecraft.server.BlockChest
+        return world.getType(blockPosition.up()).l() || hasOcelotOnTop(world, blockPosition);
+    }
+
+    private boolean hasOcelotOnTop(World world, BlockPosition blockPosition) {
+        for (Entity localEntity : world.a(EntityOcelot.class,
+                new AxisAlignedBB(blockPosition.getX(), blockPosition.getY() + 1,
+                        blockPosition.getZ(), blockPosition.getX() + 1, blockPosition.getY() + 2,
+                        blockPosition.getZ() + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block b) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is pretty much API-only
+        if (silentchest && b.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            player.b(StatisticList.X);
+            return true;
+        }
+
+        World world = player.world;
+        BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
+        Object tile = world.getTileEntity(blockPosition);
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            player.b(StatisticList.X);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        Block block = world.getType(blockPosition).getBlock();
+        Container container = null;
+
+        if (block instanceof BlockChest) {
+            for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
+                BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
+                Block localBlock = world.getType(localBlockPosition).getBlock();
+
+                if (localBlock != block) {
+                    continue;
+                }
+
+                TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
+                if (!(localTileEntity instanceof TileEntityChest)) {
+                    continue;
+                }
+
+                if ((localEnumDirection == EnumDirection.WEST) || (localEnumDirection == EnumDirection.NORTH)) {
+                    tile = new InventoryLargeChest("container.chestDouble",
+                            (TileEntityChest) localTileEntity, (ITileInventory) tile);
+                } else {
+                    tile = new InventoryLargeChest("container.chestDouble",
+                            (ITileInventory) tile, (TileEntityChest) localTileEntity);
+                }
+                break;
+            }
+
+            if (silentchest) {
+                container = new SilentContainerChest(player.inventory, ((IInventory) tile), player);
+            }
+
+            if (((BlockChest) block).g == Type.BASIC) {
+                player.b(StatisticList.ac);
+            } else if (((BlockChest) block).g == Type.TRAP) {
+                player.b(StatisticList.W);
+            }
+        }
+
+        boolean returnValue = false;
+        final IInventory iInventory = (IInventory) tile;
+
+        if (!silentchest || container == null) {
+            player.openContainer(iInventory);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = player.nextContainerCounter();
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, iInventory.getName(), iInventory.getScoreboardDisplayName(), iInventory.getSize()));
+                player.activeContainer = container;
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+}

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

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

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_10_R1;
 
+import java.util.UUID;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import com.mojang.authlib.GameProfile;
@@ -35,23 +37,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure player has data
         if (offline == null || !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();
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
@@ -59,4 +63,20 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getUniqueId().toString();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        try {
+            UUID uuid = UUID.fromString(identifier);
+            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
+            // Ensure player is a real player, otherwise return null
+            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+                return null;
+            }
+            return player;
+        } catch (IllegalArgumentException e) {
+            // Not a UUID
+            return null;
+        }
+    }
+
 }

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

@@ -20,16 +20,15 @@ package com.lishid.openinv.internal.v1_10_R1;
 import net.minecraft.server.v1_10_R1.ContainerChest;
 import net.minecraft.server.v1_10_R1.EntityHuman;
 import net.minecraft.server.v1_10_R1.IInventory;
+import net.minecraft.server.v1_10_R1.ItemStack;
 import net.minecraft.server.v1_10_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2, EntityHuman e1) {
         super(i1, i2, e1);
-        inv = i2;
-        // close signal
-        inv.closeContainer(e1);
+        // Send close signal
+        i2.closeContainer(e1);
     }
 
     @Override
@@ -38,8 +37,10 @@ public class SilentContainerChest extends ContainerChest {
         PlayerInventory playerinventory = entityHuman.inventory;
 
         if (playerinventory.getCarried() != null) {
-            entityHuman.drop(playerinventory.getCarried(), false);
+            ItemStack carried = playerinventory.getCarried();
             playerinventory.setCarried(null);
+            entityHuman.drop(carried, false);
         }
     }
+
 }

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

@@ -37,10 +37,12 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public boolean playerOnline = false;
+    private boolean playerOnline = false;
 
     public SpecialEnderChest(Player player, Boolean online) {
-        super(((CraftPlayer) player).getHandle().getEnderChest().getName(), ((CraftPlayer) player).getHandle().getEnderChest().hasCustomName(), ((CraftPlayer) player).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) player).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) player).getHandle().getEnderChest().hasCustomName(),
+                ((CraftPlayer) player).getHandle().getEnderChest().getSize());
         CraftPlayer craftPlayer = (CraftPlayer) player;
         this.enderChest = craftPlayer.getHandle().getEnderChest();
         this.bukkitOwner = craftPlayer;
@@ -79,8 +81,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 this.bukkitOwner = player;
                 CraftPlayer craftPlayer = (CraftPlayer) player;
                 setItemArrays(craftPlayer.getHandle().getEnderChest(), this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -114,6 +114,11 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return contents;
     }
 
+    @Override
+    public int getSize() {
+        return super.getSize() + 4;
+    }
+
     @Override
     public ItemStack getItem(int i) {
         ItemStack[] is = this.items;
@@ -121,16 +126,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extraSlots;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -151,16 +154,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extraSlots;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -176,8 +177,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].cloneAndSubtract(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -186,9 +186,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -198,16 +197,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extraSlots;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -222,9 +219,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -234,16 +230,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extraSlots;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -264,23 +258,26 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override
@@ -295,4 +292,5 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     public boolean a(EntityHuman entityhuman) {
         return true;
     }
+
 }

internal/v1_11_R1/pom.xml

@@ -0,0 +1,28 @@
+<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>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvadapter1_11_R1</artifactId>
+  <name>OpenInvAdapter1_11_R1</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.11-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -0,0 +1,276 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_11_R1;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.block.BlockState;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitRunnable;
+
+// Volatile
+import net.minecraft.server.v1_11_R1.AxisAlignedBB;
+import net.minecraft.server.v1_11_R1.Block;
+import net.minecraft.server.v1_11_R1.BlockChest;
+import net.minecraft.server.v1_11_R1.BlockChest.Type;
+import net.minecraft.server.v1_11_R1.BlockEnderChest;
+import net.minecraft.server.v1_11_R1.BlockPosition;
+import net.minecraft.server.v1_11_R1.BlockShulkerBox;
+import net.minecraft.server.v1_11_R1.Container;
+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.IBlockData;
+import net.minecraft.server.v1_11_R1.IInventory;
+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.PacketPlayOutOpenWindow;
+import net.minecraft.server.v1_11_R1.StatisticList;
+import net.minecraft.server.v1_11_R1.TileEntity;
+import net.minecraft.server.v1_11_R1.TileEntityChest;
+import net.minecraft.server.v1_11_R1.TileEntityEnderChest;
+import net.minecraft.server.v1_11_R1.TileEntityShulkerBox;
+import net.minecraft.server.v1_11_R1.World;
+
+import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
+
+public class AnySilentContainer implements IAnySilentContainer {
+
+    @Override
+    public boolean isAnySilentContainer(org.bukkit.block.Block block) {
+        if (block.getType() == Material.ENDER_CHEST) {
+            return true;
+        }
+        BlockState state = block.getState();
+        return state instanceof org.bukkit.block.Chest || state instanceof org.bukkit.block.ShulkerBox;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block b) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
+        Block block = world.getType(blockPosition).getBlock();
+
+        if (block instanceof BlockShulkerBox) {
+            return isBlockedShulkerBox(world, blockPosition, block);
+        }
+
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.getType(blockPosition.up()).m();
+        }
+
+        // Check if chest is blocked or has an ocelot on top
+        if (isBlockedChest(world, blockPosition)) {
+            return true;
+        }
+
+        // Check for matching adjacent chests that are blocked or have an ocelot on top
+        for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
+            BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
+            Block localBlock = world.getType(localBlockPosition).getBlock();
+
+            if (localBlock != block) {
+                continue;
+            }
+
+            TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
+            if (!(localTileEntity instanceof TileEntityChest)) {
+                continue;
+            }
+
+            if (isBlockedChest(world, localBlockPosition)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedShulkerBox(World world, BlockPosition blockPosition, Block block) {
+        // For reference, look at net.minecraft.server.BlockShulkerBox
+        TileEntity tile = world.getTileEntity(blockPosition);
+
+        if (!(tile instanceof TileEntityShulkerBox)) {
+            return false;
+        }
+
+        IBlockData iBlockData = block.getBlockData();
+
+        EnumDirection enumDirection = iBlockData.get(BlockShulkerBox.a);
+        if (((TileEntityShulkerBox) tile).p() == TileEntityShulkerBox.AnimationPhase.CLOSED) {
+            AxisAlignedBB axisAlignedBB = BlockShulkerBox.j.b(0.5F * enumDirection.getAdjacentX(),
+                    0.5F * enumDirection.getAdjacentY(), 0.5F * enumDirection.getAdjacentZ())
+                    .a(enumDirection.getAdjacentX(), enumDirection.getAdjacentY(),
+                            enumDirection.getAdjacentZ());
+
+            return world.b(axisAlignedBB.a(blockPosition.shift(enumDirection)));
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, BlockPosition blockPosition) {
+        // For reference, loot at net.minecraft.server.BlockChest
+        return world.getType(blockPosition.up()).m() || hasOcelotOnTop(world, blockPosition);
+    }
+
+    private boolean hasOcelotOnTop(World world, BlockPosition blockPosition) {
+        for (Entity localEntity : world.a(EntityOcelot.class,
+                new AxisAlignedBB(blockPosition.getX(), blockPosition.getY() + 1,
+                        blockPosition.getZ(), blockPosition.getX() + 1, blockPosition.getY() + 2,
+                        blockPosition.getZ() + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block b) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is pretty much API-only
+        if (silentchest && b.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            player.b(StatisticList.X);
+            return true;
+        }
+
+        final World world = player.world;
+        final BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
+        Object tile = world.getTileEntity(blockPosition);
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest.  See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            player.b(StatisticList.X);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        Block block = world.getType(blockPosition).getBlock();
+        Container container = null;
+
+        if (block instanceof BlockChest) {
+            BlockChest blockChest = (BlockChest) block;
+
+            for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
+                BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
+                Block localBlock = world.getType(localBlockPosition).getBlock();
+
+                if (localBlock != block) {
+                    continue;
+                }
+
+                TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
+                if (!(localTileEntity instanceof TileEntityChest)) {
+                    continue;
+                }
+
+                if ((localEnumDirection == EnumDirection.WEST) || (localEnumDirection == EnumDirection.NORTH)) {
+                    tile = new InventoryLargeChest("container.chestDouble",
+                            (TileEntityChest) localTileEntity, (ITileInventory) tile);
+                } else {
+                    tile = new InventoryLargeChest("container.chestDouble",
+                            (ITileInventory) tile, (TileEntityChest) localTileEntity);
+                }
+                break;
+            }
+
+            if (blockChest.g == Type.BASIC) {
+                player.b(StatisticList.ac);
+            } else if (blockChest.g == Type.TRAP) {
+                player.b(StatisticList.W);
+            }
+
+            if (silentchest) {
+                container = new SilentContainerChest(player.inventory, ((IInventory) tile), player);
+            }
+        }
+
+        if (block instanceof BlockShulkerBox) {
+            player.b(StatisticList.ae);
+
+            if (silentchest && tile instanceof TileEntityShulkerBox) {
+                // Set value to current + 1. Ensures consistency later when resetting.
+                SilentContainerShulkerBox.setOpenValue((TileEntityShulkerBox) tile,
+                        SilentContainerShulkerBox.getOpenValue((TileEntityShulkerBox) tile) + 1);
+
+                container = new SilentContainerShulkerBox(player.inventory, (IInventory) tile, player);
+            }
+        }
+
+        boolean returnValue = false;
+        final IInventory iInventory = (IInventory) tile;
+
+        if (!silentchest || container == null) {
+            player.openContainer(iInventory);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = player.nextContainerCounter();
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, iInventory.getName(), iInventory.getScoreboardDisplayName(), iInventory.getSize()));
+                player.activeContainer = container;
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+                if (tile instanceof TileEntityShulkerBox) {
+                    new BukkitRunnable() {
+                        @Override
+                        public void run() {
+                            // TODO hacky
+                            Object tile = world.getTileEntity(blockPosition);
+                            if (!(tile instanceof TileEntityShulkerBox)) {
+                                return;
+                            }
+                            TileEntityShulkerBox box = (TileEntityShulkerBox) tile;
+                            // Reset back - we added 1, and calling TileEntityShulkerBox#startOpen adds 1 more.
+                            SilentContainerShulkerBox.setOpenValue(box,
+                                    SilentContainerShulkerBox.getOpenValue((TileEntityShulkerBox) tile) - 2);
+                        }
+                    }.runTaskLater(Bukkit.getPluginManager().getPlugin("OpenInv"), 2);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+}

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

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

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

@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_11_R1;
+
+import 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.entity.Player;
+
+// Volatile
+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.craftbukkit.v1_11_R1.CraftServer;
+
+public class PlayerDataManager implements IPlayerDataManager {
+
+    @Override
+    public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
+        // Create a profile and entity to load the player data
+        GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
+        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+                new PlayerInteractManager(server.getWorldServer(0)));
+
+        // Get the bukkit entity
+        Player target = (entity == null) ? null : entity.getBukkitEntity();
+        if (target != null) {
+            // Load data
+            target.loadData();
+        }
+        // Return the entity
+        return target;
+    }
+
+    @Override
+    public String getPlayerDataID(OfflinePlayer player) {
+        return player.getUniqueId().toString();
+    }
+
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        try {
+            UUID uuid = UUID.fromString(identifier);
+            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
+            // Ensure player is a real player, otherwise return null
+            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+                return null;
+            }
+            return player;
+        } catch (IllegalArgumentException e) {
+            // Not a UUID
+            return null;
+        }
+    }
+
+}

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_11_R1;
+
+// Volatile
+import net.minecraft.server.v1_11_R1.ContainerChest;
+import net.minecraft.server.v1_11_R1.EntityHuman;
+import net.minecraft.server.v1_11_R1.IInventory;
+import net.minecraft.server.v1_11_R1.ItemStack;
+import net.minecraft.server.v1_11_R1.PlayerInventory;
+
+public class SilentContainerChest extends ContainerChest {
+
+    public SilentContainerChest(PlayerInventory playerInventory, IInventory iInventory,
+            EntityHuman entityHuman) {
+        super(playerInventory, iInventory, entityHuman);
+        // Send close signal
+        iInventory.closeContainer(entityHuman);
+    }
+
+    @Override
+    public void b(EntityHuman entityHuman) {
+        // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != ItemStack.a) {
+            ItemStack carried = playerinventory.getCarried();
+            playerinventory.setCarried(ItemStack.a);
+            entityHuman.drop(carried, false);
+        }
+    }
+
+}

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

@@ -0,0 +1,56 @@
+package com.lishid.openinv.internal.v1_11_R1;
+
+import java.lang.reflect.Field;
+
+import net.minecraft.server.v1_11_R1.ContainerShulkerBox;
+import net.minecraft.server.v1_11_R1.EntityHuman;
+import net.minecraft.server.v1_11_R1.IInventory;
+import net.minecraft.server.v1_11_R1.ItemStack;
+import net.minecraft.server.v1_11_R1.PlayerInventory;
+import net.minecraft.server.v1_11_R1.TileEntityShulkerBox;
+
+public class SilentContainerShulkerBox extends ContainerShulkerBox {
+
+    private static Field fieldShulkerActionData;
+
+    public SilentContainerShulkerBox(PlayerInventory playerInventory, IInventory iInventory,
+            EntityHuman entityHuman) {
+        super(playerInventory, iInventory, entityHuman);
+    }
+
+    @Override
+    public void b(EntityHuman entityHuman) {
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (!playerinventory.getCarried().isEmpty()) {
+            entityHuman.drop(playerinventory.getCarried(), false);
+            playerinventory.setCarried(ItemStack.a);
+        }
+    }
+
+    private static Field exposeOpenStatus() throws NoSuchFieldException, SecurityException {
+        if (fieldShulkerActionData == null) {
+            fieldShulkerActionData = TileEntityShulkerBox.class.getDeclaredField("h");
+            fieldShulkerActionData.setAccessible(true);
+        }
+        return fieldShulkerActionData;
+    }
+
+    public static void setOpenValue(TileEntityShulkerBox tileShulkerBox, Object value) {
+        try {
+            exposeOpenStatus().set(tileShulkerBox, value);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static Integer getOpenValue(TileEntityShulkerBox tileShulkerBox) {
+        try {
+            return (Integer) exposeOpenStatus().get(tileShulkerBox);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+}

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

@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_11_R1;
+
+import 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;
+
+// Volatile
+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.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory;
+
+public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
+
+    public SpecialEnderChest(Player player, Boolean online) {
+        super(((CraftPlayer) player).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) player).getHandle().getEnderChest().hasCustomName(),
+                ((CraftPlayer) player).getHandle().getEnderChest().getSize());
+        CraftPlayer craftPlayer = (CraftPlayer) player;
+        this.enderChest = craftPlayer.getHandle().getEnderChest();
+        this.bukkitOwner = craftPlayer;
+        setItemLists(this, enderChest.getContents());
+    }
+
+    private void setItemLists(InventorySubcontainer subcontainer, List<ItemStack> list) {
+        try {
+            // Prepare to remove final modifier
+            Field modifiers = Field.class.getDeclaredField("modifiers");
+            modifiers.setAccessible(true);
+            // Access and replace main inventory array
+            Field field = InventorySubcontainer.class.getField("items");
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(subcontainer, list);
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        } catch (SecurityException e) {
+            e.printStackTrace();
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public Inventory getBukkitInventory() {
+        return inventory;
+    }
+
+    @Override
+    public void setPlayerOnline(Player player) {
+        if (!playerOnline) {
+            try {
+                this.bukkitOwner = player;
+                CraftPlayer craftPlayer = (CraftPlayer) player;
+                setItemLists(craftPlayer.getHandle().getEnderChest(), this.items);
+            } catch (Exception e) {}
+            playerOnline = true;
+        }
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        playerOnline = false;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public void update() {
+        super.update();
+        enderChest.update();
+    }
+
+}

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

@@ -0,0 +1,261 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_11_R1;
+
+import 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;
+// Volatile
+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.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory;
+
+public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
+
+    private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
+
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
+        this.playerOnline = online;
+        setItemArrays(this, player.inventory.items, player.inventory.armor, player.inventory.extraSlots);
+    }
+
+    private void setItemArrays(PlayerInventory inventory, NonNullList<ItemStack> items,
+            NonNullList<ItemStack> armor, NonNullList<ItemStack> extraSlots) {
+        try {
+            // Prepare to remove final modifier
+            Field modifiers = Field.class.getDeclaredField("modifiers");
+            modifiers.setAccessible(true);
+
+            // Access and replace main inventory array
+            Field field = PlayerInventory.class.getField("items");
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(inventory, items);
+
+            // Access and replace armor inventory array
+            field = PlayerInventory.class.getField("armor");
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(inventory, armor);
+
+            // Access and replace offhand inventory array
+            field = PlayerInventory.class.getField("extraSlots");
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(inventory, extraSlots);
+
+            // Access and replace array containing all inventory arrays
+            field = PlayerInventory.class.getDeclaredField("g");
+            field.setAccessible(true);
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(inventory, Arrays.asList(new NonNullList[] { items, armor, extraSlots }));
+        } catch (NoSuchFieldException e) {
+            // Unable to set final fields to item arrays, we're screwed. Noisily fail.
+            e.printStackTrace();
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public Inventory getBukkitInventory() {
+        return inventory;
+    }
+
+    @Override
+    public void setPlayerOnline(Player player) {
+        if (!playerOnline) {
+            this.player = ((CraftPlayer) player).getHandle();
+            setItemArrays(this.player.inventory, items, armor, extraSlots);
+            playerOnline = true;
+        }
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        playerOnline = false;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public int getSize() {
+        return super.getSize() + 4;
+    }
+
+    @Override
+    public ItemStack getItem(int i) {
+        NonNullList<ItemStack> list = this.items;
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.armor;
+        } else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.extraSlots;
+        } else if (list == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            return ItemStack.a;
+        }
+
+        return list.get(i);
+    }
+
+    @Override
+    public ItemStack splitStack(int i, int j) {
+        NonNullList<ItemStack> list = this.items;
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.armor;
+        } else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.extraSlots;
+        } else if (list == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            return ItemStack.a;
+        }
+
+        return list == null || list.get(i).isEmpty() ? ItemStack.a : ContainerUtil.a(list, i, j);
+    }
+
+    @Override
+    public ItemStack splitWithoutUpdate(int i) {
+        NonNullList<ItemStack> list = this.items;
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.armor;
+        } else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.extraSlots;
+        } else if (list == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            return ItemStack.a;
+        }
+
+        if (list != null && !list.get(i).isEmpty()) {
+            ItemStack itemstack = list.get(i);
+
+            list.set(i, ItemStack.a);
+            return itemstack;
+        }
+
+        return ItemStack.a;
+    }
+
+    @Override
+    public void setItem(int i, ItemStack itemstack) {
+        NonNullList<ItemStack> list = this.items;
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.armor;
+        } else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.extraSlots;
+        } else if (list == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            player.drop(itemstack, true);
+            return;
+        }
+
+        if (list != null) {
+            list.set(i, itemstack);
+        }
+    }
+
+    private int getReversedItemSlotNum(int i) {
+        if (i >= 27) {
+            return i - 27;
+        }
+        return i + 9;
+    }
+
+    private int getReversedArmorSlotNum(int i) {
+        if (i == 0) {
+            return 3;
+        }
+        if (i == 1) {
+            return 2;
+        }
+        if (i == 2) {
+            return 1;
+        }
+        if (i == 3) {
+            return 0;
+        }
+        return i;
+    }
+
+    @Override
+    public String getName() {
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
+        }
+        return player.getName();
+    }
+
+    @Override
+    public boolean a(EntityHuman entityhuman) {
+        return true;
+    }
+
+}

internal/v1_4_R1/pom.xml

@@ -0,0 +1,28 @@
+<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>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvadapter1_4_R1</artifactId>
+  <name>OpenInvAdapter1_4_R1</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.4.7-R1.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_4_R1;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_4_R1.AxisAlignedBB;
+import net.minecraft.server.v1_4_R1.BlockEnderChest;
+import net.minecraft.server.v1_4_R1.EntityOcelot;
+import net.minecraft.server.v1_4_R1.EntityPlayer;
+import net.minecraft.server.v1_4_R1.IInventory;
+import net.minecraft.server.v1_4_R1.InventoryEnderChest;
+import net.minecraft.server.v1_4_R1.InventoryLargeChest;
+import net.minecraft.server.v1_4_R1.Packet100OpenWindow;
+import net.minecraft.server.v1_4_R1.TileEntityChest;
+import net.minecraft.server.v1_4_R1.TileEntityEnderChest;
+import net.minecraft.server.v1_4_R1.World;
+
+import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
+
+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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.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());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) tile);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = player.nextContainerCounter();
+                player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize()));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+}

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

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

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

@@ -34,20 +34,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
@@ -55,4 +60,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -20,16 +20,15 @@ package com.lishid.openinv.internal.v1_4_R1;
 import net.minecraft.server.v1_4_R1.ContainerChest;
 import net.minecraft.server.v1_4_R1.EntityHuman;
 import net.minecraft.server.v1_4_R1.IInventory;
+import net.minecraft.server.v1_4_R1.ItemStack;
 import net.minecraft.server.v1_4_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.f();
+        // Send close signal
+        i2.f();
     }
 
     @Override
@@ -38,8 +37,10 @@ public class SilentContainerChest extends ContainerChest {
         PlayerInventory playerinventory = entityHuman.inventory;
 
         if (playerinventory.getCarried() != null) {
-            entityHuman.drop(playerinventory.getCarried());
+            ItemStack carried = playerinventory.getCarried();
             playerinventory.setCarried(null);
+            entityHuman.drop(carried);
         }
     }
+
 }

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

@@ -41,13 +41,14 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +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 e) {}
             playerOnline = true;
         }
     }

internal/v1_5_R2/pom.xml

@@ -0,0 +1,28 @@
+<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>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvadapter1_5_R2</artifactId>
+  <name>OpenInvAdapter1_5_R2</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.5.1-R0.2</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_5_R2;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_5_R2.AxisAlignedBB;
+import net.minecraft.server.v1_5_R2.BlockEnderChest;
+import net.minecraft.server.v1_5_R2.EntityOcelot;
+import net.minecraft.server.v1_5_R2.EntityPlayer;
+import net.minecraft.server.v1_5_R2.IInventory;
+import net.minecraft.server.v1_5_R2.InventoryEnderChest;
+import net.minecraft.server.v1_5_R2.InventoryLargeChest;
+import net.minecraft.server.v1_5_R2.Packet100OpenWindow;
+import net.minecraft.server.v1_5_R2.TileEntityChest;
+import net.minecraft.server.v1_5_R2.TileEntityEnderChest;
+import net.minecraft.server.v1_5_R2.World;
+
+import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
+
+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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.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());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) tile);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = player.nextContainerCounter();
+                player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+}

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

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

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

@@ -33,20 +33,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
@@ -54,4 +59,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -20,16 +20,15 @@ package com.lishid.openinv.internal.v1_5_R2;
 import net.minecraft.server.v1_5_R2.ContainerChest;
 import net.minecraft.server.v1_5_R2.EntityHuman;
 import net.minecraft.server.v1_5_R2.IInventory;
+import net.minecraft.server.v1_5_R2.ItemStack;
 import net.minecraft.server.v1_5_R2.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.g();
+        // Send close signal
+        i2.g();
     }
 
     @Override
@@ -38,8 +37,10 @@ public class SilentContainerChest extends ContainerChest {
         PlayerInventory playerinventory = entityHuman.inventory;
 
         if (playerinventory.getCarried() != null) {
-            entityHuman.drop(playerinventory.getCarried());
+            ItemStack carried = playerinventory.getCarried();
             playerinventory.setCarried(null);
+            entityHuman.drop(carried);
         }
     }
+
 }

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

@@ -41,13 +41,15 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().c(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +70,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 e) {}
             playerOnline = true;
         }
     }

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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -207,23 +196,26 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override

internal/v1_5_R3/pom.xml

@@ -0,0 +1,28 @@
+<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>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvadapter1_5_R3</artifactId>
+  <name>OpenInvAdapter1_5_R3</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.5.2-R1.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_5_R3;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+//Volatile
+import net.minecraft.server.v1_5_R3.AxisAlignedBB;
+import net.minecraft.server.v1_5_R3.BlockEnderChest;
+import net.minecraft.server.v1_5_R3.EntityOcelot;
+import net.minecraft.server.v1_5_R3.EntityPlayer;
+import net.minecraft.server.v1_5_R3.IInventory;
+import net.minecraft.server.v1_5_R3.InventoryEnderChest;
+import net.minecraft.server.v1_5_R3.InventoryLargeChest;
+import net.minecraft.server.v1_5_R3.Packet100OpenWindow;
+import net.minecraft.server.v1_5_R3.TileEntityChest;
+import net.minecraft.server.v1_5_R3.TileEntityEnderChest;
+import net.minecraft.server.v1_5_R3.World;
+
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
+
+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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.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());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) tile);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = player.nextContainerCounter();
+                player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+}

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

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

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

@@ -33,20 +33,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
@@ -54,4 +59,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -20,16 +20,15 @@ package com.lishid.openinv.internal.v1_5_R3;
 import net.minecraft.server.v1_5_R3.ContainerChest;
 import net.minecraft.server.v1_5_R3.EntityHuman;
 import net.minecraft.server.v1_5_R3.IInventory;
+import net.minecraft.server.v1_5_R3.ItemStack;
 import net.minecraft.server.v1_5_R3.PlayerInventory;
 
-public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
+public class SilentContainerChest extends ContainerChest {    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.g();
+        // Send close signal
+        i2.g();
     }
 
     @Override
@@ -38,8 +37,10 @@ public class SilentContainerChest extends ContainerChest {
         PlayerInventory playerinventory = entityHuman.inventory;
 
         if (playerinventory.getCarried() != null) {
-            entityHuman.drop(playerinventory.getCarried());
+            ItemStack carried = playerinventory.getCarried();
             playerinventory.setCarried(null);
+            entityHuman.drop(carried);
         }
     }
+
 }

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

@@ -41,13 +41,15 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().c(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +70,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 e) {}
             playerOnline = true;
         }
     }

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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -207,23 +196,26 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override

internal/v1_6_R1/pom.xml

@@ -0,0 +1,28 @@
+<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>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvadapter1_6_R1</artifactId>
+  <name>OpenInvAdapter1_6_R1</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.6.1-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_6_R1;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_6_R1.AxisAlignedBB;
+import net.minecraft.server.v1_6_R1.BlockEnderChest;
+import net.minecraft.server.v1_6_R1.EntityOcelot;
+import net.minecraft.server.v1_6_R1.EntityPlayer;
+import net.minecraft.server.v1_6_R1.IInventory;
+import net.minecraft.server.v1_6_R1.InventoryEnderChest;
+import net.minecraft.server.v1_6_R1.InventoryLargeChest;
+import net.minecraft.server.v1_6_R1.Packet100OpenWindow;
+import net.minecraft.server.v1_6_R1.TileEntityChest;
+import net.minecraft.server.v1_6_R1.TileEntityEnderChest;
+import net.minecraft.server.v1_6_R1.World;
+
+import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
+
+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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.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());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) tile);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = player.nextContainerCounter();
+                player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+}

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

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

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

@@ -33,20 +33,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
@@ -54,4 +59,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -20,16 +20,15 @@ package com.lishid.openinv.internal.v1_6_R1;
 import net.minecraft.server.v1_6_R1.ContainerChest;
 import net.minecraft.server.v1_6_R1.EntityHuman;
 import net.minecraft.server.v1_6_R1.IInventory;
+import net.minecraft.server.v1_6_R1.ItemStack;
 import net.minecraft.server.v1_6_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.g();
+        // Send close signal
+        i2.g();
     }
 
     @Override
@@ -38,8 +37,10 @@ public class SilentContainerChest extends ContainerChest {
         PlayerInventory playerinventory = entityHuman.inventory;
 
         if (playerinventory.getCarried() != null) {
-            entityHuman.drop(playerinventory.getCarried());
+            ItemStack carried = playerinventory.getCarried();
             playerinventory.setCarried(null);
+            entityHuman.drop(carried);
         }
     }
+
 }

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

@@ -41,13 +41,15 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().c(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +70,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 e) {}
             playerOnline = true;
         }
     }

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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -207,23 +196,26 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override

internal/v1_6_R2/pom.xml

@@ -0,0 +1,28 @@
+<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>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvadapter1_6_R2</artifactId>
+  <name>OpenInvAdapter1_6_R2</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.6.2-R1.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_6_R2;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_6_R2.AxisAlignedBB;
+import net.minecraft.server.v1_6_R2.BlockEnderChest;
+import net.minecraft.server.v1_6_R2.EntityOcelot;
+import net.minecraft.server.v1_6_R2.EntityPlayer;
+import net.minecraft.server.v1_6_R2.IInventory;
+import net.minecraft.server.v1_6_R2.InventoryEnderChest;
+import net.minecraft.server.v1_6_R2.InventoryLargeChest;
+import net.minecraft.server.v1_6_R2.Packet100OpenWindow;
+import net.minecraft.server.v1_6_R2.TileEntityChest;
+import net.minecraft.server.v1_6_R2.TileEntityEnderChest;
+import net.minecraft.server.v1_6_R2.World;
+
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
+
+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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.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());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) tile);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = player.nextContainerCounter();
+                player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+}

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

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

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

@@ -33,20 +33,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
@@ -54,4 +59,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -20,16 +20,15 @@ package com.lishid.openinv.internal.v1_6_R2;
 import net.minecraft.server.v1_6_R2.ContainerChest;
 import net.minecraft.server.v1_6_R2.EntityHuman;
 import net.minecraft.server.v1_6_R2.IInventory;
+import net.minecraft.server.v1_6_R2.ItemStack;
 import net.minecraft.server.v1_6_R2.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.g();
+        // Send close signal
+        i2.g();
     }
 
     @Override
@@ -38,8 +37,10 @@ public class SilentContainerChest extends ContainerChest {
         PlayerInventory playerinventory = entityHuman.inventory;
 
         if (playerinventory.getCarried() != null) {
-            entityHuman.drop(playerinventory.getCarried());
+            ItemStack carried = playerinventory.getCarried();
             playerinventory.setCarried(null);
+            entityHuman.drop(carried);
         }
     }
+
 }

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

@@ -41,13 +41,15 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().c(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +70,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 e) {}
             playerOnline = true;
         }
     }

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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -207,23 +196,26 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override

internal/v1_6_R3/pom.xml

@@ -0,0 +1,28 @@
+<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>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvadapter1_6_R3</artifactId>
+  <name>OpenInvAdapter1_6_R3</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.6.4-R2.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_6_R3;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_6_R3.AxisAlignedBB;
+import net.minecraft.server.v1_6_R3.BlockEnderChest;
+import net.minecraft.server.v1_6_R3.EntityOcelot;
+import net.minecraft.server.v1_6_R3.EntityPlayer;
+import net.minecraft.server.v1_6_R3.IInventory;
+import net.minecraft.server.v1_6_R3.InventoryEnderChest;
+import net.minecraft.server.v1_6_R3.InventoryLargeChest;
+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.craftbukkit.v1_6_R3.entity.CraftPlayer;
+
+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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.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());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) tile);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = player.nextContainerCounter();
+                player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+}

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

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

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

@@ -33,20 +33,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
@@ -54,4 +59,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -20,16 +20,15 @@ package com.lishid.openinv.internal.v1_6_R3;
 import net.minecraft.server.v1_6_R3.ContainerChest;
 import net.minecraft.server.v1_6_R3.EntityHuman;
 import net.minecraft.server.v1_6_R3.IInventory;
+import net.minecraft.server.v1_6_R3.ItemStack;
 import net.minecraft.server.v1_6_R3.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.g();
+        // Send close signal
+        i2.g();
     }
 
     @Override
@@ -38,8 +37,10 @@ public class SilentContainerChest extends ContainerChest {
         PlayerInventory playerinventory = entityHuman.inventory;
 
         if (playerinventory.getCarried() != null) {
-            entityHuman.drop(playerinventory.getCarried());
+            ItemStack carried = playerinventory.getCarried();
             playerinventory.setCarried(null);
+            entityHuman.drop(carried);
         }
     }
+
 }

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

@@ -41,13 +41,15 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().c(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +70,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 e) {}
             playerOnline = true;
         }
     }

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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 

internal/v1_7_R1/pom.xml

@@ -0,0 +1,28 @@
+<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>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvadapter1_7_R1</artifactId>
+  <name>OpenInvAdapter1_7_R1</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.7.2-R0.4</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This 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_7_R1;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+//Volatile
+import net.minecraft.server.v1_7_R1.AxisAlignedBB;
+import net.minecraft.server.v1_7_R1.Block;
+import net.minecraft.server.v1_7_R1.BlockEnderChest;
+import net.minecraft.server.v1_7_R1.EntityOcelot;
+import net.minecraft.server.v1_7_R1.EntityPlayer;
+import net.minecraft.server.v1_7_R1.IInventory;
+import net.minecraft.server.v1_7_R1.InventoryEnderChest;
+import net.minecraft.server.v1_7_R1.InventoryLargeChest;
+import net.minecraft.server.v1_7_R1.PacketPlayOutOpenWindow;
+import net.minecraft.server.v1_7_R1.TileEntityChest;
+import net.minecraft.server.v1_7_R1.TileEntityEnderChest;
+import net.minecraft.server.v1_7_R1.World;
+
+import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
+
+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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = Block.b(world.getType(block.getX(), block.getY(), block.getZ()));
+
+        // If block next to chest is chest and has a block or ocelot on top
+        if (Block.b(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
+        } else if(Block.b(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
+        } else if (Block.b(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) {
+            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
+        } else if (Block.b(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) {
+            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = Block.b(world.getType(block.getX(), block.getY(), block.getZ()));
+
+        if (Block.b(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if(Block.b(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (Block.b(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (Block.b(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) tile);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = player.nextContainerCounter();
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, ((IInventory) tile).getInventoryName(), ((IInventory) tile).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+}

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

@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This 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_7_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 org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_7_R1.IInventory;
+
+import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+
+    @Override
+    public boolean isSpecialPlayerInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
+    }
+
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(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(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
+
+        if (inv instanceof SpecialEnderChest) {
+            return (SpecialEnderChest) inv;
+        }
+        return null;
+    }
+
+}

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

@@ -34,21 +34,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
 
+        // Create a profile and entity to load the player data
         GameProfile profile = new GameProfile(null, offline.getName());
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
@@ -56,4 +60,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -20,16 +20,15 @@ package com.lishid.openinv.internal.v1_7_R1;
 import net.minecraft.server.v1_7_R1.ContainerChest;
 import net.minecraft.server.v1_7_R1.EntityHuman;
 import net.minecraft.server.v1_7_R1.IInventory;
+import net.minecraft.server.v1_7_R1.ItemStack;
 import net.minecraft.server.v1_7_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.l_();
+        // Send close signal
+        i2.l_();
     }
 
     @Override
@@ -38,8 +37,10 @@ public class SilentContainerChest extends ContainerChest {
         PlayerInventory playerinventory = entityHuman.inventory;
 
         if (playerinventory.getCarried() != null) {
-            entityHuman.drop(playerinventory.getCarried(), false);
+            ItemStack carried = playerinventory.getCarried();
             playerinventory.setCarried(null);
+            entityHuman.drop(carried, false);
         }
     }
+
 }

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

@@ -41,13 +41,15 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().k_(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +70,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 e) {}
             playerOnline = true;
         }
     }
@@ -124,4 +125,5 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         super.update();
         enderChest.update();
     }
+
 }

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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -207,23 +196,26 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override

internal/v1_7_R2/pom.xml

@@ -0,0 +1,28 @@
+<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>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvadapter1_7_R2</artifactId>
+  <name>OpenInvAdapter1_7_R2</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.7.5-R0.1</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This 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_7_R2;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+//Volatile
+import net.minecraft.server.v1_7_R2.AxisAlignedBB;
+import net.minecraft.server.v1_7_R2.Block;
+import net.minecraft.server.v1_7_R2.BlockEnderChest;
+import net.minecraft.server.v1_7_R2.EntityOcelot;
+import net.minecraft.server.v1_7_R2.EntityPlayer;
+import net.minecraft.server.v1_7_R2.IInventory;
+import net.minecraft.server.v1_7_R2.InventoryEnderChest;
+import net.minecraft.server.v1_7_R2.InventoryLargeChest;
+import net.minecraft.server.v1_7_R2.PacketPlayOutOpenWindow;
+import net.minecraft.server.v1_7_R2.TileEntityChest;
+import net.minecraft.server.v1_7_R2.TileEntityEnderChest;
+import net.minecraft.server.v1_7_R2.World;
+
+import org.bukkit.craftbukkit.v1_7_R2.entity.CraftPlayer;
+
+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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = Block.b(world.getType(block.getX(), block.getY(), block.getZ()));
+
+        // If block next to chest is chest and has a block or ocelot on top
+        if (Block.b(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
+        } else if(Block.b(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
+        } else if (Block.b(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) {
+            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
+        } else if (Block.b(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) {
+            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = Block.b(world.getType(block.getX(), block.getY(), block.getZ()));
+
+        if (Block.b(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if(Block.b(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (Block.b(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (Block.b(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) tile);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = player.nextContainerCounter();
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, ((IInventory) tile).getInventoryName(), ((IInventory) tile).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+}

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

@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This 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_7_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 org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_7_R2.IInventory;
+
+import org.bukkit.craftbukkit.v1_7_R2.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+
+    @Override
+    public boolean isSpecialPlayerInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
+    }
+
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(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(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
+
+        if (inv instanceof SpecialEnderChest) {
+            return (SpecialEnderChest) inv;
+        }
+        return null;
+    }
+
+}

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

@@ -30,25 +30,30 @@ import net.minecraft.util.com.mojang.authlib.GameProfile;
 
 import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
 
+@SuppressWarnings("deprecation") // Deprecated methods are used properly and will not change.
 public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
 
+        // Create a profile and entity to load the player data
         GameProfile profile = new GameProfile(null, offline.getName());
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
@@ -56,4 +61,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }