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

api/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvapi</artifactId>
@@ -16,7 +16,8 @@
       <groupId>org.bukkit</groupId>
       <artifactId>bukkit</artifactId>
       <version>1.4.5-R1.0</version>
-      <scope>provided</scope>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/../lib/bukkit-1.4.5-R1.0.jar</systemPath>
     </dependency>
   </dependencies>
 

assembly/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvassembly</artifactId>

common/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvcommon</artifactId>
@@ -16,13 +16,13 @@
       <groupId>org.bukkit</groupId>
       <artifactId>bukkit</artifactId>
       <version>1.4.5-R1.0</version>
-      <scope>provided</scope>
+      <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>1.0-SNAPSHOT</version>
+      <version>3.1.2</version>
     </dependency>
   </dependencies>
 

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();
     }
 
     /**

internal/1_4_5/pom.xml

@@ -5,24 +5,24 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_4_5</artifactId>
   <name>OpenInvAdapter1_4_5</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.4.5-R1.0</version>
       <scope>provided</scope>
     </dependency>
+    <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,7 +22,6 @@ 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;
@@ -36,7 +35,6 @@ 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 {
@@ -49,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) {
@@ -97,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) {

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

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

@@ -23,14 +23,15 @@ 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 {
 
@@ -77,4 +78,24 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -5,24 +5,24 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_4_6</artifactId>
   <name>OpenInvAdapter1_4_6</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.4.6-R0.3</version>
       <scope>provided</scope>
     </dependency>
+    <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,7 +22,6 @@ 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;
@@ -36,7 +35,6 @@ 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 {
@@ -49,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) {
@@ -97,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) {

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

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

@@ -23,14 +23,15 @@ 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 {
 
@@ -77,4 +78,24 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvinternal</artifactId>

internal/v1_10_R1/pom.xml

@@ -5,24 +5,24 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_10_R1</artifactId>
   <name>OpenInvAdapter1_10_R1</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
       <version>1.10-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <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,7 +22,6 @@ 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;
@@ -43,7 +42,6 @@ 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) {

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

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

@@ -25,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 {
 
@@ -85,4 +86,24 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -5,24 +5,24 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_11_R1</artifactId>
   <name>OpenInvAdapter1_11_R1</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
       <version>1.11.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,7 +25,6 @@ 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;
@@ -49,7 +48,6 @@ 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 {
@@ -65,7 +63,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());
         IBlockData blockData = world.getType(blockPosition);
@@ -125,7 +123,7 @@ public class AnySilentContainer implements IAnySilentContainer {
             try {
                 // 1.11.2
                 return world.a(axisAlignedBB.a(blockPosition.shift(enumDirection)));
-            } catch (Exception e) {
+            } catch (NoSuchMethodError e) {
                 // 1.11
                 return world.b(axisAlignedBB.a(blockPosition.shift(enumDirection)));
             }
@@ -156,7 +154,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) {

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

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

@@ -25,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 {
 
@@ -85,4 +86,24 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -5,24 +5,24 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_4_R1</artifactId>
   <name>OpenInvAdapter1_4_R1</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.4.7-R1.0</version>
       <scope>provided</scope>
     </dependency>
+    <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,7 +22,6 @@ 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;
@@ -36,7 +35,6 @@ 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 {
@@ -49,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) {
@@ -97,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) {

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

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

@@ -23,14 +23,15 @@ 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 {
@@ -78,4 +79,24 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -5,24 +5,24 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_5_R2</artifactId>
   <name>OpenInvAdapter1_5_R2</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.5.1-R0.2</version>
       <scope>provided</scope>
     </dependency>
+    <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,7 +22,6 @@ 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;
@@ -36,7 +35,6 @@ 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 {
@@ -49,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) {
@@ -97,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) {

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

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

@@ -23,14 +23,15 @@ 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 {
 
@@ -77,4 +78,24 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -5,24 +5,24 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_5_R3</artifactId>
   <name>OpenInvAdapter1_5_R3</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.5.2-R1.0</version>
       <scope>provided</scope>
     </dependency>
+    <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,7 +22,6 @@ 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;
@@ -36,7 +35,6 @@ 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 {
@@ -49,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) {
@@ -97,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) {

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

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

@@ -23,14 +23,15 @@ 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 {
 
@@ -77,4 +78,24 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -5,24 +5,24 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R1</artifactId>
   <name>OpenInvAdapter1_6_R1</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.6.1-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <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,7 +22,6 @@ 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;
@@ -36,7 +35,6 @@ 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 {
@@ -49,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) {
@@ -97,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) {

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

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

@@ -23,14 +23,15 @@ 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 {
 
@@ -77,4 +78,24 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -5,24 +5,24 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R2</artifactId>
   <name>OpenInvAdapter1_6_R2</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.6.2-R1.0</version>
       <scope>provided</scope>
     </dependency>
+    <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,7 +22,6 @@ 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;
@@ -36,7 +35,6 @@ 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 {
@@ -49,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) {
@@ -97,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) {

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

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

@@ -23,14 +23,15 @@ 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 {
 
@@ -77,4 +78,24 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -5,24 +5,24 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R3</artifactId>
   <name>OpenInvAdapter1_6_R3</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.6.4-R2.0</version>
       <scope>provided</scope>
     </dependency>
+    <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,7 +22,6 @@ 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;
@@ -36,7 +35,6 @@ 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 {
@@ -49,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) {
@@ -97,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) {

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

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

@@ -23,14 +23,15 @@ 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 {
 
@@ -77,4 +78,24 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -5,24 +5,24 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R1</artifactId>
   <name>OpenInvAdapter1_7_R1</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.7.2-R0.4</version>
       <scope>provided</scope>
     </dependency>
+    <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,7 +22,6 @@ 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;
@@ -37,7 +36,6 @@ 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 {
@@ -50,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) {
@@ -98,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) {

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

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

@@ -23,15 +23,16 @@ 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 {
 
@@ -78,4 +79,24 @@ public class PlayerDataManager implements IPlayerDataManager {
         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

@@ -5,24 +5,24 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R2</artifactId>
   <name>OpenInvAdapter1_7_R2</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.7.5-R0.1</version>
       <scope>provided</scope>
     </dependency>
+    <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,7 +22,6 @@ 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;
@@ -37,7 +36,6 @@ 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 {
@@ -50,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) {
@@ -98,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) {

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

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

@@ -23,15 +23,16 @@ 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 {
@@ -79,4 +80,24 @@ public class PlayerDataManager implements IPlayerDataManager {
         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;

internal/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_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_7_R2.EntityPlayer;
 import net.minecraft.server.v1_7_R2.IInventory;
 import net.minecraft.server.v1_7_R2.InventoryEnderChest;
 import net.minecraft.server.v1_7_R2.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(((CraftPlayer) player).getHandle().getEnderChest().getInventoryName(),
+                ((CraftPlayer) player).getHandle().getEnderChest().k_(),
+                ((CraftPlayer) player).getHandle().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_R2/src/main/java/com/lishid/openinv/internal/v1_7_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_7_R2.ItemStack;
 import net.minecraft.server.v1_7_R2.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_7_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_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_7_R3/pom.xml

@@ -5,24 +5,24 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R3</artifactId>
   <name>OpenInvAdapter1_7_R3</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.7.9-R0.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>3.1.2</version>
+    </dependency>
   </dependencies>
 
 </project>

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

@@ -22,7 +22,6 @@ import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
-// Volatile
 import net.minecraft.server.v1_7_R3.AxisAlignedBB;
 import net.minecraft.server.v1_7_R3.Block;
 import net.minecraft.server.v1_7_R3.BlockEnderChest;
@@ -37,7 +36,6 @@ import net.minecraft.server.v1_7_R3.TileEntityChest;
 import net.minecraft.server.v1_7_R3.TileEntityEnderChest;
 import net.minecraft.server.v1_7_R3.World;
 
-import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_R3.event.CraftEventFactory;
 
 public class AnySilentContainer implements IAnySilentContainer {
@@ -50,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) {
@@ -98,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) {

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

@@ -23,7 +23,6 @@ import com.lishid.openinv.util.InternalAccessor;
 
 import org.bukkit.inventory.Inventory;
 
-// Volatile
 import net.minecraft.server.v1_7_R3.IInventory;
 
 import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftInventory;

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

@@ -24,15 +24,16 @@ 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_R3.EntityPlayer;
 import net.minecraft.server.v1_7_R3.MinecraftServer;
 import net.minecraft.server.v1_7_R3.PlayerInteractManager;
 import net.minecraft.util.com.mojang.authlib.GameProfile;
 
 import org.bukkit.craftbukkit.v1_7_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
@@ -85,4 +86,24 @@ public class PlayerDataManager implements IPlayerDataManager {
         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_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/SilentContainerChest.java

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

internal/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_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_7_R3.EntityPlayer;
 import net.minecraft.server.v1_7_R3.IInventory;
 import net.minecraft.server.v1_7_R3.InventoryEnderChest;
 import net.minecraft.server.v1_7_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().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_R3/src/main/java/com/lishid/openinv/internal/v1_7_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_7_R3.ItemStack;
 import net.minecraft.server.v1_7_R3.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_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_R4/pom.xml

@@ -5,18 +5,13 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1.2</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R4</artifactId>
   <name>OpenInvAdapter1_7_R4</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
@@ -29,6 +24,11 @@
       <version>1.7.10-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_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/AnySilentContainer.java

@@ -22,7 +22,6 @@ import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
-// Volatile
 import net.minecraft.server.v1_7_R4.AxisAlignedBB;
 import net.minecraft.server.v1_7_R4.Block;
 import net.minecraft.server.v1_7_R4.BlockEnderChest;
@@ -37,7 +36,6 @@ import net.minecraft.server.v1_7_R4.TileEntityChest;
 import net.minecraft.server.v1_7_R4.TileEntityEnderChest;
 import net.minecraft.server.v1_7_R4.World;
 
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_R4.event.CraftEventFactory;
 
 public class AnySilentContainer implements IAnySilentContainer {
@@ -50,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) {
@@ -98,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) {

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

@@ -23,7 +23,6 @@ import com.lishid.openinv.util.InternalAccessor;
 
 import org.bukkit.inventory.Inventory;
 
-// Volatile
 import net.minecraft.server.v1_7_R4.IInventory;
 
 import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventory;