Bump version to 3.1.2 for release

Closes #62

.gitignore

@@ -5,6 +5,6 @@
 **/.idea
 **/target
 **/bin
-**/lib
 **/out
 **dependency-reduced-pom.xml
+**pom.xml.versionsBackup

README.MD

@@ -10,7 +10,7 @@ OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) whi
 - **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 self-opening! Don't grant `OpenInv.openself`
+  - 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.
 
@@ -80,7 +80,7 @@ OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) whi
     <td>Required to use /openender.</td>
   </tr>
   <tr>
-    <td>OpenInv.editinv</td>
+    <td>OpenInv.editender</td>
     <td>Required to make changes to open ender chests.</td>
   </tr>
   <tr>
@@ -117,9 +117,9 @@ OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) whi
 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`
 
-Compiling OpenInv for a specific version is very easy - just compile the correct module.
+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).
 
-Compiling for a set of versions is slightly more complex. You'll need to use a profile for the versions you want to compile. Provided profiles are latest, modern (versions 1.8+), and all. 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,24 @@
+<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>3.1.2</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>system</scope>
+      <systemPath>${project.basedir}/../lib/bukkit-1.4.5-R1.0.jar</systemPath>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -0,0 +1,187 @@
+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;
+import org.bukkit.plugin.Plugin;
+
+/**
+ * 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);
+
+    /**
+     * Mark a Player as in use by a Plugin to prevent it from being removed from the cache. Used to
+     * prevent issues with multiple copies of the same Player being loaded such as lishid#49.
+     * Changes made to loaded copies overwrite changes to the others when saved, leading to
+     * duplication bugs and more.
+     * <p>
+     * When finished with the Player object, be sure to call {@link #releasePlayer(Player, Plugin)}
+     * to prevent the cache from keeping it stored until the plugin is disabled.
+     * <p>
+     * When using a Player object from OpenInv, you must handle the Player coming online, replacing
+     * your Player reference with the Player from the PlayerJoinEvent. In addition, you must change
+     * any values in the Player to reflect any unsaved alterations to the existing Player which do
+     * not affect the inventory or ender chest contents.
+     * <p>
+     * OpenInv only saves player data when unloading a Player from the cache, and then only if
+     * {@link #disableSaving()} returns false. If you are making changes that OpenInv does not cause
+     * to persist when a Player logs in as noted above, it is suggested that you manually call
+     * {@link Player#saveData()} when releasing your reference to ensure your changes persist.
+     * 
+     * @param player the Player
+     * @param plugin the Plugin holding the reference to the Player
+     */
+    public void retainPlayer(Player player, Plugin plugin);
+
+    /**
+     * Mark a Player as no longer in use by a Plugin to allow OpenInv to remove it from the cache
+     * when eligible.
+     * 
+     * @param player the Player
+     * @param plugin the Plugin no longer holding a reference to the Player
+     */
+    public void releasePlayer(Player player, Plugin plugin);
+
+}

assembly/pom.xml

@@ -4,205 +4,39 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>openinvparent</artifactId>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvassembly</artifactId>
   <name>OpenInvAssembly</name>
 
-  <profiles>
-
-    <profile>
-      <id>latest</id>
-      <dependencies>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_11_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-      </dependencies>
-    </profile>
-
-    <profile>
-      <id>modern</id>
-      <dependencies>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_8_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_8_R2</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_8_R3</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_9_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_9_R2</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_10_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_11_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-      </dependencies>
-    </profile>
-
-    <profile>
-      <id>all</id>
-      <dependencies>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_4_5</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_4_6</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_4_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_5_R2</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_5_R3</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_6_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_6_R2</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_6_R3</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_7_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_7_R2</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_7_R3</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_7_R4</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_8_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_8_R2</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_8_R3</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_9_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_9_R2</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_10_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_11_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-      </dependencies>
-    </profile>
-
-  </profiles>
-
   <build>
     <directory>../target</directory>
     <finalName>OpenInv</finalName>
 
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.4.3</version>
-        <configuration>
-          <!--
-            ~ This keeps the final file clean, but may cause issues for people not familiar with the setup.
-            ~ If you're having trouble with the final product missing files, remove or tweak this configuration.
-           -->
-          <minimizeJar>true</minimizeJar>
-          <filters>
-            <filter>
-              <artifact>com.lishid:*</artifact>
-              <includes>
-                <include>com/lishid/openinv/**/*</include>
-                <include>plugin.yml</include>
-              </includes>
-            </filter>
-          </filters>
-        </configuration>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.0.0</version>
         <executions>
           <execution>
+            <id>reactor-uberjar</id>
             <phase>package</phase>
             <goals>
-              <goal>shade</goal>
+              <goal>single</goal>
             </goals>
+            <configuration>
+              <appendAssemblyId>false</appendAssemblyId>
+              <descriptors>
+                <descriptor>src/assembly/reactor-uberjar.xml</descriptor>
+              </descriptors>
+            </configuration>
           </execution>
         </executions>
       </plugin>
     </plugins>
+
   </build>
 
-</project>
+</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>3.1.2</version>
+  </parent>
+
+  <artifactId>openinvcommon</artifactId>
+  <name>OpenInvCommon</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>bukkit</artifactId>
+      <version>1.4.5-R1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/../lib/bukkit-1.4.5-R1.0.jar</systemPath>
+    </dependency>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvapi</artifactId>
+      <version>3.1.2</version>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal;
 
+import java.util.Collection;
+
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
@@ -47,4 +49,11 @@ public interface IPlayerDataManager {
      */
     public OfflinePlayer getPlayerByID(String identifier);
 
+    /**
+     * Gets a Collection of all Players currently online.
+     * 
+     * @return the Collection of Players
+     */
+    public Collection<? extends Player> getOnlinePlayers();
+
 }

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

@@ -9,7 +9,7 @@ import com.google.common.collect.Multimap;
 import com.google.common.collect.TreeMultimap;
 
 /**
- * A minimal time-based cache implementation backed by a HashMap and TreeMultimap.
+ * A minimal thread-safe time-based cache implementation backed by a HashMap and TreeMultimap.
  * 
  * @author Jikoo
  */
@@ -59,8 +59,10 @@ public class Cache<K, V> {
         // Invalidate key - runs lazy check and ensures value won't be cleaned up early
         invalidate(key);
 
-        internal.put(key, value);
-        expiry.put(System.currentTimeMillis() + retention, key);
+        synchronized (internal) {
+            internal.put(key, value);
+            expiry.put(System.currentTimeMillis() + retention, key);
+        }
     }
 
     /**
@@ -70,10 +72,12 @@ public class Cache<K, V> {
      * @return the value to which the specified key is mapped, or null if no value is mapped for the key
      */
     public V get(K key) {
-        // Run lazy check to clean cache
-        lazyCheck();
+        synchronized (internal) {
+            // Run lazy check to clean cache
+            lazyCheck();
 
-        return internal.get(key);
+            return internal.get(key);
+        }
     }
 
     /**
@@ -83,10 +87,12 @@ public class Cache<K, V> {
      * @return true if a mapping exists for the specified key
      */
     public boolean containsKey(K key) {
-        // Run lazy check to clean cache
-        lazyCheck();
+        synchronized (internal) {
+            // Run lazy check to clean cache
+            lazyCheck();
 
-        return internal.containsKey(key);
+            return internal.containsKey(key);
+        }
     }
 
     /**
@@ -95,22 +101,24 @@ public class Cache<K, V> {
      * @param key key to invalidate
      */
     public void invalidate(K key) {
-        // Run lazy check to clean cache
-        lazyCheck();
+        synchronized (internal) {
+            // Run lazy check to clean cache
+            lazyCheck();
 
-        if (!internal.containsKey(key)) {
-            // Value either not present or cleaned by lazy check. Either way, we're good
-            return;
-        }
+            if (!internal.containsKey(key)) {
+                // Value either not present or cleaned by lazy check. Either way, we're good
+                return;
+            }
 
-        // Remove stored object
-        internal.remove(key);
+            // Remove stored object
+            internal.remove(key);
 
-        // Remove expiration entry - prevents more work later, plus prevents issues with values invalidating early
-        for (Iterator<Map.Entry<Long, K>> iterator = expiry.entries().iterator(); iterator.hasNext();) {
-            if (key.equals(iterator.next().getValue())) {
-                iterator.remove();
-                break;
+            // Remove expiration entry - prevents more work later, plus prevents issues with values invalidating early
+            for (Iterator<Map.Entry<Long, K>> iterator = expiry.entries().iterator(); iterator.hasNext();) {
+                if (key.equals(iterator.next().getValue())) {
+                    iterator.remove();
+                    break;
+                }
             }
         }
     }
@@ -119,11 +127,13 @@ public class Cache<K, V> {
      * Forcibly invalidates all keys, even if they are considered to be in use.
      */
     public void invalidateAll() {
-        for (V value : internal.values()) {
-            postRemoval.run(value);
+        synchronized (internal) {
+            for (V value : internal.values()) {
+                postRemoval.run(value);
+            }
+            expiry.clear();
+            internal.clear();
         }
-        expiry.clear();
-        internal.clear();
     }
 
     /**

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

@@ -14,11 +14,17 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal;
+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;
 

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

@@ -1,4 +1,4 @@
-package com.lishid.openinv;
+package com.lishid.openinv.util;
 
 import org.bukkit.permissions.Permissible;
 

internal/1_4_5/pom.xml

@@ -4,25 +4,25 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>openinvinternal</artifactId>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_4_5</artifactId>
   <name>OpenInvAdapter1_4_5</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugin</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>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>3.1.2</version>
+    </dependency>
   </dependencies>
 
 </project>

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

@@ -22,9 +22,9 @@ 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.Container;
 import net.minecraft.server.v1_4_5.EntityOcelot;
 import net.minecraft.server.v1_4_5.EntityPlayer;
 import net.minecraft.server.v1_4_5.IInventory;
@@ -35,7 +35,7 @@ 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;
+import org.bukkit.craftbukkit.v1_4_5.event.CraftEventFactory;
 
 public class AnySilentContainer implements IAnySilentContainer {
 
@@ -47,7 +47,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
         World world = player.world;
 
         if (block instanceof BlockEnderChest) {
@@ -95,7 +95,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
 
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
 
         // Silent ender chest is API-only
         if (silentchest && block.getType() == Material.ENDER_CHEST) {
@@ -122,37 +122,47 @@ public class AnySilentContainer implements IAnySilentContainer {
             return false;
         }
 
+        IInventory inventory = (IInventory) tile;
         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));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
         } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
         } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
         } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
         }
 
-        boolean returnValue = false;
+        // AnyChest only
         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.");
-            }
+            player.openContainer(inventory);
+            return true;
         }
 
-        return returnValue;
+        // SilentChest
+        try {
+            // Call InventoryOpenEvent
+            Container container = new SilentContainerChest(player.inventory, inventory);
+            container = CraftEventFactory.callInventoryOpenEvent(player, container);
+            if (container == null) {
+                return false;
+            }
+
+            // Open window
+            int windowId = player.nextContainerCounter();
+            player.netServerHandler.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize()));
+            player.activeContainer = container;
+            player.activeContainer.windowId = windowId;
+            player.activeContainer.addSlotListener(player);
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            return false;
+        }
     }
 
 }

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

@@ -19,11 +19,10 @@ 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.internal.InternalAccessor;
+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;

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

@@ -16,18 +16,22 @@
 
 package com.lishid.openinv.internal.v1_4_5;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
-// Volatile
 import net.minecraft.server.v1_4_5.EntityPlayer;
 import net.minecraft.server.v1_4_5.ItemInWorldManager;
 import net.minecraft.server.v1_4_5.MinecraftServer;
 
 import org.bukkit.craftbukkit.v1_4_5.CraftServer;
+import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
@@ -69,4 +73,29 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player;
     }
 
+    @Override
+    public Collection<? extends Player> getOnlinePlayers() {
+        return Arrays.asList(Bukkit.getOnlinePlayers());
+    }
+
+    public static EntityPlayer getHandle(Player player) {
+        if (player instanceof CraftPlayer) {
+            return ((CraftPlayer) player).getHandle();
+        }
+
+        Server server = player.getServer();
+        EntityPlayer nmsPlayer = null;
+
+        if (server instanceof CraftServer) {
+            nmsPlayer = ((CraftServer) server).getHandle().f(player.getName());
+        }
+
+        if (nmsPlayer == null) {
+            // Could use reflection to examine fields, but it's honestly not worth the bother.
+            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+        }
+
+        return nmsPlayer;
+    }
+
 }

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

@@ -16,7 +16,6 @@
 
 package com.lishid.openinv.internal.v1_4_5;
 
-// Volatile
 import net.minecraft.server.v1_4_5.ContainerChest;
 import net.minecraft.server.v1_4_5.EntityHuman;
 import net.minecraft.server.v1_4_5.IInventory;

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-// Volatile
+import net.minecraft.server.v1_4_5.EntityPlayer;
 import net.minecraft.server.v1_4_5.IInventory;
 import net.minecraft.server.v1_4_5.InventoryEnderChest;
 import net.minecraft.server.v1_4_5.InventorySubcontainer;
@@ -46,12 +46,12 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     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());
-        CraftPlayer player = (CraftPlayer) p;
-        this.enderChest = player.getHandle().getEnderChest();
-        this.owner = player;
+    public SpecialEnderChest(Player player, Boolean online) {
+        super(((CraftPlayer) player).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) player).getHandle().getEnderChest().getSize());
+        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.enderChest = nmsPlayer.getEnderChest();
+        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -64,8 +64,9 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);

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

@@ -21,11 +21,9 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-// Volatile
 import net.minecraft.server.v1_4_5.ItemStack;
 import net.minecraft.server.v1_4_5.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -35,7 +33,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+        super(PlayerDataManager.getHandle(bukkitPlayer));
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,7 +47,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
+            this.player = PlayerDataManager.getHandle(player);
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;

internal/1_4_6/pom.xml

@@ -4,25 +4,25 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>openinvinternal</artifactId>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_4_6</artifactId>
   <name>OpenInvAdapter1_4_6</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugin</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>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>3.1.2</version>
+    </dependency>
   </dependencies>
 
 </project>

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

@@ -22,9 +22,9 @@ 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.Container;
 import net.minecraft.server.v1_4_6.EntityOcelot;
 import net.minecraft.server.v1_4_6.EntityPlayer;
 import net.minecraft.server.v1_4_6.IInventory;
@@ -35,7 +35,7 @@ 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;
+import org.bukkit.craftbukkit.v1_4_6.event.CraftEventFactory;
 
 public class AnySilentContainer implements IAnySilentContainer {
 
@@ -47,7 +47,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
         World world = player.world;
 
         if (block instanceof BlockEnderChest) {
@@ -95,7 +95,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
 
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
 
         // Silent ender chest is API-only
         if (silentchest && block.getType() == Material.ENDER_CHEST) {
@@ -122,37 +122,47 @@ public class AnySilentContainer implements IAnySilentContainer {
             return false;
         }
 
+        IInventory inventory = (IInventory) tile;
         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));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
         } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
         } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
         } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
         }
 
-        boolean returnValue = false;
+        // AnyChest only
         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.");
-            }
+            player.openContainer(inventory);
+            return true;
         }
 
-        return returnValue;
+        // SilentChest
+        try {
+            // Call InventoryOpenEvent
+            Container container = new SilentContainerChest(player.inventory, inventory);
+            container = CraftEventFactory.callInventoryOpenEvent(player, container);
+            if (container == null) {
+                return false;
+            }
+
+            // Open window
+            int windowId = player.nextContainerCounter();
+            player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize()));
+            player.activeContainer = container;
+            player.activeContainer.windowId = windowId;
+            player.activeContainer.addSlotListener(player);
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            return false;
+        }
     }
 
 }

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

@@ -19,11 +19,10 @@ 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.internal.InternalAccessor;
+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;

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

@@ -16,18 +16,22 @@
 
 package com.lishid.openinv.internal.v1_4_6;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
-// Volatile
 import net.minecraft.server.v1_4_6.EntityPlayer;
 import net.minecraft.server.v1_4_6.MinecraftServer;
 import net.minecraft.server.v1_4_6.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_4_6.CraftServer;
+import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
@@ -69,4 +73,29 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player;
     }
 
+    @Override
+    public Collection<? extends Player> getOnlinePlayers() {
+        return Arrays.asList(Bukkit.getOnlinePlayers());
+    }
+
+    public static EntityPlayer getHandle(Player player) {
+        if (player instanceof CraftPlayer) {
+            return ((CraftPlayer) player).getHandle();
+        }
+
+        Server server = player.getServer();
+        EntityPlayer nmsPlayer = null;
+
+        if (server instanceof CraftServer) {
+            nmsPlayer = ((CraftServer) server).getHandle().f(player.getName());
+        }
+
+        if (nmsPlayer == null) {
+            // Could use reflection to examine fields, but it's honestly not worth the bother.
+            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+        }
+
+        return nmsPlayer;
+    }
+
 }

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

@@ -16,7 +16,6 @@
 
 package com.lishid.openinv.internal.v1_4_6;
 
-// Volatile
 import net.minecraft.server.v1_4_6.ContainerChest;
 import net.minecraft.server.v1_4_6.EntityHuman;
 import net.minecraft.server.v1_4_6.IInventory;

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-// Volatile
+import net.minecraft.server.v1_4_6.EntityPlayer;
 import net.minecraft.server.v1_4_6.IInventory;
 import net.minecraft.server.v1_4_6.InventoryEnderChest;
 import net.minecraft.server.v1_4_6.InventorySubcontainer;
@@ -46,12 +46,12 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     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());
-        CraftPlayer player = (CraftPlayer) p;
-        this.enderChest = player.getHandle().getEnderChest();
-        this.owner = player;
+    public SpecialEnderChest(Player player, Boolean online) {
+        super(((CraftPlayer) player).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) player).getHandle().getEnderChest().getSize());
+        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.enderChest = nmsPlayer.getEnderChest();
+        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -64,8 +64,9 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);

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

@@ -21,11 +21,9 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-// Volatile
 import net.minecraft.server.v1_4_6.ItemStack;
 import net.minecraft.server.v1_4_6.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -35,7 +33,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+        super(PlayerDataManager.getHandle(bukkitPlayer));
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,7 +47,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
+            this.player = PlayerDataManager.getHandle(player);
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;

internal/pom.xml

@@ -4,20 +4,65 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>openinvparent</artifactId>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvinternal</artifactId>
   <name>OpenInvInternal</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>1.4.5-R1.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
+  <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

@@ -4,25 +4,25 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>openinvinternal</artifactId>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_10_R1</artifactId>
   <name>OpenInvAdapter1_10_R1</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugin</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>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>3.1.2</version>
+    </dependency>
   </dependencies>
 
 </project>

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

@@ -22,18 +22,16 @@ 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;
@@ -44,7 +42,7 @@ 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;
+import org.bukkit.craftbukkit.v1_10_R1.event.CraftEventFactory;
 
 public class AnySilentContainer implements IAnySilentContainer {
 
@@ -55,7 +53,7 @@ public class AnySilentContainer implements IAnySilentContainer {
 
     @Override
     public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block b) {
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
         World world = player.world;
         BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
         Block block = world.getType(blockPosition).getBlock();
@@ -114,7 +112,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block b) {
 
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
 
         // Silent ender chest is pretty much API-only
         if (silentchest && b.getType() == Material.ENDER_CHEST) {
@@ -140,11 +138,13 @@ public class AnySilentContainer implements IAnySilentContainer {
             return true;
         }
 
-        if (!(tile instanceof IInventory)) {
+        if (!(tile instanceof ITileInventory)) {
             return false;
         }
 
+        ITileInventory tileInventory = (ITileInventory) tile;
         Block block = world.getType(blockPosition).getBlock();
+        Container container = null;
 
         if (block instanceof BlockChest) {
             for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
@@ -161,46 +161,54 @@ public class AnySilentContainer implements IAnySilentContainer {
                 }
 
                 if ((localEnumDirection == EnumDirection.WEST) || (localEnumDirection == EnumDirection.NORTH)) {
-                    tile = new InventoryLargeChest("container.chestDouble",
-                            (TileEntityChest) localTileEntity, (ITileInventory) tile);
+                    tileInventory = new InventoryLargeChest("container.chestDouble",
+                            (TileEntityChest) localTileEntity, tileInventory);
                 } else {
-                    tile = new InventoryLargeChest("container.chestDouble",
-                            (ITileInventory) tile, (TileEntityChest) localTileEntity);
+                    tileInventory = new InventoryLargeChest("container.chestDouble",
+                            tileInventory, (TileEntityChest) localTileEntity);
                 }
                 break;
             }
 
-            if (silentchest) {
-                tile = new SilentContainerChest(player.inventory, ((IInventory) tile), player);
-            }
-
-            if (((BlockChest) block).g == Type.BASIC)
+            BlockChest blockChest = (BlockChest) block;
+            if (blockChest.g == BlockChest.Type.BASIC) {
                 player.b(StatisticList.ac);
-            else if (((BlockChest) block).g == Type.TRAP) {
+            } else if (blockChest.g == BlockChest.Type.TRAP) {
                 player.b(StatisticList.W);
             }
-        }
 
-        boolean returnValue = false;
-        if (!silentchest) {
-            player.openContainer((IInventory) tile);
-            returnValue = true;
-        } else {
-            try {
-                SilentContainerChest silentContainerChest = new SilentContainerChest(player.inventory, ((IInventory) tile), player);
-                int windowId = player.nextContainerCounter();
-                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, "minecraft:chest", ((IInventory) tile).getScoreboardDisplayName(), ((IInventory) tile).getSize()));
-                player.activeContainer = silentContainerChest;
-                player.activeContainer.windowId = windowId;
-                player.activeContainer.addSlotListener(player);
-                returnValue = true;
-            } catch (Exception e) {
-                e.printStackTrace();
-                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            if (silentchest) {
+                container = new SilentContainerChest(player.inventory, tileInventory, player);
             }
         }
 
-        return returnValue;
+        // AnyChest only - SilentChest not active or container unsupported
+        if (!silentchest || container == null) {
+            player.openContainer(tileInventory);
+            return true;
+        }
+
+        // SilentChest
+        try {
+            // Call InventoryOpenEvent
+            container = CraftEventFactory.callInventoryOpenEvent(player, container, false);
+            if (container == null) {
+                return false;
+            }
+
+            // Open window
+            int windowId = player.nextContainerCounter();
+            player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, tileInventory.getContainerName(), tileInventory.getScoreboardDisplayName(), tileInventory.getSize()));
+            player.activeContainer = container;
+            player.activeContainer.windowId = windowId;
+            player.activeContainer.addSlotListener(player);
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            return false;
+        }
     }
 
 }

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

@@ -19,11 +19,10 @@ 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.internal.InternalAccessor;
+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;

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

@@ -16,6 +16,7 @@
 
 package com.lishid.openinv.internal.v1_10_R1;
 
+import java.util.Collection;
 import java.util.UUID;
 
 import com.lishid.openinv.internal.IPlayerDataManager;
@@ -24,14 +25,15 @@ import com.mojang.authlib.GameProfile;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
-// Volatile
 import net.minecraft.server.v1_10_R1.EntityPlayer;
 import net.minecraft.server.v1_10_R1.MinecraftServer;
 import net.minecraft.server.v1_10_R1.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
@@ -79,4 +81,29 @@ public class PlayerDataManager implements IPlayerDataManager {
         }
     }
 
+    @Override
+    public Collection<? extends Player> getOnlinePlayers() {
+        return Bukkit.getOnlinePlayers();
+    }
+
+    public static EntityPlayer getHandle(Player player) {
+        if (player instanceof CraftPlayer) {
+            return ((CraftPlayer) player).getHandle();
+        }
+
+        Server server = player.getServer();
+        EntityPlayer nmsPlayer = null;
+
+        if (server instanceof CraftServer) {
+            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
+        }
+
+        if (nmsPlayer == null) {
+            // Could use reflection to examine fields, but it's honestly not worth the bother.
+            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+        }
+
+        return nmsPlayer;
+    }
+
 }

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

@@ -16,7 +16,6 @@
 
 package com.lishid.openinv.internal.v1_10_R1;
 
-// Volatile
 import net.minecraft.server.v1_10_R1.ContainerChest;
 import net.minecraft.server.v1_10_R1.EntityHuman;
 import net.minecraft.server.v1_10_R1.IInventory;

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

@@ -24,13 +24,12 @@ import com.lishid.openinv.internal.ISpecialEnderChest;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-// Volatile
+import net.minecraft.server.v1_10_R1.EntityPlayer;
 import net.minecraft.server.v1_10_R1.IInventory;
 import net.minecraft.server.v1_10_R1.InventoryEnderChest;
 import net.minecraft.server.v1_10_R1.InventorySubcontainer;
 import net.minecraft.server.v1_10_R1.ItemStack;
 
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
@@ -40,12 +39,12 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     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;
+        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
+                PlayerDataManager.getHandle(player).getEnderChest().hasCustomName(),
+                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.enderChest = nmsPlayer.getEnderChest();
+        this.bukkitOwner = nmsPlayer.getBukkitEntity();
         setItemArrays(this, enderChest.getContents());
     }
 
@@ -78,9 +77,9 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                this.bukkitOwner = player;
-                CraftPlayer craftPlayer = (CraftPlayer) player;
-                setItemArrays(craftPlayer.getHandle().getEnderChest(), this.items);
+                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                this.bukkitOwner = nmsPlayer.getBukkitEntity();
+                setItemArrays(nmsPlayer.getEnderChest(), this.items);
             } catch (Exception e) {}
             playerOnline = true;
         }

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

@@ -24,12 +24,10 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-// Volatile
 import net.minecraft.server.v1_10_R1.EntityHuman;
 import net.minecraft.server.v1_10_R1.ItemStack;
 import net.minecraft.server.v1_10_R1.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -39,7 +37,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+        super(PlayerDataManager.getHandle(bukkitPlayer));
         this.playerOnline = online;
         setItemArrays(this, player.inventory.items, player.inventory.armor, player.inventory.extraSlots);
     }
@@ -89,7 +87,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
+            this.player = PlayerDataManager.getHandle(player);
             setItemArrays(this.player.inventory, items, armor, extraSlots);
             playerOnline = true;
         }

internal/v1_11_R1/pom.xml

@@ -4,25 +4,25 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>openinvinternal</artifactId>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_11_R1</artifactId>
   <name>OpenInvAdapter1_11_R1</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugin</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
-      <version>1.11-R0.1-SNAPSHOT</version>
+      <version>1.11.2-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>3.1.2</version>
+    </dependency>
   </dependencies>
 
 </project>

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

@@ -25,11 +25,9 @@ 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;
@@ -39,7 +37,6 @@ 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;
@@ -51,7 +48,7 @@ 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;
+import org.bukkit.craftbukkit.v1_11_R1.event.CraftEventFactory;
 
 public class AnySilentContainer implements IAnySilentContainer {
 
@@ -66,13 +63,14 @@ public class AnySilentContainer implements IAnySilentContainer {
 
     @Override
     public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block b) {
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
         World world = player.world;
         BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
-        Block block = world.getType(blockPosition).getBlock();
+        IBlockData blockData = world.getType(blockPosition);
+        Block block = blockData.getBlock();
 
         if (block instanceof BlockShulkerBox) {
-            return isBlockedShulkerBox(world, blockPosition, block);
+            return isBlockedShulkerBox(world, blockPosition, blockData);
         }
 
         if (block instanceof BlockEnderChest) {
@@ -107,7 +105,7 @@ public class AnySilentContainer implements IAnySilentContainer {
         return false;
     }
 
-    private boolean isBlockedShulkerBox(World world, BlockPosition blockPosition, Block block) {
+    private boolean isBlockedShulkerBox(World world, BlockPosition blockPosition, IBlockData blockData) {
         // For reference, look at net.minecraft.server.BlockShulkerBox
         TileEntity tile = world.getTileEntity(blockPosition);
 
@@ -115,16 +113,20 @@ public class AnySilentContainer implements IAnySilentContainer {
             return false;
         }
 
-        IBlockData iBlockData = block.getBlockData();
-
-        EnumDirection enumDirection = iBlockData.get(BlockShulkerBox.a);
+        EnumDirection enumDirection = blockData.get(BlockShulkerBox.a);
         if (((TileEntityShulkerBox) tile).p() == TileEntityShulkerBox.AnimationPhase.CLOSED) {
-            AxisAlignedBB axisAlignedBB = BlockShulkerBox.j.b(0.5F * enumDirection.getAdjacentX(),
+            AxisAlignedBB axisAlignedBB = Block.j.b(0.5F * enumDirection.getAdjacentX(),
                     0.5F * enumDirection.getAdjacentY(), 0.5F * enumDirection.getAdjacentZ())
                     .a(enumDirection.getAdjacentX(), enumDirection.getAdjacentY(),
                             enumDirection.getAdjacentZ());
 
-            return world.b(axisAlignedBB.a(blockPosition.shift(enumDirection)));
+            try {
+                // 1.11.2
+                return world.a(axisAlignedBB.a(blockPosition.shift(enumDirection)));
+            } catch (NoSuchMethodError e) {
+                // 1.11
+                return world.b(axisAlignedBB.a(blockPosition.shift(enumDirection)));
+            }
         }
 
         return false;
@@ -152,18 +154,18 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block b) {
 
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
 
         // Silent ender chest is pretty much API-only
         if (silentchest && b.getType() == Material.ENDER_CHEST) {
             p.openInventory(p.getEnderChest());
-            player.b(StatisticList.X);
+            player.b(StatisticList.getStatistic("stat.enderchestOpened"));
             return true;
         }
 
         final World world = player.world;
         final BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
-        Object tile = world.getTileEntity(blockPosition);
+        final Object tile = world.getTileEntity(blockPosition);
 
         if (tile == null) {
             return false;
@@ -174,20 +176,19 @@ public class AnySilentContainer implements IAnySilentContainer {
             InventoryEnderChest enderChest = player.getEnderChest();
             enderChest.a((TileEntityEnderChest) tile);
             player.openContainer(enderChest);
-            player.b(StatisticList.X);
+            player.b(StatisticList.getStatistic("stat.enderchestOpened"));
             return true;
         }
 
-        if (!(tile instanceof IInventory)) {
+        if (!(tile instanceof ITileInventory)) {
             return false;
         }
 
+        ITileInventory tileInventory = (ITileInventory) tile;
         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();
@@ -202,75 +203,84 @@ public class AnySilentContainer implements IAnySilentContainer {
                 }
 
                 if ((localEnumDirection == EnumDirection.WEST) || (localEnumDirection == EnumDirection.NORTH)) {
-                    tile = new InventoryLargeChest("container.chestDouble",
-                            (TileEntityChest) localTileEntity, (ITileInventory) tile);
+                    tileInventory = new InventoryLargeChest("container.chestDouble",
+                            (TileEntityChest) localTileEntity, tileInventory);
                 } else {
-                    tile = new InventoryLargeChest("container.chestDouble",
-                            (ITileInventory) tile, (TileEntityChest) localTileEntity);
+                    tileInventory = new InventoryLargeChest("container.chestDouble",
+                            tileInventory, (TileEntityChest) localTileEntity);
                 }
                 break;
             }
 
-            if (blockChest.g == Type.BASIC)
-                player.b(StatisticList.ac);
-            else if (blockChest.g == Type.TRAP) {
-                player.b(StatisticList.W);
+            BlockChest blockChest = (BlockChest) block;
+            if (blockChest.g == BlockChest.Type.BASIC) {
+                player.b(StatisticList.getStatistic("stat.chestOpened"));
+            } else if (blockChest.g == BlockChest.Type.TRAP) {
+                player.b(StatisticList.getStatistic("stat.trappedChestTriggered"));
             }
 
             if (silentchest) {
-                container = new SilentContainerChest(player.inventory, ((IInventory) tile), player);
+                container = new SilentContainerChest(player.inventory, tileInventory, player);
             }
         }
 
         if (block instanceof BlockShulkerBox) {
-            player.b(StatisticList.ae);
+            player.b(StatisticList.getStatistic("stat.shulkerBoxOpened"));
 
-            if (silentchest && tile instanceof TileEntityShulkerBox) {
+            if (silentchest && tileInventory instanceof TileEntityShulkerBox) {
                 // Set value to current + 1. Ensures consistency later when resetting.
-                SilentContainerShulkerBox.setOpenValue((TileEntityShulkerBox) tile,
-                        SilentContainerShulkerBox.getOpenValue((TileEntityShulkerBox) tile) + 1);
+                SilentContainerShulkerBox.setOpenValue((TileEntityShulkerBox) tileInventory,
+                        SilentContainerShulkerBox.getOpenValue((TileEntityShulkerBox) tileInventory) + 1);
 
-                container = new SilentContainerShulkerBox(player.inventory, (IInventory) tile, player);
+                container = new SilentContainerShulkerBox(player.inventory, tileInventory, player);
             }
         }
 
-        boolean returnValue = false;
-        final IInventory iInventory = (IInventory) tile;
-
+        // AnyChest only - SilentChest not active or container unsupported
         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.");
-            }
+            player.openContainer(tileInventory);
+            return true;
         }
 
-        return returnValue;
+        // SilentChest
+        try {
+            // Call InventoryOpenEvent
+            container = CraftEventFactory.callInventoryOpenEvent(player, container, false);
+            if (container == null) {
+                return false;
+            }
+
+            // Open window
+            int windowId = player.nextContainerCounter();
+            player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, tileInventory.getContainerName(), tileInventory.getScoreboardDisplayName(), tileInventory.getSize()));
+            player.activeContainer = container;
+            player.activeContainer.windowId = windowId;
+            player.activeContainer.addSlotListener(player);
+
+            // Special handling for shulker boxes - reset value for viewers to what it was initially.
+            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);
+            }
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            return false;
+        }
     }
 
 }

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

@@ -19,11 +19,10 @@ 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.internal.InternalAccessor;
+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;

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

@@ -16,6 +16,7 @@
 
 package com.lishid.openinv.internal.v1_11_R1;
 
+import java.util.Collection;
 import java.util.UUID;
 
 import com.lishid.openinv.internal.IPlayerDataManager;
@@ -24,14 +25,15 @@ import com.mojang.authlib.GameProfile;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 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;
+import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
@@ -79,4 +81,29 @@ public class PlayerDataManager implements IPlayerDataManager {
         }
     }
 
+    @Override
+    public Collection<? extends Player> getOnlinePlayers() {
+        return Bukkit.getOnlinePlayers();
+    }
+
+    public static EntityPlayer getHandle(Player player) {
+        if (player instanceof CraftPlayer) {
+            return ((CraftPlayer) player).getHandle();
+        }
+
+        Server server = player.getServer();
+        EntityPlayer nmsPlayer = null;
+
+        if (server instanceof CraftServer) {
+            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
+        }
+
+        if (nmsPlayer == null) {
+            // Could use reflection to examine fields, but it's honestly not worth the bother.
+            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+        }
+
+        return nmsPlayer;
+    }
+
 }

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

@@ -16,7 +16,6 @@
 
 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;

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

@@ -25,13 +25,12 @@ import com.lishid.openinv.internal.ISpecialEnderChest;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-// Volatile
+import net.minecraft.server.v1_11_R1.EntityPlayer;
 import net.minecraft.server.v1_11_R1.IInventory;
 import net.minecraft.server.v1_11_R1.InventoryEnderChest;
 import net.minecraft.server.v1_11_R1.InventorySubcontainer;
 import net.minecraft.server.v1_11_R1.ItemStack;
 
-import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
@@ -41,12 +40,12 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     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;
+        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
+                PlayerDataManager.getHandle(player).getEnderChest().hasCustomName(),
+                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.enderChest = nmsPlayer.getEnderChest();
+        this.bukkitOwner = nmsPlayer.getBukkitEntity();
         setItemLists(this, enderChest.getContents());
     }
 
@@ -79,9 +78,9 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                this.bukkitOwner = player;
-                CraftPlayer craftPlayer = (CraftPlayer) player;
-                setItemLists(craftPlayer.getHandle().getEnderChest(), this.items);
+                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                this.bukkitOwner = nmsPlayer.getBukkitEntity();
+                setItemLists(nmsPlayer.getEnderChest(), this.items);
             } catch (Exception e) {}
             playerOnline = true;
         }

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

@@ -26,13 +26,11 @@ 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 {
@@ -41,7 +39,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+        super(PlayerDataManager.getHandle(bukkitPlayer));
         this.playerOnline = online;
         setItemArrays(this, player.inventory.items, player.inventory.armor, player.inventory.extraSlots);
     }
@@ -91,7 +89,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
+            this.player = PlayerDataManager.getHandle(player);;
             setItemArrays(this.player.inventory, items, armor, extraSlots);
             playerOnline = true;
         }

internal/v1_4_R1/pom.xml

@@ -4,25 +4,25 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>openinvinternal</artifactId>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_4_R1</artifactId>
   <name>OpenInvAdapter1_4_R1</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugin</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>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>3.1.2</version>
+    </dependency>
   </dependencies>
 
 </project>

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

@@ -22,9 +22,9 @@ 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.Container;
 import net.minecraft.server.v1_4_R1.EntityOcelot;
 import net.minecraft.server.v1_4_R1.EntityPlayer;
 import net.minecraft.server.v1_4_R1.IInventory;
@@ -35,7 +35,7 @@ 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;
+import org.bukkit.craftbukkit.v1_4_R1.event.CraftEventFactory;
 
 public class AnySilentContainer implements IAnySilentContainer {
 
@@ -47,7 +47,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
         World world = player.world;
 
         if (block instanceof BlockEnderChest) {
@@ -95,7 +95,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
 
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
 
         // Silent ender chest is API-only
         if (silentchest && block.getType() == Material.ENDER_CHEST) {
@@ -122,37 +122,47 @@ public class AnySilentContainer implements IAnySilentContainer {
             return false;
         }
 
+        IInventory inventory = (IInventory) tile;
         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));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
         } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
         } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
         } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
         }
 
-        boolean returnValue = false;
+        // AnyChest only
         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.");
-            }
+            player.openContainer(inventory);
+            return true;
         }
 
-        return returnValue;
+        // SilentChest
+        try {
+            // Call InventoryOpenEvent
+            Container container = new SilentContainerChest(player.inventory, inventory);
+            container = CraftEventFactory.callInventoryOpenEvent(player, container);
+            if (container == null) {
+                return false;
+            }
+
+            // Open window
+            int windowId = player.nextContainerCounter();
+            player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize()));
+            player.activeContainer = container;
+            player.activeContainer.windowId = windowId;
+            player.activeContainer.addSlotListener(player);
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            return false;
+        }
     }
 
 }

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

@@ -19,11 +19,10 @@ 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.internal.InternalAccessor;
+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;

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

@@ -16,18 +16,22 @@
 
 package com.lishid.openinv.internal.v1_4_R1;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
 import net.minecraft.server.v1_4_R1.EntityPlayer;
 import net.minecraft.server.v1_4_R1.MinecraftServer;
 import net.minecraft.server.v1_4_R1.PlayerInteractManager;
 
-// Volatile
 import org.bukkit.craftbukkit.v1_4_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
 
 
 public class PlayerDataManager implements IPlayerDataManager {
@@ -70,4 +74,29 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player;
     }
 
+    @Override
+    public Collection<? extends Player> getOnlinePlayers() {
+        return Arrays.asList(Bukkit.getOnlinePlayers());
+    }
+
+    public static EntityPlayer getHandle(Player player) {
+        if (player instanceof CraftPlayer) {
+            return ((CraftPlayer) player).getHandle();
+        }
+
+        Server server = player.getServer();
+        EntityPlayer nmsPlayer = null;
+
+        if (server instanceof CraftServer) {
+            nmsPlayer = ((CraftServer) server).getHandle().f(player.getName());
+        }
+
+        if (nmsPlayer == null) {
+            // Could use reflection to examine fields, but it's honestly not worth the bother.
+            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+        }
+
+        return nmsPlayer;
+    }
+
 }

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

@@ -16,7 +16,6 @@
 
 package com.lishid.openinv.internal.v1_4_R1;
 
-// Volatile
 import net.minecraft.server.v1_4_R1.ContainerChest;
 import net.minecraft.server.v1_4_R1.EntityHuman;
 import net.minecraft.server.v1_4_R1.IInventory;

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-// Volatile
+import net.minecraft.server.v1_4_R1.EntityPlayer;
 import net.minecraft.server.v1_4_R1.IInventory;
 import net.minecraft.server.v1_4_R1.InventoryEnderChest;
 import net.minecraft.server.v1_4_R1.InventorySubcontainer;
@@ -46,12 +46,12 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     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());
-        CraftPlayer player = (CraftPlayer) p;
-        this.enderChest = player.getHandle().getEnderChest();
-        this.owner = player;
+    public SpecialEnderChest(Player player, Boolean online) {
+        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
+                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.enderChest = nmsPlayer.getEnderChest();
+        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -64,8 +64,9 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);

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

@@ -21,11 +21,9 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-// Volatile
 import net.minecraft.server.v1_4_R1.ItemStack;
 import net.minecraft.server.v1_4_R1.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -35,7 +33,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+        super(PlayerDataManager.getHandle(bukkitPlayer));
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,7 +47,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
+            this.player = PlayerDataManager.getHandle(player);
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;

internal/v1_5_R2/pom.xml

@@ -4,25 +4,25 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>openinvinternal</artifactId>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_5_R2</artifactId>
   <name>OpenInvAdapter1_5_R2</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugin</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>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>3.1.2</version>
+    </dependency>
   </dependencies>
 
 </project>

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

@@ -22,9 +22,9 @@ 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.Container;
 import net.minecraft.server.v1_5_R2.EntityOcelot;
 import net.minecraft.server.v1_5_R2.EntityPlayer;
 import net.minecraft.server.v1_5_R2.IInventory;
@@ -35,7 +35,7 @@ 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;
+import org.bukkit.craftbukkit.v1_5_R2.event.CraftEventFactory;
 
 public class AnySilentContainer implements IAnySilentContainer {
 
@@ -47,7 +47,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
         World world = player.world;
 
         if (block instanceof BlockEnderChest) {
@@ -95,7 +95,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
 
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
 
         // Silent ender chest is API-only
         if (silentchest && block.getType() == Material.ENDER_CHEST) {
@@ -122,37 +122,47 @@ public class AnySilentContainer implements IAnySilentContainer {
             return false;
         }
 
+        IInventory inventory = (IInventory) tile;
         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));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
         } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
         } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
         } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
         }
 
-        boolean returnValue = false;
+        // AnyChest only
         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.");
-            }
+            player.openContainer(inventory);
+            return true;
         }
 
-        return returnValue;
+        // SilentChest
+        try {
+            // Call InventoryOpenEvent
+            Container container = new SilentContainerChest(player.inventory, inventory);
+            container = CraftEventFactory.callInventoryOpenEvent(player, container);
+            if (container == null) {
+                return false;
+            }
+
+            // Open window
+            int windowId = player.nextContainerCounter();
+            player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize(), true));
+            player.activeContainer = container;
+            player.activeContainer.windowId = windowId;
+            player.activeContainer.addSlotListener(player);
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            return false;
+        }
     }
 
 }

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

@@ -19,11 +19,10 @@ 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.internal.InternalAccessor;
+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;

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

@@ -16,18 +16,22 @@
 
 package com.lishid.openinv.internal.v1_5_R2;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
-// Volatile
 import net.minecraft.server.v1_5_R2.EntityPlayer;
 import net.minecraft.server.v1_5_R2.MinecraftServer;
 import net.minecraft.server.v1_5_R2.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_5_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
@@ -69,4 +73,29 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player;
     }
 
+    @Override
+    public Collection<? extends Player> getOnlinePlayers() {
+        return Arrays.asList(Bukkit.getOnlinePlayers());
+    }
+
+    public static EntityPlayer getHandle(Player player) {
+        if (player instanceof CraftPlayer) {
+            return ((CraftPlayer) player).getHandle();
+        }
+
+        Server server = player.getServer();
+        EntityPlayer nmsPlayer = null;
+
+        if (server instanceof CraftServer) {
+            nmsPlayer = ((CraftServer) server).getHandle().f(player.getName());
+        }
+
+        if (nmsPlayer == null) {
+            // Could use reflection to examine fields, but it's honestly not worth the bother.
+            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+        }
+
+        return nmsPlayer;
+    }
+
 }

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

@@ -16,7 +16,6 @@
 
 package com.lishid.openinv.internal.v1_5_R2;
 
-// Volatile
 import net.minecraft.server.v1_5_R2.ContainerChest;
 import net.minecraft.server.v1_5_R2.EntityHuman;
 import net.minecraft.server.v1_5_R2.IInventory;

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-// Volatile
+import net.minecraft.server.v1_5_R2.EntityPlayer;
 import net.minecraft.server.v1_5_R2.IInventory;
 import net.minecraft.server.v1_5_R2.InventoryEnderChest;
 import net.minecraft.server.v1_5_R2.InventorySubcontainer;
@@ -46,13 +46,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     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());
-        CraftPlayer player = (CraftPlayer) p;
-        this.enderChest = player.getHandle().getEnderChest();
-        this.owner = player;
+    public SpecialEnderChest(Player player, Boolean online) {
+        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
+                PlayerDataManager.getHandle(player).getEnderChest().c(),
+                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.enderChest = nmsPlayer.getEnderChest();
+        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -65,8 +65,9 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);

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

@@ -21,11 +21,9 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-// Volatile
 import net.minecraft.server.v1_5_R2.ItemStack;
 import net.minecraft.server.v1_5_R2.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -35,7 +33,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+        super(PlayerDataManager.getHandle(bukkitPlayer));
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,7 +47,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
+            this.player = PlayerDataManager.getHandle(player);
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;

internal/v1_5_R3/pom.xml

@@ -4,25 +4,25 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>openinvinternal</artifactId>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_5_R3</artifactId>
   <name>OpenInvAdapter1_5_R3</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugin</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>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>3.1.2</version>
+    </dependency>
   </dependencies>
 
 </project>

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

@@ -22,9 +22,9 @@ 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.Container;
 import net.minecraft.server.v1_5_R3.EntityOcelot;
 import net.minecraft.server.v1_5_R3.EntityPlayer;
 import net.minecraft.server.v1_5_R3.IInventory;
@@ -35,7 +35,7 @@ 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;
+import org.bukkit.craftbukkit.v1_5_R3.event.CraftEventFactory;
 
 public class AnySilentContainer implements IAnySilentContainer {
 
@@ -47,7 +47,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
         World world = player.world;
 
         if (block instanceof BlockEnderChest) {
@@ -95,7 +95,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
 
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
 
         // Silent ender chest is API-only
         if (silentchest && block.getType() == Material.ENDER_CHEST) {
@@ -122,37 +122,47 @@ public class AnySilentContainer implements IAnySilentContainer {
             return false;
         }
 
+        IInventory inventory = (IInventory) tile;
         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));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
         } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
         } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
         } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
         }
 
-        boolean returnValue = false;
+        // AnyChest only
         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.");
-            }
+            player.openContainer(inventory);
+            return true;
         }
 
-        return returnValue;
+        // SilentChest
+        try {
+            // Call InventoryOpenEvent
+            Container container = new SilentContainerChest(player.inventory, inventory);
+            container = CraftEventFactory.callInventoryOpenEvent(player, container);
+            if (container == null) {
+                return false;
+            }
+
+            // Open window
+            int windowId = player.nextContainerCounter();
+            player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize(), true));
+            player.activeContainer = container;
+            player.activeContainer.windowId = windowId;
+            player.activeContainer.addSlotListener(player);
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            return false;
+        }
     }
 
 }

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

@@ -19,11 +19,10 @@ 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.internal.InternalAccessor;
+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;

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

@@ -16,18 +16,22 @@
 
 package com.lishid.openinv.internal.v1_5_R3;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
-// Volatile
 import net.minecraft.server.v1_5_R3.EntityPlayer;
 import net.minecraft.server.v1_5_R3.MinecraftServer;
 import net.minecraft.server.v1_5_R3.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_5_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
@@ -69,4 +73,29 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player;
     }
 
+    @Override
+    public Collection<? extends Player> getOnlinePlayers() {
+        return Arrays.asList(Bukkit.getOnlinePlayers());
+    }
+
+    public static EntityPlayer getHandle(Player player) {
+        if (player instanceof CraftPlayer) {
+            return ((CraftPlayer) player).getHandle();
+        }
+
+        Server server = player.getServer();
+        EntityPlayer nmsPlayer = null;
+
+        if (server instanceof CraftServer) {
+            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
+        }
+
+        if (nmsPlayer == null) {
+            // Could use reflection to examine fields, but it's honestly not worth the bother.
+            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+        }
+
+        return nmsPlayer;
+    }
+
 }

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

@@ -16,7 +16,6 @@
 
 package com.lishid.openinv.internal.v1_5_R3;
 
-// Volatile
 import net.minecraft.server.v1_5_R3.ContainerChest;
 import net.minecraft.server.v1_5_R3.EntityHuman;
 import net.minecraft.server.v1_5_R3.IInventory;

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-// Volatile
+import net.minecraft.server.v1_5_R3.EntityPlayer;
 import net.minecraft.server.v1_5_R3.IInventory;
 import net.minecraft.server.v1_5_R3.InventoryEnderChest;
 import net.minecraft.server.v1_5_R3.InventorySubcontainer;
@@ -46,13 +46,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     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());
-        CraftPlayer player = (CraftPlayer) p;
-        this.enderChest = player.getHandle().getEnderChest();
-        this.owner = player;
+    public SpecialEnderChest(Player player, Boolean online) {
+        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
+                PlayerDataManager.getHandle(player).getEnderChest().c(),
+                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.enderChest = nmsPlayer.getEnderChest();
+        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -65,8 +65,9 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);

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

@@ -21,11 +21,9 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-// Volatile
 import net.minecraft.server.v1_5_R3.ItemStack;
 import net.minecraft.server.v1_5_R3.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -35,7 +33,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+        super(PlayerDataManager.getHandle(bukkitPlayer));
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,7 +47,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
+            this.player = PlayerDataManager.getHandle(player);
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;

internal/v1_6_R1/pom.xml

@@ -4,25 +4,25 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>openinvinternal</artifactId>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R1</artifactId>
   <name>OpenInvAdapter1_6_R1</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugin</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>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>3.1.2</version>
+    </dependency>
   </dependencies>
 
 </project>

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

@@ -22,9 +22,9 @@ 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.Container;
 import net.minecraft.server.v1_6_R1.EntityOcelot;
 import net.minecraft.server.v1_6_R1.EntityPlayer;
 import net.minecraft.server.v1_6_R1.IInventory;
@@ -35,7 +35,7 @@ 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;
+import org.bukkit.craftbukkit.v1_6_R1.event.CraftEventFactory;
 
 public class AnySilentContainer implements IAnySilentContainer {
 
@@ -47,7 +47,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
         World world = player.world;
 
         if (block instanceof BlockEnderChest) {
@@ -95,7 +95,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
 
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
 
         // Silent ender chest is API-only
         if (silentchest && block.getType() == Material.ENDER_CHEST) {
@@ -122,37 +122,47 @@ public class AnySilentContainer implements IAnySilentContainer {
             return false;
         }
 
+        IInventory inventory = (IInventory) tile;
         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));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
         } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
         } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
         } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
         }
 
-        boolean returnValue = false;
+        // AnyChest only
         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.");
-            }
+            player.openContainer(inventory);
+            return true;
         }
 
-        return returnValue;
+        // SilentChest
+        try {
+            // Call InventoryOpenEvent
+            Container container = new SilentContainerChest(player.inventory, inventory);
+            container = CraftEventFactory.callInventoryOpenEvent(player, container);
+            if (container == null) {
+                return false;
+            }
+
+            // Open window
+            int windowId = player.nextContainerCounter();
+            player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize(), true));
+            player.activeContainer = container;
+            player.activeContainer.windowId = windowId;
+            player.activeContainer.addSlotListener(player);
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            return false;
+        }
     }
 
 }

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

@@ -19,11 +19,10 @@ 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.internal.InternalAccessor;
+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;

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

@@ -16,18 +16,22 @@
 
 package com.lishid.openinv.internal.v1_6_R1;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
-// Volatile
 import net.minecraft.server.v1_6_R1.EntityPlayer;
 import net.minecraft.server.v1_6_R1.MinecraftServer;
 import net.minecraft.server.v1_6_R1.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_6_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
@@ -69,4 +73,29 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player;
     }
 
+    @Override
+    public Collection<? extends Player> getOnlinePlayers() {
+        return Arrays.asList(Bukkit.getOnlinePlayers());
+    }
+
+    public static EntityPlayer getHandle(Player player) {
+        if (player instanceof CraftPlayer) {
+            return ((CraftPlayer) player).getHandle();
+        }
+
+        Server server = player.getServer();
+        EntityPlayer nmsPlayer = null;
+
+        if (server instanceof CraftServer) {
+            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
+        }
+
+        if (nmsPlayer == null) {
+            // Could use reflection to examine fields, but it's honestly not worth the bother.
+            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+        }
+
+        return nmsPlayer;
+    }
+
 }

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

@@ -16,7 +16,6 @@
 
 package com.lishid.openinv.internal.v1_6_R1;
 
-// Volatile
 import net.minecraft.server.v1_6_R1.ContainerChest;
 import net.minecraft.server.v1_6_R1.EntityHuman;
 import net.minecraft.server.v1_6_R1.IInventory;

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-// Volatile
+import net.minecraft.server.v1_6_R1.EntityPlayer;
 import net.minecraft.server.v1_6_R1.IInventory;
 import net.minecraft.server.v1_6_R1.InventoryEnderChest;
 import net.minecraft.server.v1_6_R1.InventorySubcontainer;
@@ -46,13 +46,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     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());
-        CraftPlayer player = (CraftPlayer) p;
-        this.enderChest = player.getHandle().getEnderChest();
-        this.owner = player;
+    public SpecialEnderChest(Player player, Boolean online) {
+        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
+                PlayerDataManager.getHandle(player).getEnderChest().c(),
+                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.enderChest = nmsPlayer.getEnderChest();
+        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -65,8 +65,9 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);

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

@@ -21,11 +21,9 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-// Volatile
 import net.minecraft.server.v1_6_R1.ItemStack;
 import net.minecraft.server.v1_6_R1.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -35,7 +33,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+        super(PlayerDataManager.getHandle(bukkitPlayer));
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,7 +47,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
+            this.player = PlayerDataManager.getHandle(player);
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;

internal/v1_6_R2/pom.xml

@@ -4,25 +4,25 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>openinvinternal</artifactId>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R2</artifactId>
   <name>OpenInvAdapter1_6_R2</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugin</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>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>3.1.2</version>
+    </dependency>
   </dependencies>
 
 </project>

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

@@ -22,9 +22,9 @@ 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.Container;
 import net.minecraft.server.v1_6_R2.EntityOcelot;
 import net.minecraft.server.v1_6_R2.EntityPlayer;
 import net.minecraft.server.v1_6_R2.IInventory;
@@ -35,7 +35,7 @@ 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;
+import org.bukkit.craftbukkit.v1_6_R2.event.CraftEventFactory;
 
 public class AnySilentContainer implements IAnySilentContainer {
 
@@ -47,7 +47,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
         World world = player.world;
 
         if (block instanceof BlockEnderChest) {
@@ -95,7 +95,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
 
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
 
         // Silent ender chest is API-only
         if (silentchest && block.getType() == Material.ENDER_CHEST) {
@@ -122,37 +122,47 @@ public class AnySilentContainer implements IAnySilentContainer {
             return false;
         }
 
+        IInventory inventory = (IInventory) tile;
         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));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
         } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
         } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
         } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
         }
 
-        boolean returnValue = false;
+        // AnyChest only
         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.");
-            }
+            player.openContainer(inventory);
+            return true;
         }
 
-        return returnValue;
+        // SilentChest
+        try {
+            // Call InventoryOpenEvent
+            Container container = new SilentContainerChest(player.inventory, inventory);
+            container = CraftEventFactory.callInventoryOpenEvent(player, container);
+            if (container == null) {
+                return false;
+            }
+
+            // Open window
+            int windowId = player.nextContainerCounter();
+            player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize(), true));
+            player.activeContainer = container;
+            player.activeContainer.windowId = windowId;
+            player.activeContainer.addSlotListener(player);
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            return false;
+        }
     }
 
 }

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

@@ -19,11 +19,10 @@ 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.internal.InternalAccessor;
+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;

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

@@ -16,18 +16,22 @@
 
 package com.lishid.openinv.internal.v1_6_R2;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
-// Volatile
 import net.minecraft.server.v1_6_R2.EntityPlayer;
 import net.minecraft.server.v1_6_R2.MinecraftServer;
 import net.minecraft.server.v1_6_R2.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_6_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
@@ -69,4 +73,29 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player;
     }
 
+    @Override
+    public Collection<? extends Player> getOnlinePlayers() {
+        return Arrays.asList(Bukkit.getOnlinePlayers());
+    }
+
+    public static EntityPlayer getHandle(Player player) {
+        if (player instanceof CraftPlayer) {
+            return ((CraftPlayer) player).getHandle();
+        }
+
+        Server server = player.getServer();
+        EntityPlayer nmsPlayer = null;
+
+        if (server instanceof CraftServer) {
+            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
+        }
+
+        if (nmsPlayer == null) {
+            // Could use reflection to examine fields, but it's honestly not worth the bother.
+            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+        }
+
+        return nmsPlayer;
+    }
+
 }

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

@@ -16,7 +16,6 @@
 
 package com.lishid.openinv.internal.v1_6_R2;
 
-// Volatile
 import net.minecraft.server.v1_6_R2.ContainerChest;
 import net.minecraft.server.v1_6_R2.EntityHuman;
 import net.minecraft.server.v1_6_R2.IInventory;

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-// Volatile
+import net.minecraft.server.v1_6_R2.EntityPlayer;
 import net.minecraft.server.v1_6_R2.IInventory;
 import net.minecraft.server.v1_6_R2.InventoryEnderChest;
 import net.minecraft.server.v1_6_R2.InventorySubcontainer;
@@ -46,13 +46,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     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());
-        CraftPlayer player = (CraftPlayer) p;
-        this.enderChest = player.getHandle().getEnderChest();
-        this.owner = player;
+    public SpecialEnderChest(Player player, Boolean online) {
+        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
+                PlayerDataManager.getHandle(player).getEnderChest().c(),
+                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.enderChest = nmsPlayer.getEnderChest();
+        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -65,8 +65,9 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);

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

@@ -21,11 +21,9 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-// Volatile
 import net.minecraft.server.v1_6_R2.ItemStack;
 import net.minecraft.server.v1_6_R2.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -35,7 +33,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+        super(PlayerDataManager.getHandle(bukkitPlayer));
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,7 +47,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
+            this.player = PlayerDataManager.getHandle(player);
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;

internal/v1_6_R3/pom.xml

@@ -4,25 +4,25 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>openinvinternal</artifactId>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R3</artifactId>
   <name>OpenInvAdapter1_6_R3</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugin</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>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>3.1.2</version>
+    </dependency>
   </dependencies>
 
 </project>

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

@@ -22,9 +22,9 @@ 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.Container;
 import net.minecraft.server.v1_6_R3.EntityOcelot;
 import net.minecraft.server.v1_6_R3.EntityPlayer;
 import net.minecraft.server.v1_6_R3.IInventory;
@@ -35,7 +35,7 @@ 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;
+import org.bukkit.craftbukkit.v1_6_R3.event.CraftEventFactory;
 
 public class AnySilentContainer implements IAnySilentContainer {
 
@@ -47,7 +47,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
         World world = player.world;
 
         if (block instanceof BlockEnderChest) {
@@ -95,7 +95,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
 
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
 
         // Silent ender chest is API-only
         if (silentchest && block.getType() == Material.ENDER_CHEST) {
@@ -122,37 +122,47 @@ public class AnySilentContainer implements IAnySilentContainer {
             return false;
         }
 
+        IInventory inventory = (IInventory) tile;
         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));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
         } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
-            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
         } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
-            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
         } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
-            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
         }
 
-        boolean returnValue = false;
+        // AnyChest only
         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.");
-            }
+            player.openContainer(inventory);
+            return true;
         }
 
-        return returnValue;
+        // SilentChest
+        try {
+            // Call InventoryOpenEvent
+            Container container = new SilentContainerChest(player.inventory, inventory);
+            container = CraftEventFactory.callInventoryOpenEvent(player, container);
+            if (container == null) {
+                return false;
+            }
+
+            // Open window
+            int windowId = player.nextContainerCounter();
+            player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize(), true));
+            player.activeContainer = container;
+            player.activeContainer.windowId = windowId;
+            player.activeContainer.addSlotListener(player);
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            return false;
+        }
     }
 
 }

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

@@ -19,11 +19,10 @@ 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.internal.InternalAccessor;
+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;

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

@@ -16,18 +16,22 @@
 
 package com.lishid.openinv.internal.v1_6_R3;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
-// Volatile
 import net.minecraft.server.v1_6_R3.EntityPlayer;
 import net.minecraft.server.v1_6_R3.MinecraftServer;
 import net.minecraft.server.v1_6_R3.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
@@ -69,4 +73,29 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player;
     }
 
+    @Override
+    public Collection<? extends Player> getOnlinePlayers() {
+        return Arrays.asList(Bukkit.getOnlinePlayers());
+    }
+
+    public static EntityPlayer getHandle(Player player) {
+        if (player instanceof CraftPlayer) {
+            return ((CraftPlayer) player).getHandle();
+        }
+
+        Server server = player.getServer();
+        EntityPlayer nmsPlayer = null;
+
+        if (server instanceof CraftServer) {
+            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
+        }
+
+        if (nmsPlayer == null) {
+            // Could use reflection to examine fields, but it's honestly not worth the bother.
+            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+        }
+
+        return nmsPlayer;
+    }
+
 }

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

@@ -16,7 +16,6 @@
 
 package com.lishid.openinv.internal.v1_6_R3;
 
-// Volatile
 import net.minecraft.server.v1_6_R3.ContainerChest;
 import net.minecraft.server.v1_6_R3.EntityHuman;
 import net.minecraft.server.v1_6_R3.IInventory;

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-// Volatile
+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.InventorySubcontainer;
@@ -46,13 +46,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     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());
-        CraftPlayer player = (CraftPlayer) p;
-        this.enderChest = player.getHandle().getEnderChest();
-        this.owner = player;
+    public SpecialEnderChest(Player player, Boolean online) {
+        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
+                PlayerDataManager.getHandle(player).getEnderChest().c(),
+                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.enderChest = nmsPlayer.getEnderChest();
+        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -65,8 +65,9 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);

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

@@ -21,11 +21,9 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-// Volatile
 import net.minecraft.server.v1_6_R3.ItemStack;
 import net.minecraft.server.v1_6_R3.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -35,7 +33,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+        super(PlayerDataManager.getHandle(bukkitPlayer));
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,7 +47,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
+            this.player = PlayerDataManager.getHandle(player);
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;

internal/v1_7_R1/pom.xml

@@ -4,25 +4,25 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>openinvinternal</artifactId>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R1</artifactId>
   <name>OpenInvAdapter1_7_R1</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugin</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>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>3.1.2</version>
+    </dependency>
   </dependencies>
 
 </project>

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

@@ -22,10 +22,10 @@ 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.Container;
 import net.minecraft.server.v1_7_R1.EntityOcelot;
 import net.minecraft.server.v1_7_R1.EntityPlayer;
 import net.minecraft.server.v1_7_R1.IInventory;
@@ -36,7 +36,7 @@ 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;
+import org.bukkit.craftbukkit.v1_7_R1.event.CraftEventFactory;
 
 public class AnySilentContainer implements IAnySilentContainer {
 
@@ -48,7 +48,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
         World world = player.world;
 
         if (block instanceof BlockEnderChest) {
@@ -96,7 +96,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
 
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
 
         // Silent ender chest is API-only
         if (silentchest && block.getType() == Material.ENDER_CHEST) {
@@ -123,37 +123,47 @@ public class AnySilentContainer implements IAnySilentContainer {
             return false;
         }
 
+        IInventory inventory = (IInventory) tile;
         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));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (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);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
         } 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()));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (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);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
         }
 
-        boolean returnValue = false;
+        // AnyChest only
         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.");
-            }
+            player.openContainer(inventory);
+            return true;
         }
 
-        return returnValue;
+        // SilentChest
+        try {
+            // Call InventoryOpenEvent
+            Container container = new SilentContainerChest(player.inventory, inventory);
+            container = CraftEventFactory.callInventoryOpenEvent(player, container);
+            if (container == null) {
+                return false;
+            }
+
+            // Open window
+            int windowId = player.nextContainerCounter();
+            player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, inventory.getInventoryName(), inventory.getSize(), true));
+            player.activeContainer = container;
+            player.activeContainer.windowId = windowId;
+            player.activeContainer.addSlotListener(player);
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            return false;
+        }
     }
 
 }

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

@@ -19,11 +19,10 @@ 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.internal.InternalAccessor;
+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;

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

@@ -16,19 +16,23 @@
 
 package com.lishid.openinv.internal.v1_7_R1;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
-// Volatile
 import net.minecraft.server.v1_7_R1.EntityPlayer;
 import net.minecraft.server.v1_7_R1.MinecraftServer;
 import net.minecraft.server.v1_7_R1.PlayerInteractManager;
 import net.minecraft.util.com.mojang.authlib.GameProfile;
 
 import org.bukkit.craftbukkit.v1_7_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
@@ -70,4 +74,29 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player;
     }
 
+    @Override
+    public Collection<? extends Player> getOnlinePlayers() {
+        return Arrays.asList(Bukkit.getOnlinePlayers());
+    }
+
+    public static EntityPlayer getHandle(Player player) {
+        if (player instanceof CraftPlayer) {
+            return ((CraftPlayer) player).getHandle();
+        }
+
+        Server server = player.getServer();
+        EntityPlayer nmsPlayer = null;
+
+        if (server instanceof CraftServer) {
+            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
+        }
+
+        if (nmsPlayer == null) {
+            // Could use reflection to examine fields, but it's honestly not worth the bother.
+            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+        }
+
+        return nmsPlayer;
+    }
+
 }

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

@@ -16,7 +16,6 @@
 
 package com.lishid.openinv.internal.v1_7_R1;
 
-// Volatile
 import net.minecraft.server.v1_7_R1.ContainerChest;
 import net.minecraft.server.v1_7_R1.EntityHuman;
 import net.minecraft.server.v1_7_R1.IInventory;

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-// Volatile
+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.InventorySubcontainer;
@@ -46,13 +46,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     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());
-        CraftPlayer player = (CraftPlayer) p;
-        this.enderChest = player.getHandle().getEnderChest();
-        this.owner = player;
+    public SpecialEnderChest(Player player, Boolean online) {
+        super(PlayerDataManager.getHandle(player).getEnderChest().getInventoryName(),
+                PlayerDataManager.getHandle(player).getEnderChest().k_(),
+                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.enderChest = nmsPlayer.getEnderChest();
+        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -65,8 +65,9 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);

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

@@ -21,11 +21,9 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-// Volatile
 import net.minecraft.server.v1_7_R1.ItemStack;
 import net.minecraft.server.v1_7_R1.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -35,7 +33,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+        super(PlayerDataManager.getHandle(bukkitPlayer));
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,7 +47,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
+            this.player = PlayerDataManager.getHandle(player);
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;

internal/v1_7_R2/pom.xml

@@ -4,25 +4,25 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>openinvinternal</artifactId>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R2</artifactId>
   <name>OpenInvAdapter1_7_R2</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugin</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>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>3.1.2</version>
+    </dependency>
   </dependencies>
 
 </project>

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

@@ -22,10 +22,10 @@ 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.Container;
 import net.minecraft.server.v1_7_R2.EntityOcelot;
 import net.minecraft.server.v1_7_R2.EntityPlayer;
 import net.minecraft.server.v1_7_R2.IInventory;
@@ -36,7 +36,7 @@ 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;
+import org.bukkit.craftbukkit.v1_7_R2.event.CraftEventFactory;
 
 public class AnySilentContainer implements IAnySilentContainer {
 
@@ -48,7 +48,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
         World world = player.world;
 
         if (block instanceof BlockEnderChest) {
@@ -96,7 +96,7 @@ public class AnySilentContainer implements IAnySilentContainer {
     @Override
     public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
 
-        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        EntityPlayer player = PlayerDataManager.getHandle(p);
 
         // Silent ender chest is API-only
         if (silentchest && block.getType() == Material.ENDER_CHEST) {
@@ -123,37 +123,47 @@ public class AnySilentContainer implements IAnySilentContainer {
             return false;
         }
 
+        IInventory inventory = (IInventory) tile;
         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));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (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);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
         } 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()));
+            inventory = new InventoryLargeChest("container.chestDouble", inventory, (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);
+            inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
         }
 
-        boolean returnValue = false;
+        // AnyChest only
         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.");
-            }
+            player.openContainer(inventory);
+            return true;
         }
 
-        return returnValue;
+        // SilentChest
+        try {
+            // Call InventoryOpenEvent
+            Container container = new SilentContainerChest(player.inventory, inventory);
+            container = CraftEventFactory.callInventoryOpenEvent(player, container);
+            if (container == null) {
+                return false;
+            }
+
+            // Open window
+            int windowId = player.nextContainerCounter();
+            player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, inventory.getInventoryName(), inventory.getSize(), true));
+            player.activeContainer = container;
+            player.activeContainer.windowId = windowId;
+            player.activeContainer.addSlotListener(player);
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
+            return false;
+        }
     }
 
 }

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

@@ -19,11 +19,10 @@ 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.internal.InternalAccessor;
+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;

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

@@ -16,19 +16,23 @@
 
 package com.lishid.openinv.internal.v1_7_R2;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
-//Volatile
 import net.minecraft.server.v1_7_R2.EntityPlayer;
 import net.minecraft.server.v1_7_R2.MinecraftServer;
 import net.minecraft.server.v1_7_R2.PlayerInteractManager;
 import net.minecraft.util.com.mojang.authlib.GameProfile;
 
 import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_7_R2.entity.CraftPlayer;
 
 @SuppressWarnings("deprecation") // Deprecated methods are used properly and will not change.
 public class PlayerDataManager implements IPlayerDataManager {
@@ -71,4 +75,29 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player;
     }
 
+    @Override
+    public Collection<? extends Player> getOnlinePlayers() {
+        return Arrays.asList(Bukkit.getOnlinePlayers());
+    }
+
+    public static EntityPlayer getHandle(Player player) {
+        if (player instanceof CraftPlayer) {
+            return ((CraftPlayer) player).getHandle();
+        }
+
+        Server server = player.getServer();
+        EntityPlayer nmsPlayer = null;
+
+        if (server instanceof CraftServer) {
+            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
+        }
+
+        if (nmsPlayer == null) {
+            // Could use reflection to examine fields, but it's honestly not worth the bother.
+            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+        }
+
+        return nmsPlayer;
+    }
+
 }

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

@@ -16,7 +16,6 @@
 
 package com.lishid.openinv.internal.v1_7_R2;
 
-// Volatile
 import net.minecraft.server.v1_7_R2.ContainerChest;
 import net.minecraft.server.v1_7_R2.EntityHuman;
 import net.minecraft.server.v1_7_R2.IInventory;