Clarify the current state of OpenInv

I think that's the last change I want to make.

OpenInv/pom.xml

@@ -0,0 +1,179 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent-jikoo</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinv-jikoo</artifactId>
+  <name>OpenInv</name>
+
+  <profiles>
+
+    <profile>
+      <id>latest</id>
+      <dependencies>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_11_R1-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>modern</id>
+      <dependencies>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_7_R4-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_8_R1-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_8_R2-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_8_R3-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_9_R1-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_9_R2-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_10_R1-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_11_R1-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>all</id>
+      <dependencies>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_4_5-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_4_6-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_4_R1-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_5_R2-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_5_R3-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_6_R1-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_6_R2-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_6_R3-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_7_R1-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_7_R2-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_7_R3-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_7_R4-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_8_R1-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_8_R2-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_8_R3-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_9_R1-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_9_R2-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_10_R1-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>com.lishid</groupId>
+          <artifactId>openinvcraftbukkit1_11_R1-jikoo</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
+  <build>
+    <directory>../target</directory>
+    <finalName>${project.name}</finalName>
+  </build>
+
+</project>

OpenInvCraftbukkit1_10_R1/pom.xml

@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent-jikoo</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvcraftbukkit1_10_R1-jikoo</artifactId>
+  <name>OpenInvCraftbukkit1_10_R1</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin-jikoo</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.10-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

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

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

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

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

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

@@ -16,12 +16,14 @@
 
 package com.lishid.openinv.internal.v1_10_R1;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
+import com.mojang.authlib.GameProfile;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.mojang.authlib.GameProfile;
-
 // Volatile
 import net.minecraft.server.v1_10_R1.EntityPlayer;
 import net.minecraft.server.v1_10_R1.MinecraftServer;
@@ -29,31 +31,34 @@ import net.minecraft.server.v1_10_R1.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
 
-public class PlayerDataManager extends com.lishid.openinv.internal.PlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure player has data
         if (offline == null || !offline.hasPlayedBefore()) {
             return null;
         }
+
+        // Create a profile and entity to load the player data
         GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getUniqueId().toString();
     }
+
 }

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

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

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

@@ -18,57 +18,46 @@ package com.lishid.openinv.internal.v1_10_R1;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
 
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 
+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.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.CraftHumanEntity;
 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 {
 
-    private final OpenInv plugin;
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
-    private CraftPlayer owner;
-    private int maxStack = MAX_STACK;
+    private boolean playerOnline = false;
 
-    public SpecialEnderChest(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().hasCustomName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        this.plugin = plugin;
-        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().hasCustomName(),
+                ((CraftPlayer) player).getHandle().getEnderChest().getSize());
+        CraftPlayer craftPlayer = (CraftPlayer) player;
+        this.enderChest = craftPlayer.getHandle().getEnderChest();
+        this.bukkitOwner = craftPlayer;
         setItemArrays(this, enderChest.getContents());
     }
 
     private void setItemArrays(InventorySubcontainer subcontainer, ItemStack[] items) {
         try {
             // Prepare to remove final modifier
-            Field modifiers;
-                modifiers = Field.class.getDeclaredField("modifiers");
+            Field modifiers = Field.class.getDeclaredField("modifiers");
             modifiers.setAccessible(true);
             // Access and replace main inventory array
             Field field = InventorySubcontainer.class.getField("items");
             modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            field.set(inventory, items);
+            field.set(subcontainer, items);
         } catch (NoSuchFieldException e) {
             e.printStackTrace();
         } catch (SecurityException e) {
@@ -85,84 +74,32 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                setItemArrays(owner.getHandle().getEnderChest(), this.items);
-            }
-            catch (Exception e) {}
+                this.bukkitOwner = player;
+                CraftPlayer craftPlayer = (CraftPlayer) player;
+                setItemArrays(craftPlayer.getHandle().getEnderChest(), this.items);
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
     }
 
     @Override
-    public ItemStack[] getContents() {
-        return this.items;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        transaction.add(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        transaction.remove(who);
-        this.inventoryRemovalCheck(true);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return transaction;
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner;
-    }
-
-    @Override
-    public void setMaxStackSize(int size) {
-        maxStack = size;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return maxStack;
-    }
-
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -19,33 +19,27 @@ package com.lishid.openinv.internal.v1_10_R1;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // 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.CraftHumanEntity;
 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 {
 
-    private final OpenInv plugin;
     private final ItemStack[] extra = new ItemStack[4];
     private final CraftInventory inventory = new CraftInventory(this);
-    private CraftPlayer owner;
     private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.plugin = plugin;
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         setItemArrays(this, player.inventory.items, player.inventory.armor, player.inventory.extraSlots);
     }
@@ -92,49 +86,37 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             setItemArrays(this.player.inventory, items, armor, extraSlots);
             playerOnline = true;
         }
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(armor, 0, C, items.length, armor.length);
-        System.arraycopy(extraSlots, 0, C, items.length + armor.length, extraSlots.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        System.arraycopy(extraSlots, 0, contents, items.length + armor.length, extraSlots.length);
+        return contents;
     }
 
     @Override
     public int getSize() {
-        return super.getSize() + 5;
+        return super.getSize() + 4;
     }
 
     @Override
@@ -144,16 +126,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extraSlots;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -174,16 +154,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extraSlots;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -199,8 +177,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].cloneAndSubtract(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -209,9 +186,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -221,16 +197,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extraSlots;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -245,9 +219,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -257,16 +230,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extraSlots;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -277,33 +248,36 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack, true);
+            player.drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override
@@ -318,4 +292,5 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     public boolean a(EntityHuman entityhuman) {
         return true;
     }
+
 }

OpenInvCraftbukkit1_11_R1/pom.xml

@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent-jikoo</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvcraftbukkit1_11_R1-jikoo</artifactId>
+  <name>OpenInvCraftbukkit1_11_R1</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin-jikoo</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.11-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

OpenInvCraftbukkit1_4_5/pom.xml

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

OpenInvCraftbukkit1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/AnySilentContainer.java

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

OpenInvCraftbukkit1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/InventoryAccess.java

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

OpenInvCraftbukkit1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/PlayerDataManager.java

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_4_5;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -27,28 +29,34 @@ import net.minecraft.server.v1_4_5.MinecraftServer;
 
 import org.bukkit.craftbukkit.v1_4_5.CraftServer;
 
-public class PlayerDataManager extends com.lishid.openinv.internal.PlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new ItemInWorldManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new ItemInWorldManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

OpenInvCraftbukkit1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SilentContainerChest.java

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

OpenInvCraftbukkit1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialEnderChest.java

@@ -20,16 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_4_5.EntityHuman;
 import net.minecraft.server.v1_4_5.IInventory;
 import net.minecraft.server.v1_4_5.InventoryEnderChest;
 import net.minecraft.server.v1_4_5.InventorySubcontainer;
@@ -41,17 +39,16 @@ import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
 
-    private final OpenInv plugin;
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        this.plugin = plugin;
+    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;
@@ -63,15 +60,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -81,16 +69,19 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -106,7 +97,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -129,22 +119,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    @Override
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

OpenInvCraftbukkit1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialPlayerInventory.java

@@ -16,33 +16,26 @@
 
 package com.lishid.openinv.internal.v1_4_5;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_4_5.EntityHuman;
 import net.minecraft.server.v1_4_5.ItemStack;
 import net.minecraft.server.v1_4_5.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_4_5.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
 
-    private final OpenInv plugin;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private CraftPlayer owner;
     private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.plugin = plugin;
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -53,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -74,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -216,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -247,14 +228,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
     @Override
     public String getName() {
-        if (player.name.length() > 16) {
-            return player.name.substring(0, 16);
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
         }
-        return player.name;
+        return player.getName();
     }
 
-    @Override
-    public boolean a_(EntityHuman entityhuman) {
-        return true;
-    }
 }

OpenInvCraftbukkit1_4_6/pom.xml

@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent-jikoo</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvcraftbukkit1_4_6-jikoo</artifactId>
+  <name>OpenInvCraftbukkit1_4_6</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin-jikoo</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.4.6-R0.3</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

OpenInvCraftbukkit1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/AnySilentContainer.java

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

OpenInvCraftbukkit1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/InventoryAccess.java

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

OpenInvCraftbukkit1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/PlayerDataManager.java

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_4_6;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -27,28 +29,34 @@ import net.minecraft.server.v1_4_6.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_4_6.CraftServer;
 
-public class PlayerDataManager extends com.lishid.openinv.internal.PlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

OpenInvCraftbukkit1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SilentContainerChest.java

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

OpenInvCraftbukkit1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialEnderChest.java

@@ -20,16 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_4_6.EntityHuman;
 import net.minecraft.server.v1_4_6.IInventory;
 import net.minecraft.server.v1_4_6.InventoryEnderChest;
 import net.minecraft.server.v1_4_6.InventorySubcontainer;
@@ -41,17 +39,16 @@ import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
 
-    private final OpenInv plugin;
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        this.plugin = plugin;
+    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;
@@ -63,15 +60,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -81,16 +69,19 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -106,7 +97,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -129,22 +119,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    @Override
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

OpenInvCraftbukkit1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialPlayerInventory.java

@@ -16,33 +16,26 @@
 
 package com.lishid.openinv.internal.v1_4_6;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_4_6.EntityHuman;
 import net.minecraft.server.v1_4_6.ItemStack;
 import net.minecraft.server.v1_4_6.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_4_6.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
 
-    private final OpenInv plugin;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private CraftPlayer owner;
     private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.plugin = plugin;
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -53,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -74,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -105,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -128,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -148,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -158,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -170,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -189,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -201,60 +173,57 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override
     public String getName() {
-        if (player.name.length() > 16) {
-            return player.name.substring(0, 16);
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
         }
-        return player.name;
+        return player.getName();
     }
 
-    @Override
-    public boolean a_(EntityHuman entityhuman) {
-        return true;
-    }
 }

OpenInvCraftbukkit1_4_R1/pom.xml

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

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

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

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

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

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_4_R1;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -28,28 +30,34 @@ import net.minecraft.server.v1_4_R1.PlayerInteractManager;
 import org.bukkit.craftbukkit.v1_4_R1.CraftServer;
 
 
-public class PlayerDataManager extends com.lishid.openinv.internal.PlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

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

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

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

@@ -20,16 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.OpenInv;
 // Volatile
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
-import net.minecraft.server.v1_4_R1.EntityHuman;
 import net.minecraft.server.v1_4_R1.IInventory;
 import net.minecraft.server.v1_4_R1.InventoryEnderChest;
 import net.minecraft.server.v1_4_R1.InventorySubcontainer;
@@ -41,17 +39,16 @@ import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
 
-    private final OpenInv plugin;
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        this.plugin = plugin;
+    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;
@@ -63,15 +60,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -81,16 +69,19 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -106,7 +97,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -129,22 +119,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    @Override
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -16,33 +16,26 @@
 
 package com.lishid.openinv.internal.v1_4_R1;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
-import net.minecraft.server.v1_4_R1.EntityHuman;
+// Volatile
 import net.minecraft.server.v1_4_R1.ItemStack;
 import net.minecraft.server.v1_4_R1.PlayerInventory;
 
-// Volatile
-import org.bukkit.craftbukkit.v1_4_R1.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
 
-    private final OpenInv plugin;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private CraftPlayer owner;
     private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.plugin = plugin;
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -53,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -74,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -216,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -247,14 +228,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
     @Override
     public String getName() {
-        if (player.name.length() > 16) {
-            return player.name.substring(0, 16);
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
         }
-        return player.name;
+        return player.getName();
     }
 
-    @Override
-    public boolean a_(EntityHuman entityhuman) {
-        return true;
-    }
 }

OpenInvCraftbukkit1_5_R2/pom.xml

@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent-jikoo</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvcraftbukkit1_5_R2-jikoo</artifactId>
+  <name>OpenInvCraftbukkit1_5_R2</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin-jikoo</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.5.1-R0.2</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

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

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

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

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

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_5_R2;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -27,28 +29,34 @@ import net.minecraft.server.v1_5_R2.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_5_R2.CraftServer;
 
-public class PlayerDataManager extends com.lishid.openinv.internal.PlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

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

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

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

@@ -20,16 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_5_R2.EntityHuman;
 import net.minecraft.server.v1_5_R2.IInventory;
 import net.minecraft.server.v1_5_R2.InventoryEnderChest;
 import net.minecraft.server.v1_5_R2.InventorySubcontainer;
@@ -41,17 +39,17 @@ import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
 
-    private final OpenInv plugin;
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        this.plugin = plugin;
+    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;
@@ -63,15 +61,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -81,16 +70,19 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -106,7 +98,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -129,22 +120,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -16,33 +16,26 @@
 
 package com.lishid.openinv.internal.v1_5_R2;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_5_R2.EntityHuman;
 import net.minecraft.server.v1_5_R2.ItemStack;
 import net.minecraft.server.v1_5_R2.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
 
-    private final OpenInv plugin;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private CraftPlayer owner;
     private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.plugin = plugin;
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -53,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -74,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -105,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -128,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -148,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -158,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -170,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -189,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -201,60 +173,57 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override
     public String getName() {
-        if (player.name.length() > 16) {
-            return player.name.substring(0, 16);
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
         }
-        return player.name;
+        return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

OpenInvCraftbukkit1_5_R3/pom.xml

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

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

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

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

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

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_5_R3;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -27,28 +29,34 @@ import net.minecraft.server.v1_5_R3.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_5_R3.CraftServer;
 
-public class PlayerDataManager extends com.lishid.openinv.internal.PlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

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

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

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

@@ -20,16 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_5_R3.EntityHuman;
 import net.minecraft.server.v1_5_R3.IInventory;
 import net.minecraft.server.v1_5_R3.InventoryEnderChest;
 import net.minecraft.server.v1_5_R3.InventorySubcontainer;
@@ -41,17 +39,17 @@ import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
 
-    private final OpenInv plugin;
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        this.plugin = plugin;
+    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;
@@ -63,15 +61,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -81,16 +70,19 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -106,7 +98,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -129,22 +120,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -16,33 +16,26 @@
 
 package com.lishid.openinv.internal.v1_5_R3;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_5_R3.EntityHuman;
 import net.minecraft.server.v1_5_R3.ItemStack;
 import net.minecraft.server.v1_5_R3.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
 
-    private final OpenInv plugin;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private CraftPlayer owner;
     private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.plugin = plugin;
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -53,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -74,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -105,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -128,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -148,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -158,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -170,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -189,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -201,60 +173,57 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override
     public String getName() {
-        if (player.name.length() > 16) {
-            return player.name.substring(0, 16);
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
         }
-        return player.name;
+        return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

OpenInvCraftbukkit1_6_R1/pom.xml

@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent-jikoo</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvcraftbukkit1_6_R1-jikoo</artifactId>
+  <name>OpenInvCraftbukkit1_6_R1</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin-jikoo</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.6.1-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

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

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

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

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

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_6_R1;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -27,28 +29,34 @@ import net.minecraft.server.v1_6_R1.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_6_R1.CraftServer;
 
-public class PlayerDataManager extends com.lishid.openinv.internal.PlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

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

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

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

@@ -20,16 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_6_R1.EntityHuman;
 import net.minecraft.server.v1_6_R1.IInventory;
 import net.minecraft.server.v1_6_R1.InventoryEnderChest;
 import net.minecraft.server.v1_6_R1.InventorySubcontainer;
@@ -41,17 +39,17 @@ import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
 
-    private final OpenInv plugin;
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        this.plugin = plugin;
+    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;
@@ -63,15 +61,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -81,16 +70,19 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -106,7 +98,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -129,22 +120,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -16,34 +16,26 @@
 
 package com.lishid.openinv.internal.v1_6_R1;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_6_R1.EntityHuman;
 import net.minecraft.server.v1_6_R1.ItemStack;
 import net.minecraft.server.v1_6_R1.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
 
-
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
 
-    private final OpenInv plugin;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private CraftPlayer owner;
     private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.plugin = plugin;
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -54,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -75,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -106,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -149,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -159,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -171,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -190,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -202,48 +173,49 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override
@@ -254,8 +226,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

OpenInvCraftbukkit1_6_R2/pom.xml

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

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

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

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

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

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_6_R2;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -27,28 +29,34 @@ import net.minecraft.server.v1_6_R2.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_6_R2.CraftServer;
 
-public class PlayerDataManager extends com.lishid.openinv.internal.PlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

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

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

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

@@ -20,16 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_6_R2.EntityHuman;
 import net.minecraft.server.v1_6_R2.IInventory;
 import net.minecraft.server.v1_6_R2.InventoryEnderChest;
 import net.minecraft.server.v1_6_R2.InventorySubcontainer;
@@ -41,17 +39,17 @@ import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
 
-    private final OpenInv plugin;
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        this.plugin = plugin;
+    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;
@@ -63,15 +61,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -81,16 +70,19 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -106,7 +98,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -129,22 +120,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -16,33 +16,26 @@
 
 package com.lishid.openinv.internal.v1_6_R2;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_6_R2.EntityHuman;
 import net.minecraft.server.v1_6_R2.ItemStack;
 import net.minecraft.server.v1_6_R2.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_6_R2.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
 
-    private final OpenInv plugin;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private CraftPlayer owner;
     private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.plugin = plugin;
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -53,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -74,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -105,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -128,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -148,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -158,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -170,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -189,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -201,48 +173,49 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override
@@ -253,8 +226,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

OpenInvCraftbukkit1_6_R3/pom.xml

@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent-jikoo</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvcraftbukkit1_6_R3-jikoo</artifactId>
+  <name>OpenInvCraftbukkit1_6_R3</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin-jikoo</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.6.4-R2.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

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

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

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

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

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_6_R3;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -27,28 +29,34 @@ import net.minecraft.server.v1_6_R3.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
 
-public class PlayerDataManager extends com.lishid.openinv.internal.PlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

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

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

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

@@ -20,16 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_6_R3.EntityHuman;
 import net.minecraft.server.v1_6_R3.IInventory;
 import net.minecraft.server.v1_6_R3.InventoryEnderChest;
 import net.minecraft.server.v1_6_R3.InventorySubcontainer;
@@ -41,17 +39,17 @@ import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
 
-    private final OpenInv plugin;
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        this.plugin = plugin;
+    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;
@@ -63,15 +61,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -81,16 +70,19 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -106,7 +98,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -129,22 +120,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -16,33 +16,26 @@
 
 package com.lishid.openinv.internal.v1_6_R3;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_6_R3.EntityHuman;
 import net.minecraft.server.v1_6_R3.ItemStack;
 import net.minecraft.server.v1_6_R3.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_6_R3.entity.CraftHumanEntity;
 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 {
 
-    private final OpenInv plugin;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private CraftPlayer owner;
     private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.plugin = plugin;
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -53,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -74,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -105,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -128,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -148,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -158,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -170,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -189,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -201,28 +173,26 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -253,8 +223,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

OpenInvCraftbukkit1_7_R1/pom.xml

@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent-jikoo</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvcraftbukkit1_7_R1-jikoo</artifactId>
+  <name>OpenInvCraftbukkit1_7_R1</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin-jikoo</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.7.2-R0.4</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

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

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

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

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

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_7_R1;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -28,29 +30,34 @@ import net.minecraft.util.com.mojang.authlib.GameProfile;
 
 import org.bukkit.craftbukkit.v1_7_R1.CraftServer;
 
-public class PlayerDataManager extends com.lishid.openinv.internal.PlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+    public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
 
+        // Create a profile and entity to load the player data
         GameProfile profile = new GameProfile(null, offline.getName());
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

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

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

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

@@ -20,16 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_7_R1.EntityHuman;
 import net.minecraft.server.v1_7_R1.IInventory;
 import net.minecraft.server.v1_7_R1.InventoryEnderChest;
 import net.minecraft.server.v1_7_R1.InventorySubcontainer;
@@ -41,17 +39,17 @@ import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
 
-    private final OpenInv plugin;
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        this.plugin = plugin;
+    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;
@@ -63,15 +61,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -81,16 +70,19 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -106,7 +98,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -129,22 +120,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -16,33 +16,26 @@
 
 package com.lishid.openinv.internal.v1_7_R1;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_7_R1.EntityHuman;
 import net.minecraft.server.v1_7_R1.ItemStack;
 import net.minecraft.server.v1_7_R1.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_7_R1.entity.CraftHumanEntity;
 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 {
 
-    private final OpenInv plugin;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private CraftPlayer owner;
     private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.plugin = plugin;
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -53,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -74,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -105,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -128,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -148,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -158,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -170,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -189,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -201,48 +173,49 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack, true);
+            player.drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override
@@ -253,8 +226,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

OpenInvCraftbukkit1_7_R2/pom.xml

@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent-jikoo</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvcraftbukkit1_7_R2-jikoo</artifactId>
+  <name>OpenInvCraftbukkit1_7_R2</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin-jikoo</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.7.5-R0.1</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

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

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

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

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

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_7_R2;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -28,29 +30,35 @@ import net.minecraft.util.com.mojang.authlib.GameProfile;
 
 import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
 
-public class PlayerDataManager extends com.lishid.openinv.internal.PlayerDataManager {
+@SuppressWarnings("deprecation") // Deprecated methods are used properly and will not change.
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+    public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
 
+        // Create a profile and entity to load the player data
         GameProfile profile = new GameProfile(null, offline.getName());
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

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

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

OpenInvCraftbukkit1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/SpecialEnderChest.java

@@ -20,16 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_7_R2.EntityHuman;
 import net.minecraft.server.v1_7_R2.IInventory;
 import net.minecraft.server.v1_7_R2.InventoryEnderChest;
 import net.minecraft.server.v1_7_R2.InventorySubcontainer;
@@ -41,17 +39,17 @@ import org.bukkit.craftbukkit.v1_7_R2.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
 
-    private final OpenInv plugin;
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        this.plugin = plugin;
+    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;
@@ -63,15 +61,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -81,16 +70,19 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -106,7 +98,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -129,22 +120,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

OpenInvCraftbukkit1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/SpecialPlayerInventory.java

@@ -16,33 +16,26 @@
 
 package com.lishid.openinv.internal.v1_7_R2;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_7_R2.EntityHuman;
 import net.minecraft.server.v1_7_R2.ItemStack;
 import net.minecraft.server.v1_7_R2.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_7_R2.entity.CraftHumanEntity;
 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 {
 
-    private final OpenInv plugin;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private CraftPlayer owner;
     private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.plugin = plugin;
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -53,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -74,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -105,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -128,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -148,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -158,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -170,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -189,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -201,48 +173,49 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack, true);
+            player.drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override
@@ -253,8 +226,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

OpenInvCraftbukkit1_7_R3/pom.xml

@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent-jikoo</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvcraftbukkit1_7_R3-jikoo</artifactId>
+  <name>OpenInvCraftbukkit1_7_R3</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin-jikoo</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>
+  </dependencies>
+</project>

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

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

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

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

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_7_R3;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -28,29 +30,34 @@ import net.minecraft.util.com.mojang.authlib.GameProfile;
 
 import org.bukkit.craftbukkit.v1_7_R3.CraftServer;
 
-public class PlayerDataManager extends com.lishid.openinv.internal.PlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+    public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
 
+        // Create a profile and entity to load the player data
         GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getUniqueId().toString();
     }
+
 }

OpenInvCraftbukkit1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/SilentContainerChest.java

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

OpenInvCraftbukkit1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/SpecialEnderChest.java

@@ -20,16 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_7_R3.EntityHuman;
 import net.minecraft.server.v1_7_R3.IInventory;
 import net.minecraft.server.v1_7_R3.InventoryEnderChest;
 import net.minecraft.server.v1_7_R3.InventorySubcontainer;
@@ -41,17 +39,17 @@ import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
 
-    private final OpenInv plugin;
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        this.plugin = plugin;
+    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;
@@ -63,15 +61,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -81,16 +70,19 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -106,7 +98,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -129,22 +120,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

OpenInvCraftbukkit1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/SpecialPlayerInventory.java

@@ -16,33 +16,26 @@
 
 package com.lishid.openinv.internal.v1_7_R3;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_7_R3.EntityHuman;
 import net.minecraft.server.v1_7_R3.ItemStack;
 import net.minecraft.server.v1_7_R3.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_7_R3.entity.CraftHumanEntity;
 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 {
 
-    private final OpenInv plugin;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private CraftPlayer owner;
     private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.plugin = plugin;
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -53,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -74,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -105,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -128,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -148,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -158,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -170,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -189,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -201,48 +173,49 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack, true);
+            player.drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override
@@ -253,8 +226,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

OpenInvCraftbukkit1_7_R4/pom.xml

@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent-jikoo</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvcraftbukkit1_7_R4-jikoo</artifactId>
+  <name>OpenInvCraftbukkit1_7_R4</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin-jikoo</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.7.10-R0.1</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

OpenInvCraftbukkit1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/AnySilentContainer.java

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

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

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

OpenInvCraftbukkit1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/PlayerDataManager.java

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_7_R4;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -28,29 +30,34 @@ import net.minecraft.util.com.mojang.authlib.GameProfile;
 
 import org.bukkit.craftbukkit.v1_7_R4.CraftServer;
 
-public class PlayerDataManager extends com.lishid.openinv.internal.PlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+    public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
 
+        // Create a profile and entity to load the player data
         GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getUniqueId().toString();
     }
+
 }

OpenInvCraftbukkit1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/SilentContainerChest.java

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

OpenInvCraftbukkit1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/SpecialEnderChest.java

@@ -20,16 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 //Volatile
-import net.minecraft.server.v1_7_R4.EntityHuman;
 import net.minecraft.server.v1_7_R4.IInventory;
 import net.minecraft.server.v1_7_R4.InventoryEnderChest;
 import net.minecraft.server.v1_7_R4.InventorySubcontainer;
@@ -41,17 +39,17 @@ import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
 
-    private final OpenInv plugin;
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        this.plugin = plugin;
+    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;
@@ -63,15 +61,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -81,16 +70,19 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -106,7 +98,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -129,22 +120,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

OpenInvCraftbukkit1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/SpecialPlayerInventory.java

@@ -16,33 +16,26 @@
 
 package com.lishid.openinv.internal.v1_7_R4;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_7_R4.EntityHuman;
 import net.minecraft.server.v1_7_R4.ItemStack;
 import net.minecraft.server.v1_7_R4.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
 
-    private final OpenInv plugin;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private CraftPlayer owner;
     private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(OpenInv plugin, Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.plugin = plugin;
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -53,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save && !plugin.disableSaving()) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -74,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -105,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -128,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -148,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -158,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -170,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -189,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -201,48 +173,49 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack, true);
+            player.drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27)
+        if (i >= 27) {
             return i - 27;
-        else
-            return i + 9;
+        }
+        return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0)
+        if (i == 0) {
             return 3;
-        if (i == 1)
+        }
+        if (i == 1) {
             return 2;
-        if (i == 2)
+        }
+        if (i == 2) {
             return 1;
-        if (i == 3)
+        }
+        if (i == 3) {
             return 0;
-        else
-            return i;
+        }
+        return i;
     }
 
     @Override
@@ -253,8 +226,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }